fix mac builds

This reverts commit d708ae53df.

.claude/settings.json

@@ -1,5 +0,0 @@
-{
-  "attribution": {
-    "commit": ""
-  }
-}

.github/actions/setup-build/action.yml

@@ -1,81 +0,0 @@
-name: Setup Build Environment
-description: Common build environment setup steps
-
-inputs:
-  nodejs-version:
-    description: Node.js version
-    required: true
-  setup-python:
-    description: Set up Python
-    required: false
-    default: "false"
-  setup-docker:
-    description: Set up Docker QEMU and Buildx
-    required: false
-    default: "true"
-  setup-sccache:
-    description: Configure sccache for GitHub Actions
-    required: false
-    default: "true"
-  free-space:
-    description: Remove unnecessary packages to free disk space
-    required: false
-    default: "true"
-
-runs:
-  using: composite
-  steps:
-    - name: Free disk space
-      if: inputs.free-space == 'true'
-      shell: bash
-      run: |
-        sudo apt-get remove --purge -y azure-cli || true
-        sudo apt-get remove --purge -y firefox || true
-        sudo apt-get remove --purge -y ghc-* || true
-        sudo apt-get remove --purge -y google-cloud-sdk || true
-        sudo apt-get remove --purge -y google-chrome-stable || true
-        sudo apt-get remove --purge -y powershell || true
-        sudo apt-get remove --purge -y php* || true
-        sudo apt-get remove --purge -y ruby* || true
-        sudo apt-get remove --purge -y mono-* || true
-        sudo apt-get autoremove -y
-        sudo apt-get clean
-        sudo rm -rf /usr/lib/jvm
-        sudo rm -rf /usr/local/.ghcup
-        sudo rm -rf /usr/local/lib/android
-        sudo rm -rf /usr/share/dotnet
-        sudo rm -rf /usr/share/swift
-        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
-    # BuildJet runners lack /opt/hostedtoolcache, which setup-python and setup-qemu expect
-    - name: Ensure hostedtoolcache exists
-      shell: bash
-      run: sudo mkdir -p /opt/hostedtoolcache && sudo chown $USER:$USER /opt/hostedtoolcache
-
-    - name: Set up Python
-      if: inputs.setup-python == 'true'
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.x"
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version: ${{ inputs.nodejs-version }}
-        cache: npm
-        cache-dependency-path: "**/package-lock.json"
-
-    - name: Set up Docker QEMU
-      if: inputs.setup-docker == 'true'
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      if: inputs.setup-docker == 'true'
-      uses: docker/setup-buildx-action@v3
-
-    - name: Configure sccache
-      if: inputs.setup-sccache == 'true'
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
-          core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

.github/workflows/start-cli.yaml

@@ -37,10 +37,6 @@ on:
       - master
       - next/*
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
@@ -48,7 +44,6 @@ env:
 jobs:
   compile:
     name: Build Debian Package
-    if: github.event.pull_request.draft != true
     strategy:
       fail-fast: true
       matrix:
@@ -65,15 +60,50 @@ jobs:
           }}
     runs-on: ${{ fromJson('["ubuntu-latest", "buildjet-32vcpu-ubuntu-2204"]')[github.event.inputs.runner == 'fast'] }}
     steps:
-      - name: Mount tmpfs
+      - name: Cleaning up unnecessary files
+        run: |
+          sudo apt-get remove --purge -y mono-* \
+            ghc* cabal-install* \
+            dotnet* \
+            php* \
+            ruby* \
+            mysql-* \
+            postgresql-* \
+            azure-cli \
+            powershell \
+            google-cloud-sdk \
+            msodbcsql* mssql-tools* \
+            imagemagick* \
+            libgl1-mesa-dri \
+            google-chrome-stable \
+            firefox
+          sudo apt-get autoremove -y
+          sudo apt-get clean
+
+      - run: |
+          sudo mount -t tmpfs tmpfs .
         if: ${{ github.event.inputs.runner == 'fast' }}
-        run: sudo mount -t tmpfs tmpfs .
+
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: ./.github/actions/setup-build
+
+      - uses: actions/setup-node@v4
         with:
-          nodejs-version: ${{ env.NODEJS_VERSION }}
+          node-version: ${{ env.NODEJS_VERSION }}
+
+      - name: Set up docker QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Configure sccache
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Make
         run: TARGET=${{ matrix.triple }} make cli

.github/workflows/start-registry.yaml

@@ -1,4 +1,4 @@
-name: start-registry
+name: Start-Registry
 
 on:
   workflow_call:
@@ -35,10 +35,6 @@ on:
       - master
       - next/*
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
@@ -46,7 +42,6 @@ env:
 jobs:
   compile:
     name: Build Debian Package
-    if: github.event.pull_request.draft != true
     strategy:
       fail-fast: true
       matrix:
@@ -61,15 +56,50 @@ jobs:
           }}
     runs-on: ${{ fromJson('["ubuntu-latest", "buildjet-32vcpu-ubuntu-2204"]')[github.event.inputs.runner == 'fast'] }}
     steps:
-      - name: Mount tmpfs
+      - name: Cleaning up unnecessary files
+        run: |
+          sudo apt-get remove --purge -y mono-* \
+            ghc* cabal-install* \
+            dotnet* \
+            php* \
+            ruby* \
+            mysql-* \
+            postgresql-* \
+            azure-cli \
+            powershell \
+            google-cloud-sdk \
+            msodbcsql* mssql-tools* \
+            imagemagick* \
+            libgl1-mesa-dri \
+            google-chrome-stable \
+            firefox
+          sudo apt-get autoremove -y
+          sudo apt-get clean
+
+      - run: |
+          sudo mount -t tmpfs tmpfs .
         if: ${{ github.event.inputs.runner == 'fast' }}
-        run: sudo mount -t tmpfs tmpfs .
+
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: ./.github/actions/setup-build
+
+      - uses: actions/setup-node@v4
         with:
-          nodejs-version: ${{ env.NODEJS_VERSION }}
+          node-version: ${{ env.NODEJS_VERSION }}
+
+      - name: Set up docker QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Configure sccache
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Make
         run: make registry-deb

.github/workflows/start-tunnel.yaml

@@ -1,4 +1,4 @@
-name: start-tunnel
+name: Start-Tunnel
 
 on:
   workflow_call:
@@ -35,10 +35,6 @@ on:
       - master
       - next/*
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
@@ -46,7 +42,6 @@ env:
 jobs:
   compile:
     name: Build Debian Package
-    if: github.event.pull_request.draft != true
     strategy:
       fail-fast: true
       matrix:
@@ -61,15 +56,50 @@ jobs:
           }}
     runs-on: ${{ fromJson('["ubuntu-latest", "buildjet-32vcpu-ubuntu-2204"]')[github.event.inputs.runner == 'fast'] }}
     steps:
-      - name: Mount tmpfs
+      - name: Cleaning up unnecessary files
+        run: |
+          sudo apt-get remove --purge -y mono-* \
+            ghc* cabal-install* \
+            dotnet* \
+            php* \
+            ruby* \
+            mysql-* \
+            postgresql-* \
+            azure-cli \
+            powershell \
+            google-cloud-sdk \
+            msodbcsql* mssql-tools* \
+            imagemagick* \
+            libgl1-mesa-dri \
+            google-chrome-stable \
+            firefox
+          sudo apt-get autoremove -y
+          sudo apt-get clean
+
+      - run: |
+          sudo mount -t tmpfs tmpfs .
         if: ${{ github.event.inputs.runner == 'fast' }}
-        run: sudo mount -t tmpfs tmpfs .
+
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: ./.github/actions/setup-build
+
+      - uses: actions/setup-node@v4
         with:
-          nodejs-version: ${{ env.NODEJS_VERSION }}
+          node-version: ${{ env.NODEJS_VERSION }}
+
+      - name: Set up docker QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Configure sccache
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Make
         run: make tunnel-deb

.github/workflows/startos-iso.yaml

@@ -27,7 +27,7 @@ on:
           - x86_64-nonfree
           - aarch64
           - aarch64-nonfree
-          # - raspberrypi
+          - raspberrypi
           - riscv64
       deploy:
         type: choice
@@ -45,10 +45,6 @@ on:
       - master
       - next/*
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
@@ -56,7 +52,6 @@ env:
 jobs:
   compile:
     name: Compile Base Binaries
-    if: github.event.pull_request.draft != true
     strategy:
       fail-fast: true
       matrix:
@@ -91,16 +86,54 @@ jobs:
         )[github.event.inputs.runner == 'fast']
       }}
     steps:
-      - name: Mount tmpfs
+      - name: Cleaning up unnecessary files
+        run: |
+          sudo apt-get remove --purge -y azure-cli || true
+          sudo apt-get remove --purge -y firefox || true
+          sudo apt-get remove --purge -y ghc-* || true
+          sudo apt-get remove --purge -y google-cloud-sdk || true
+          sudo apt-get remove --purge -y google-chrome-stable || true
+          sudo apt-get remove --purge -y powershell || true
+          sudo apt-get remove --purge -y php* || true
+          sudo apt-get remove --purge -y ruby* || true
+          sudo apt-get remove --purge -y mono-* || true
+          sudo apt-get autoremove -y
+          sudo apt-get clean
+          sudo rm -rf /usr/lib/jvm               # All JDKs
+          sudo rm -rf /usr/local/.ghcup          # Haskell toolchain
+          sudo rm -rf /usr/local/lib/android     # Android SDK/NDK, emulator
+          sudo rm -rf /usr/share/dotnet          # .NET SDKs
+          sudo rm -rf /usr/share/swift           # Swift toolchain (if present)
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"    # Pre-cached tool cache (Go, Node, etc.)
+      - run: |
+          sudo mount -t tmpfs tmpfs .
         if: ${{ github.event.inputs.runner == 'fast' }}
-        run: sudo mount -t tmpfs tmpfs .
+
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: ./.github/actions/setup-build
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          nodejs-version: ${{ env.NODEJS_VERSION }}
-          setup-python: "true"
+          python-version: "3.x"
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODEJS_VERSION }}
+
+      - name: Set up docker QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Configure sccache
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_RESULTS_URL', process.env.ACTIONS_RESULTS_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Make
         run: make ARCH=${{ matrix.arch }} compiled-${{ matrix.arch }}.tar
@@ -118,14 +151,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: re-add "raspberrypi" to the platform list below
         platform: >-
           ${{
             fromJson(
               format(
                 '[
                   ["{0}"],
-                  ["x86_64", "x86_64-nonfree", "aarch64", "aarch64-nonfree", "riscv64"]
+                  ["x86_64", "x86_64-nonfree", "aarch64", "aarch64-nonfree", "riscv64", "raspberrypi"]
                 ]',
                 github.event.inputs.platform || 'ALL'
               )
@@ -189,10 +221,6 @@ jobs:
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"    # Pre-cached tool cache (Go, Node, etc.)
         if: ${{ github.event.inputs.runner != 'fast' }}
 
-      # BuildJet runners lack /opt/hostedtoolcache, which setup-qemu expects
-      - name: Ensure hostedtoolcache exists
-        run: sudo mkdir -p /opt/hostedtoolcache && sudo chown $USER:$USER /opt/hostedtoolcache
-
       - name: Set up docker QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -223,8 +251,10 @@ jobs:
           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
 

.github/workflows/test.yaml

@@ -10,10 +10,6 @@ on:
       - master
       - next/*
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
-  cancel-in-progress: true
-
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: dev-unstable
@@ -21,18 +17,15 @@ env:
 jobs:
   test:
     name: Run Automated Tests
-    if: github.event.pull_request.draft != true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: ./.github/actions/setup-build
+
+      - uses: actions/setup-node@v4
         with:
-          nodejs-version: ${{ env.NODEJS_VERSION }}
-          free-space: "false"
-          setup-docker: "false"
-          setup-sccache: "false"
+          node-version: ${{ env.NODEJS_VERSION }}
 
       - name: Build And Run Tests
         run: make test

.gitignore

@@ -19,6 +19,4 @@ secrets.db
 /compiled.tar
 /compiled-*.tar
 /build/lib/firmware
-tmp
-web/.i18n-checked
-agents/USER.md
+tmp

CLAUDE.md

@@ -1,146 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Project Overview
-
-StartOS is an open-source Linux distribution for running personal servers. It manages discovery, installation, network configuration, backups, and health monitoring of self-hosted services.
-
-**Tech Stack:**
-- Backend: Rust (async/Tokio, Axum web framework)
-- Frontend: Angular 20 + TypeScript + TaigaUI
-- Container runtime: Node.js/TypeScript with LXC
-- Database/State: Patch-DB (git submodule) - storage layer with reactive frontend sync
-- API: JSON-RPC via rpc-toolkit (see `agents/rpc-toolkit.md`)
-- Auth: Password + session cookie, public/private key signatures, local authcookie (see `core/src/middleware/auth/`)
-
-## Build & Development
-
-See [CONTRIBUTING.md](CONTRIBUTING.md) for:
-- Environment setup and requirements
-- Build commands and make targets
-- Testing and formatting commands
-- Environment variables
-
-**Quick reference:**
-```bash
-. ./devmode.sh                            # Enable dev mode
-make update-startbox REMOTE=start9@<ip>   # Fastest iteration (binary + UI)
-make test-core                            # Run Rust tests
-```
-
-## Architecture
-
-### Core (`/core`)
-The Rust backend daemon. Main binaries:
-- `startbox` - Main daemon (runs as `startd`)
-- `start-cli` - CLI interface
-- `start-container` - Runs inside LXC containers; communicates with host and manages subcontainers
-- `registrybox` - Registry daemon
-- `tunnelbox` - VPN/tunnel daemon
-
-**Key modules:**
-- `src/context/` - Context types (RpcContext, CliContext, InitContext, DiagnosticContext)
-- `src/service/` - Service lifecycle management with actor pattern (`service_actor.rs`)
-- `src/db/model/` - Patch-DB models (`public.rs` synced to frontend, `private.rs` backend-only)
-- `src/net/` - Networking (DNS, ACME, WiFi, Tor via Arti, WireGuard)
-- `src/s9pk/` - S9PK package format (merkle archive)
-- `src/registry/` - Package registry management
-
-**RPC Pattern:** See `agents/rpc-toolkit.md`
-
-### Web (`/web`)
-Angular projects sharing common code:
-- `projects/ui/` - Main admin interface
-- `projects/setup-wizard/` - Initial setup
-- `projects/start-tunnel/` - VPN management UI
-- `projects/shared/` - Common library (API clients, components)
-- `projects/marketplace/` - Service discovery
-
-**Development:**
-```bash
-cd web
-npm ci
-npm run start:ui        # Dev server with mocks
-npm run build:ui        # Production build
-npm run check           # Type check all projects
-```
-
-### Container Runtime (`/container-runtime`)
-Node.js runtime that manages service containers via RPC. See `RPCSpec.md` for protocol.
-
-**Container Architecture:**
-```
-LXC Container (uniform base for all services)
-└── systemd
-    └── container-runtime.service
-        └── Loads /usr/lib/startos/package/index.js (from s9pk javascript.squashfs)
-            └── Package JS launches subcontainers (from images in s9pk)
-```
-
-The container runtime communicates with the host via JSON-RPC over Unix socket. Package JavaScript must export functions conforming to the `ABI` type defined in `sdk/base/lib/types.ts`.
-
-**`/media/startos/` directory (mounted by host into container):**
-
-| Path | Description |
-|------|-------------|
-| `volumes/<name>/` | Package data volumes (id-mapped, persistent) |
-| `assets/` | Read-only assets from s9pk `assets.squashfs` |
-| `images/<name>/` | Container images (squashfs, used for subcontainers) |
-| `images/<name>.env` | Environment variables for image |
-| `images/<name>.json` | Image metadata |
-| `backup/` | Backup mount point (mounted during backup operations) |
-| `rpc/service.sock` | RPC socket (container runtime listens here) |
-| `rpc/host.sock` | Host RPC socket (for effects callbacks to host) |
-
-**S9PK Structure:** See `agents/s9pk-structure.md`
-
-### SDK (`/sdk`)
-TypeScript SDK for packaging services (`@start9labs/start-sdk`).
-
-- `base/` - Core types, ABI definitions, effects interface (`@start9labs/start-sdk-base`)
-- `package/` - Full SDK for package developers, re-exports base
-
-### Patch-DB (`/patch-db`)
-Git submodule providing diff-based state synchronization. Changes to `db/model/public.rs` automatically sync to the frontend.
-
-**Key patterns:**
-- `db.peek().await` - Get a read-only snapshot of the database state
-- `db.mutate(|db| { ... }).await` - Apply mutations atomically, returns `MutateResult`
-- `#[derive(HasModel)]` - Derive macro for types stored in the database, generates typed accessors
-
-**Generated accessor types** (from `HasModel` derive):
-- `as_field()` - Immutable reference: `&Model<T>`
-- `as_field_mut()` - Mutable reference: `&mut Model<T>`
-- `into_field()` - Owned value: `Model<T>`
-
-**`Model<T>` APIs** (from `db/prelude.rs`):
-- `.de()` - Deserialize to `T`
-- `.ser(&value)` - Serialize from `T`
-- `.mutate(|v| ...)` - Deserialize, mutate, reserialize
-- For maps: `.keys()`, `.as_idx(&key)`, `.as_idx_mut(&key)`, `.insert()`, `.remove()`, `.contains_key()`
-
-## Supplementary Documentation
-
-The `agents/` directory contains detailed documentation for AI assistants:
-
-- `TODO.md` - Pending tasks for AI agents (check this first, remove items when completed)
-- `USER.md` - Current user identifier (gitignored, see below)
-- `rpc-toolkit.md` - JSON-RPC patterns and handler configuration
-- `core-rust-patterns.md` - Common utilities and patterns for Rust code in `/core` (guard pattern, mount guards, etc.)
-- `s9pk-structure.md` - S9PK package format structure
-- `i18n-patterns.md` - Internationalization key conventions and usage in `/core`
-
-### Session Startup
-
-On startup:
-
-1. **Check for `agents/USER.md`** - If it doesn't exist, prompt the user for their name/identifier and create it. This file is gitignored since it varies per developer.
-
-2. **Check `agents/TODO.md` for relevant tasks** - Show TODOs that either:
-   - Have no `@username` tag (relevant to everyone)
-   - Are tagged with the current user's identifier
-
-   Skip TODOs tagged with a different user.
-
-3. **Ask "What would you like to do today?"** - Offer options for each relevant TODO item, plus "Something else" for other requests.

CONTRIBUTING.md

@@ -11,190 +11,123 @@ This guide is for contributing to the StartOS. If you are interested in packagin
 
 ```bash
 /
-├── assets/              # Screenshots for README
-├── build/               # Auxiliary files and scripts for deployed images
-├── container-runtime/   # Node.js program managing package containers
-├── core/                # Rust backend: API, daemon (startd), CLI (start-cli)
-├── debian/              # Debian package maintainer scripts
-├── image-recipe/        # Scripts for building StartOS images
-├── patch-db/            # (submodule) Diff-based data store for frontend sync
-├── sdk/                 # TypeScript SDK for building StartOS packages
-└── web/                 # Web UIs (Angular)
+├── assets/
+├── container-runtime/
+├── core/
+├── build/
+├── debian/
+├── web/
+├── image-recipe/
+├── patch-db
+└── sdk/
 ```
 
-See component READMEs for details:
-- [`core`](core/README.md)
-- [`web`](web/README.md)
-- [`build`](build/README.md)
-- [`patch-db`](https://github.com/Start9Labs/patch-db)
+#### assets
+
+screenshots for the StartOS README
+
+#### container-runtime
+
+A NodeJS program that dynamically loads maintainer scripts and communicates with the OS to manage packages
+
+#### core
+
+An API, daemon (startd), and CLI (start-cli) that together provide the core functionality of StartOS.
+
+#### build
+
+Auxiliary files and scripts to include in deployed StartOS images
+
+#### debian
+
+Maintainer scripts for the StartOS Debian package
+
+#### web
+
+Web UIs served under various conditions and used to interact with StartOS APIs.
+
+#### image-recipe
+
+Scripts for building StartOS images
+
+#### patch-db (submodule)
+
+A diff based data store used to synchronize data between the web interfaces and server.
+
+#### sdk
+
+A typescript sdk for building start-os packages
 
 ## Environment Setup
 
+#### Clone the StartOS repository
+
 ```sh
 git clone https://github.com/Start9Labs/start-os.git --recurse-submodules
 cd start-os
 ```
 
-### Development Mode
+#### Continue to your project of interest for additional instructions:
 
-For faster iteration during development:
-
-```sh
-. ./devmode.sh
-```
-
-This sets `ENVIRONMENT=dev` and `GIT_BRANCH_AS_HASH=1` to prevent rebuilds on every commit.
+- [`core`](core/README.md)
+- [`web-interfaces`](web-interfaces/README.md)
+- [`build`](build/README.md)
+- [`patch-db`](https://github.com/Start9Labs/patch-db)
 
 ## Building
 
-All builds can be performed on any operating system that can run Docker.
-
-This project uses [GNU Make](https://www.gnu.org/software/make/) to build its components.
+This project uses [GNU Make](https://www.gnu.org/software/make/) to build its components. To build any specific component, simply run `make <TARGET>` replacing `<TARGET>` with the name of the target you'd like to build
 
 ### Requirements
 
 - [GNU Make](https://www.gnu.org/software/make/)
-- [Docker](https://docs.docker.com/get-docker/) or [Podman](https://podman.io/)
+- [Docker](https://docs.docker.com/get-docker/)
 - [NodeJS v20.16.0](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
-- [Rust](https://rustup.rs/) (nightly for formatting)
-- [sed](https://www.gnu.org/software/sed/), [grep](https://www.gnu.org/software/grep/), [awk](https://www.gnu.org/software/gawk/)
+- [sed](https://www.gnu.org/software/sed/)
+- [grep](https://www.gnu.org/software/grep/)
+- [awk](https://www.gnu.org/software/gawk/)
 - [jq](https://jqlang.github.io/jq/)
-- [gzip](https://www.gnu.org/software/gzip/), [brotli](https://github.com/google/brotli)
+- [gzip](https://www.gnu.org/software/gzip/)
+- [brotli](https://github.com/google/brotli)
 
-### Environment Variables
+### Environment variables
 
-| Variable | Description |
-|----------|-------------|
-| `PLATFORM` | Target platform: `x86_64`, `x86_64-nonfree`, `aarch64`, `aarch64-nonfree`, `riscv64`, `raspberrypi` |
-| `ENVIRONMENT` | Hyphen-separated feature flags (see below) |
-| `PROFILE` | Build profile: `release` (default) or `dev` |
-| `GIT_BRANCH_AS_HASH` | Set to `1` to use git branch name as version hash (avoids rebuilds) |
+- `PLATFORM`: which platform you would like to build for. Must be one of `x86_64`, `x86_64-nonfree`, `aarch64`, `aarch64-nonfree`, `raspberrypi`
+  - NOTE: `nonfree` images are for including `nonfree` firmware packages in the built ISO
+- `ENVIRONMENT`: a hyphen separated set of feature flags to enable
+  - `dev`: enables password ssh (INSECURE!) and does not compress frontends
+  - `unstable`: enables assertions that will cause errors on unexpected inconsistencies that are undesirable in production use either for performance or reliability reasons
+  - `docker`: use `docker` instead of `podman`
+- `GIT_BRANCH_AS_HASH`: set to `1` to use the current git branch name as the git hash so that the project does not need to be rebuilt on each commit
 
-**ENVIRONMENT flags:**
-- `dev` - Enables password SSH before setup, skips frontend compression
-- `unstable` - Enables assertions and debugging with performance penalty
-- `console` - Enables tokio-console for async debugging
-
-**Platform notes:**
-- `-nonfree` variants include proprietary firmware and drivers
-- `raspberrypi` includes non-free components by necessity
-- Platform is remembered between builds if not specified
-
-### Make Targets
-
-#### Building
-
-| Target | Description |
-|--------|-------------|
-| `iso` | Create full `.iso` image (not for raspberrypi) |
-| `img` | Create full `.img` image (raspberrypi only) |
-| `deb` | Build Debian package |
-| `all` | Build all Rust binaries |
-| `uis` | Build all web UIs |
-| `ui` | Build main UI only |
-| `ts-bindings` | Generate TypeScript bindings from Rust types |
-
-#### Deploying to Device
-
-For devices on the same network:
-
-| Target | Description |
-|--------|-------------|
-| `update-startbox REMOTE=start9@<ip>` | Deploy binary + UI only (fastest) |
-| `update-deb REMOTE=start9@<ip>` | Deploy full Debian package |
-| `update REMOTE=start9@<ip>` | OTA-style update |
-| `reflash REMOTE=start9@<ip>` | Reflash as if using live ISO |
-| `update-overlay REMOTE=start9@<ip>` | Deploy to in-memory overlay (reverts on reboot) |
-
-For devices on different networks (uses [magic-wormhole](https://github.com/magic-wormhole/magic-wormhole)):
-
-| Target | Description |
-|--------|-------------|
-| `wormhole` | Send startbox binary |
-| `wormhole-deb` | Send Debian package |
-| `wormhole-squashfs` | Send squashfs image |
-
-#### Other
-
-| Target | Description |
-|--------|-------------|
-| `format` | Run code formatting (Rust nightly required) |
-| `test` | Run all automated tests |
-| `test-core` | Run Rust tests |
-| `test-sdk` | Run SDK tests |
-| `test-container-runtime` | Run container runtime tests |
-| `clean` | Delete all compiled artifacts |
-
-## Testing
-
-```bash
-make test                    # All tests
-make test-core               # Rust tests (via ./core/run-tests.sh)
-make test-sdk                # SDK tests
-make test-container-runtime  # Container runtime tests
-
-# Run specific Rust test
-cd core && cargo test <test_name> --features=test
-```
-
-## Code Formatting
-
-```bash
-# Rust (requires nightly)
-make format
-
-# TypeScript/HTML/SCSS (web)
-cd web && npm run format
-```
-
-## Code Style Guidelines
-
-### Formatting
-
-Run the formatters before committing. Configuration is handled by `rustfmt.toml` (Rust) and prettier configs (TypeScript).
-
-### Documentation & Comments
-
-**Rust:**
-- Add doc comments (`///`) to public APIs, structs, and non-obvious functions
-- Use `//` comments sparingly for complex logic that isn't self-evident
-- Prefer self-documenting code (clear naming, small functions) over comments
-
-**TypeScript:**
-- Document exported functions and complex types with JSDoc
-- Keep comments focused on "why" rather than "what"
-
-**General:**
-- Don't add comments that just restate the code
-- Update or remove comments when code changes
-- TODOs should include context: `// TODO(username): reason`
-
-### Commit Messages
-
-Use [Conventional Commits](https://www.conventionalcommits.org/):
-
-```
-<type>(<scope>): <description>
-
-[optional body]
-
-[optional footer]
-```
-
-**Types:**
-- `feat` - New feature
-- `fix` - Bug fix
-- `docs` - Documentation only
-- `style` - Formatting, no code change
-- `refactor` - Code change that neither fixes a bug nor adds a feature
-- `test` - Adding or updating tests
-- `chore` - Build process, dependencies, etc.
-
-**Examples:**
-```
-feat(web): add dark mode toggle
-fix(core): resolve race condition in service startup
-docs: update CONTRIBUTING.md with style guidelines
-refactor(sdk): simplify package validation logic
-```
+### Useful Make Targets
 
+- `iso`: Create a full `.iso` image
+  - Only possible from Debian
+  - Not available for `PLATFORM=raspberrypi`
+  - Additional Requirements:
+    - [debspawn](https://github.com/lkhq/debspawn)
+- `img`: Create a full `.img` image
+  - Only possible from Debian
+  - Only available for `PLATFORM=raspberrypi`
+  - Additional Requirements:
+    - [debspawn](https://github.com/lkhq/debspawn)
+- `format`: Run automatic code formatting for the project
+  - Additional Requirements:
+    - [rust](https://rustup.rs/)
+- `test`: Run automated tests for the project
+  - Additional Requirements:
+    - [rust](https://rustup.rs/)
+- `update`: Deploy the current working project to a device over ssh as if through an over-the-air update
+  - Requires an argument `REMOTE` which is the ssh address of the device, i.e. `start9@192.168.122.2`
+- `reflash`: Deploy the current working project to a device over ssh as if using a live `iso` image to reflash it
+  - Requires an argument `REMOTE` which is the ssh address of the device, i.e. `start9@192.168.122.2`
+- `update-overlay`: Deploy the current working project to a device over ssh to the in-memory overlay without restarting it
+  - WARNING: changes will be reverted after the device is rebooted
+  - WARNING: changes to `init` will not take effect as the device is already initialized
+  - Requires an argument `REMOTE` which is the ssh address of the device, i.e. `start9@192.168.122.2`
+- `wormhole`: Deploy the `startbox` to a device using [magic-wormhole](https://github.com/magic-wormhole/magic-wormhole)
+  - When the build it complete will emit a command to paste into the shell of the device to upgrade it
+  - Additional Requirements:
+    - [magic-wormhole](https://github.com/magic-wormhole/magic-wormhole)
+- `clean`: Delete all compiled artifacts

Makefile

@@ -12,8 +12,8 @@ RUST_ARCH := $(shell if [ "$(ARCH)" = "riscv64" ]; then echo riscv64gc; else ech
 REGISTRY_BASENAME := $(shell PROJECT=start-registry PLATFORM=$(ARCH) ./build/env/basename.sh)
 TUNNEL_BASENAME := $(shell PROJECT=start-tunnel PLATFORM=$(ARCH) ./build/env/basename.sh)
 IMAGE_TYPE=$(shell if [ "$(PLATFORM)" = raspberrypi ]; then echo img; else echo iso; fi)
-WEB_UIS := web/dist/raw/ui/index.html web/dist/raw/setup-wizard/index.html
-COMPRESSED_WEB_UIS := web/dist/static/ui/index.html web/dist/static/setup-wizard/index.html
+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 := build/lib/firmware/$(PLATFORM) $(shell jq --raw-output '.[] | select(.platform[] | contains("$(PLATFORM)")) | "./build/lib/firmware/$(PLATFORM)/" + .id + ".rom.gz"' build/lib/firmware.json)
 BUILD_SRC := $(call ls-files, build/lib) build/lib/depends build/lib/conflicts $(FIRMWARE_ROMS)
 IMAGE_RECIPE_SRC := $(call ls-files, build/image-recipe/)
@@ -22,6 +22,7 @@ CORE_SRC := $(call ls-files, core) $(shell git ls-files --recurse-submodules pat
 WEB_SHARED_SRC := $(call ls-files, web/projects/shared) $(call ls-files, web/projects/marketplace) $(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 := $(call ls-files, web/projects/ui)
 WEB_SETUP_WIZARD_SRC := $(call ls-files, web/projects/setup-wizard)
+WEB_INSTALL_WIZARD_SRC := $(call ls-files, web/projects/install-wizard)
 WEB_START_TUNNEL_SRC := $(call ls-files, web/projects/start-tunnel)
 PATCH_DB_CLIENT_SRC := $(shell git ls-files --recurse-submodules patch-db/client)
 GZIP_BIN := $(shell which pigz || which gzip)
@@ -324,19 +325,19 @@ web/.angular/.updated: patch-db/client/dist/index.js sdk/baseDist/package.json w
 	mkdir -p web/.angular
 	touch web/.angular/.updated
 
-web/.i18n-checked: $(WEB_SHARED_SRC) $(WEB_UI_SRC) $(WEB_SETUP_WIZARD_SRC) $(WEB_START_TUNNEL_SRC)
-	npm --prefix web run check:i18n
-	touch web/.i18n-checked
-
-web/dist/raw/ui/index.html: $(WEB_UI_SRC) $(WEB_SHARED_SRC) web/.angular/.updated web/.i18n-checked
+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/index.html
 
-web/dist/raw/setup-wizard/index.html: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular/.updated web/.i18n-checked
+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/index.html
 
-web/dist/raw/start-tunnel/index.html: $(WEB_START_TUNNEL_SRC) $(WEB_SHARED_SRC) web/.angular/.updated web/.i18n-checked
+web/dist/raw/install-wizard/index.html: $(WEB_INSTALL_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
+	npm --prefix web run build:install
+	touch web/dist/raw/install-wizard/index.html
+
+web/dist/raw/start-tunnel/index.html: $(WEB_START_TUNNEL_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
 	npm --prefix web run build:tunnel
 	touch web/dist/raw/start-tunnel/index.html
 

START-TUNNEL.md

@@ -0,0 +1,95 @@
+# StartTunnel
+
+A self-hosted WireGuard VPN optimized for creating VLANs and reverse tunneling to personal servers.
+
+You can think of StartTunnel as "virtual router in the cloud".
+
+Use it for private remote access to self-hosted services running on a personal server, or to expose self-hosted services to the public Internet without revealing the host server's IP address.
+
+## Features
+
+- **Create Subnets**: Each subnet creates a private, virtual local area network (VLAN), similar to the LAN created by a home router.
+
+- **Add Devices**: When you add a device (server, phone, laptop) to a subnet, it receives a LAN IP address on that subnet as well as a unique WireGuard config that must be copied, downloaded, or scanned into the device.
+
+- **Forward Ports**: Forwarding a port creates a "reverse tunnel", exposing a specific port on a specific device to the public Internet.
+
+## Installation
+
+1.  Rent a low cost VPS. For most use cases, the cheapest option should be enough.
+
+    - It must have a dedicated public IP address.
+    - For compute (CPU), memory (RAM), and storage (disk), choose the minimum spec.
+    - For transfer (bandwidth), it depends on (1) your use case and (2) your home Internet's _upload_ speed. Even if you intend to serve large files or stream content from your server, there is no reason to pay for speeds that exceed your home Internet's upload speed.
+
+1.  Provision the VPS with the latest version of Debian.
+
+1.  Access the VPS via SSH.
+
+1.  Run the StartTunnel install script:
+
+        curl -fsSL https://start9labs.github.io/start-tunnel | sh
+
+1.  [Initialize the web interface](#web-interface) (recommended)
+
+## Updating
+
+Simply re-run the install command:
+
+```sh
+curl -fsSL https://start9labs.github.io/start-tunnel | sh
+```
+
+## CLI
+
+By default, StartTunnel is managed via the `start-tunnel` command line interface, which is self-documented.
+
+```
+start-tunnel --help
+```
+
+## Web Interface
+
+Enable the web interface (recommended in most cases) to access your StartTunnel from the browser or via API.
+
+1.  Initialize the web interface.
+
+        start-tunnel web init
+
+1.  If your VPS has multiple public IP addresses, you will be prompted to select the IP address at which to host the web interface.
+
+1.  When prompted, enter the port at which to host the web interface. The default is 8443, and we recommend using it. If you change the default, choose an uncommon port to avoid future conflicts.
+
+1.  To access your StartTunnel web interface securely over HTTPS, you need an SSL certificate. When prompted, select whether to autogenerate a certificate or provide your own. _This is only for accessing your StartTunnel web interface_.
+
+1.  You will receive a success message with 3 pieces of information:
+
+    - **<https://IP:port>**: the URL where you can reach your personal web interface.
+    - **Password**: an autogenerated password for your interface. If you lose/forget it, you can reset it using the start-tunnel CLI.
+    - **Root Certificate Authority**: the Root CA of your StartTunnel instance.
+
+1.  If you autogenerated your SSL certificate, visiting the `https://IP:port` URL in the browser will warn you that the website is insecure. This is expected. You have two options for getting past this warning:
+    - option 1 (recommended): [Trust your StartTunnel Root CA on your connecting device](#trusting-your-starttunnel-root-ca).
+    - Option 2: bypass the warning in the browser, creating a one-time security exception.
+
+### Trusting your StartTunnel Root CA
+
+1. Copy the contents of your Root CA (starting with -----BEGIN CERTIFICATE----- and ending with -----END CERTIFICATE-----).
+
+2. Open a text editor:
+
+   - Linux: gedit, nano, or any editor
+   - Mac: TextEdit
+   - Windows: Notepad
+
+3. Paste the contents of your Root CA.
+
+4. Save the file with a `.crt` extension (e.g. `start-tunnel.crt`) (make sure it saves as plain text, not rich text).
+
+5. Trust the Root CA on your client device(s):
+
+   - [Linux](https://staging.docs.start9.com/device-guides/linux/ca.html)
+   - [Mac](https://staging.docs.start9.com/device-guides/mac/ca.html)
+   - [Windows](https://staging.docs.start9.com/device-guides/windows/ca.html)
+   - [Android/Graphene](https://staging.docs.start9.com/device-guides/android/ca.html)
+   - [iOS](https://staging.docs.start9.com/device-guides/ios/ca.html)

agents/TODO.md

@@ -1,9 +0,0 @@
-# AI Agent TODOs
-
-Pending tasks for AI agents. Remove items when completed.
-
-## Unreviewed CLAUDE.md Sections
-
-- [ ] Architecture - Web (`/web`) - @MattDHill
-
-

agents/core-rust-patterns.md

@@ -1,249 +0,0 @@
-# Utilities & Patterns
-
-This document covers common utilities and patterns used throughout the StartOS codebase.
-
-## Util Module (`core/src/util/`)
-
-The `util` module contains reusable utilities. Key submodules:
-
-| Module | Purpose |
-|--------|---------|
-| `actor/` | Actor pattern implementation for concurrent state management |
-| `collections/` | Custom collection types |
-| `crypto.rs` | Cryptographic utilities (encryption, hashing) |
-| `future.rs` | Future/async utilities |
-| `io.rs` | File I/O helpers (create_file, canonicalize, etc.) |
-| `iter.rs` | Iterator extensions |
-| `net.rs` | Network utilities |
-| `rpc.rs` | RPC helpers |
-| `rpc_client.rs` | RPC client utilities |
-| `serde.rs` | Serialization helpers (Base64, display/fromstr, etc.) |
-| `sync.rs` | Synchronization primitives (SyncMutex, etc.) |
-
-## Command Invocation (`Invoke` trait)
-
-The `Invoke` trait provides a clean way to run external commands with error handling:
-
-```rust
-use crate::util::Invoke;
-
-// Simple invocation
-tokio::process::Command::new("ls")
-    .arg("-la")
-    .invoke(ErrorKind::Filesystem)
-    .await?;
-
-// With timeout
-tokio::process::Command::new("slow-command")
-    .timeout(Some(Duration::from_secs(30)))
-    .invoke(ErrorKind::Timeout)
-    .await?;
-
-// With input
-let mut input = Cursor::new(b"input data");
-tokio::process::Command::new("cat")
-    .input(Some(&mut input))
-    .invoke(ErrorKind::Filesystem)
-    .await?;
-
-// Piped commands
-tokio::process::Command::new("cat")
-    .arg("file.txt")
-    .pipe(&mut tokio::process::Command::new("grep").arg("pattern"))
-    .invoke(ErrorKind::Filesystem)
-    .await?;
-```
-
-## Guard Pattern
-
-Guards ensure cleanup happens when they go out of scope.
-
-### `GeneralGuard` / `GeneralBoxedGuard`
-
-For arbitrary cleanup actions:
-
-```rust
-use crate::util::GeneralGuard;
-
-let guard = GeneralGuard::new(|| {
-    println!("Cleanup runs on drop");
-});
-
-// Do work...
-
-// Explicit drop with action
-guard.drop();
-
-// Or skip the action
-// guard.drop_without_action();
-```
-
-### `FileLock`
-
-File-based locking with automatic unlock:
-
-```rust
-use crate::util::FileLock;
-
-let lock = FileLock::new("/path/to/lockfile", true).await?;  // blocking=true
-// Lock held until dropped or explicitly unlocked
-lock.unlock().await?;
-```
-
-## Mount Guard Pattern (`core/src/disk/mount/guard.rs`)
-
-RAII guards for filesystem mounts. Ensures filesystems are unmounted when guards are dropped.
-
-### `MountGuard`
-
-Basic mount guard:
-
-```rust
-use crate::disk::mount::guard::MountGuard;
-use crate::disk::mount::filesystem::{MountType, ReadOnly};
-
-let guard = MountGuard::mount(&filesystem, "/mnt/target", ReadOnly).await?;
-
-// Use the mounted filesystem at guard.path()
-do_something(guard.path()).await?;
-
-// Explicit unmount (or auto-unmounts on drop)
-guard.unmount(false).await?;  // false = don't delete mountpoint
-```
-
-### `TmpMountGuard`
-
-Reference-counted temporary mount (mounts to `/media/startos/tmp/`):
-
-```rust
-use crate::disk::mount::guard::TmpMountGuard;
-use crate::disk::mount::filesystem::ReadOnly;
-
-// Multiple clones share the same mount
-let guard1 = TmpMountGuard::mount(&filesystem, ReadOnly).await?;
-let guard2 = guard1.clone();
-
-// Mount stays alive while any guard exists
-// Auto-unmounts when last guard is dropped
-```
-
-### `GenericMountGuard` trait
-
-All mount guards implement this trait:
-
-```rust
-pub trait GenericMountGuard: std::fmt::Debug + Send + Sync + 'static {
-    fn path(&self) -> &Path;
-    fn unmount(self) -> impl Future<Output = Result<(), Error>> + Send;
-}
-```
-
-### `SubPath`
-
-Wraps a mount guard to point to a subdirectory:
-
-```rust
-use crate::disk::mount::guard::SubPath;
-
-let mount = TmpMountGuard::mount(&filesystem, ReadOnly).await?;
-let subdir = SubPath::new(mount, "data/subdir");
-
-// subdir.path() returns the full path including subdirectory
-```
-
-## FileSystem Implementations (`core/src/disk/mount/filesystem/`)
-
-Various filesystem types that can be mounted:
-
-| Type | Description |
-|------|-------------|
-| `bind.rs` | Bind mounts |
-| `block_dev.rs` | Block device mounts |
-| `cifs.rs` | CIFS/SMB network shares |
-| `ecryptfs.rs` | Encrypted filesystem |
-| `efivarfs.rs` | EFI variables |
-| `httpdirfs.rs` | HTTP directory as filesystem |
-| `idmapped.rs` | ID-mapped mounts |
-| `label.rs` | Mount by label |
-| `loop_dev.rs` | Loop device mounts |
-| `overlayfs.rs` | Overlay filesystem |
-
-## Other Useful Utilities
-
-### `Apply` / `ApplyRef` traits
-
-Fluent method chaining:
-
-```rust
-use crate::util::Apply;
-
-let result = some_value
-    .apply(|v| transform(v))
-    .apply(|v| another_transform(v));
-```
-
-### `Container<T>`
-
-Async-safe optional container:
-
-```rust
-use crate::util::Container;
-
-let container = Container::new(None);
-container.set(value).await;
-let taken = container.take().await;
-```
-
-### `HashWriter<H, W>`
-
-Write data while computing hash:
-
-```rust
-use crate::util::HashWriter;
-use sha2::Sha256;
-
-let writer = HashWriter::new(Sha256::new(), file);
-// Write data...
-let (hasher, file) = writer.finish();
-let hash = hasher.finalize();
-```
-
-### `Never` type
-
-Uninhabited type for impossible cases:
-
-```rust
-use crate::util::Never;
-
-fn impossible() -> Never {
-    // This function can never return
-}
-
-let never: Never = impossible();
-never.absurd::<String>()  // Can convert to any type
-```
-
-### `MaybeOwned<'a, T>`
-
-Either borrowed or owned data:
-
-```rust
-use crate::util::MaybeOwned;
-
-fn accept_either(data: MaybeOwned<'_, String>) {
-    // Use &*data to access the value
-}
-
-accept_either(MaybeOwned::from(&existing_string));
-accept_either(MaybeOwned::from(owned_string));
-```
-
-### `new_guid()`
-
-Generate a random GUID:
-
-```rust
-use crate::util::new_guid;
-
-let guid = new_guid();  // Returns InternedString
-```

agents/exver.md

@@ -1,301 +0,0 @@
-# exver — Extended Versioning
-
-Extended semver supporting **downstream versioning** (wrapper updates independent of upstream) and **flavors** (package fork variants).
-
-Two implementations exist:
-- **Rust crate** (`exver`) — used in `core/`. Source: https://github.com/Start9Labs/exver-rs
-- **TypeScript** (`sdk/base/lib/exver/index.ts`) — used in `sdk/` and `web/`
-
-Both parse the same string format and agree on `satisfies` semantics.
-
-## Version Format
-
-An **ExtendedVersion** string looks like:
-
-```
-[#flavor:]upstream:downstream
-```
-
-- **upstream** — the original package version (semver-style: `1.2.3`, `1.2.3-beta.1`)
-- **downstream** — the StartOS wrapper version (incremented independently)
-- **flavor** — optional lowercase ASCII prefix for fork variants
-
-Examples:
-- `1.2.3:0` — upstream 1.2.3, first downstream release
-- `1.2.3:2` — upstream 1.2.3, third downstream release
-- `#bitcoin:21.0:1` — bitcoin flavor, upstream 21.0, downstream 1
-- `1.0.0-rc.1:0` — upstream with prerelease tag
-
-## Core Types
-
-### `Version`
-
-A semver-style version with arbitrary digit segments and optional prerelease.
-
-**Rust:**
-```rust
-use exver::Version;
-
-let v = Version::new([1, 2, 3], []);              // 1.2.3
-let v = Version::new([1, 0], ["beta".into()]);     // 1.0-beta
-let v: Version = "1.2.3".parse().unwrap();
-
-v.number()      // &[1, 2, 3]
-v.prerelease()  // &[]
-```
-
-**TypeScript:**
-```typescript
-const v = new Version([1, 2, 3], [])
-const v = Version.parse("1.2.3")
-
-v.number      // number[]
-v.prerelease  // (string | number)[]
-v.compare(other)        // 'greater' | 'equal' | 'less'
-v.compareForSort(other) // -1 | 0 | 1
-```
-
-Default: `0`
-
-### `ExtendedVersion`
-
-The primary version type. Wraps upstream + downstream `Version` plus an optional flavor.
-
-**Rust:**
-```rust
-use exver::ExtendedVersion;
-
-let ev = ExtendedVersion::new(
-    Version::new([1, 2, 3], []),
-    Version::default(),          // downstream = 0
-);
-let ev: ExtendedVersion = "1.2.3:0".parse().unwrap();
-
-ev.flavor()      // Option<&str>
-ev.upstream()    // &Version
-ev.downstream()  // &Version
-
-// Builder methods (consuming):
-ev.with_flavor("bitcoin")
-ev.without_flavor()
-ev.map_upstream(|v| ...)
-ev.map_downstream(|v| ...)
-```
-
-**TypeScript:**
-```typescript
-const ev = new ExtendedVersion(null, upstream, downstream)
-const ev = ExtendedVersion.parse("1.2.3:0")
-const ev = ExtendedVersion.parseEmver("1.2.3.4")  // emver compat
-
-ev.flavor      // string | null
-ev.upstream    // Version
-ev.downstream  // Version
-
-ev.compare(other)        // 'greater' | 'equal' | 'less' | null
-ev.equals(other)         // boolean
-ev.greaterThan(other)    // boolean
-ev.lessThan(other)       // boolean
-ev.incrementMajor()      // new ExtendedVersion
-ev.incrementMinor()      // new ExtendedVersion
-```
-
-**Ordering:** Versions with different flavors are **not comparable** (`PartialOrd`/`compare` returns `None`/`null`).
-
-Default: `0:0`
-
-### `VersionString` (Rust only, StartOS wrapper)
-
-Defined in `core/src/util/version.rs`. Caches the original string representation alongside the parsed `ExtendedVersion`. Used as the key type in registry version maps.
-
-```rust
-use crate::util::VersionString;
-
-let vs: VersionString = "1.2.3:0".parse().unwrap();
-let vs = VersionString::from(extended_version);
-
-// Deref to ExtendedVersion:
-vs.satisfies(&range);
-vs.upstream();
-
-// String access:
-vs.as_str();           // &str
-AsRef::<str>::as_ref(&vs);
-```
-
-`Ord` is implemented with a total ordering — versions with different flavors are ordered by flavor name (unflavored sorts last).
-
-### `VersionRange`
-
-A predicate over `ExtendedVersion`. Supports comparison operators, boolean logic, and flavor constraints.
-
-**Rust:**
-```rust
-use exver::VersionRange;
-
-// Constructors:
-VersionRange::any()                          // matches everything
-VersionRange::none()                         // matches nothing
-VersionRange::exactly(ev)                    // = ev
-VersionRange::anchor(GTE, ev)               // >= ev
-VersionRange::caret(ev)                      // ^ev (compatible changes)
-VersionRange::tilde(ev)                      // ~ev (patch-level changes)
-
-// Combinators (smart — eagerly simplify):
-VersionRange::and(a, b)                      // a && b
-VersionRange::or(a, b)                       // a || b
-VersionRange::not(a)                         // !a
-
-// Parsing:
-let r: VersionRange = ">=1.0.0:0".parse().unwrap();
-let r: VersionRange = "^1.2.3:0".parse().unwrap();
-let r: VersionRange = ">=1.0.0 <2.0.0".parse().unwrap();   // implicit AND
-let r: VersionRange = ">=1.0.0 || >=2.0.0".parse().unwrap();
-let r: VersionRange = "#bitcoin".parse().unwrap();          // flavor match
-let r: VersionRange = "*".parse().unwrap();                 // any
-
-// Monoid wrappers for folding:
-AnyRange  // fold with or, empty = None
-AllRange  // fold with and, empty = Any
-```
-
-**TypeScript:**
-```typescript
-// Constructors:
-VersionRange.any()
-VersionRange.none()
-VersionRange.anchor('=', ev)
-VersionRange.anchor('>=', ev)
-VersionRange.anchor('^', ev)                 // ^ and ~ are first-class operators
-VersionRange.anchor('~', ev)
-VersionRange.flavor(null)                    // match unflavored versions
-VersionRange.flavor("bitcoin")               // match #bitcoin versions
-
-// Combinators — static (smart, variadic):
-VersionRange.and(a, b, c, ...)
-VersionRange.or(a, b, c, ...)
-
-// Combinators — instance (not smart, just wrap):
-range.and(other)
-range.or(other)
-range.not()
-
-// Parsing:
-VersionRange.parse(">=1.0.0:0")
-VersionRange.parseEmver(">=1.2.3.4")        // emver compat
-
-// Analysis (TS only):
-range.normalize()                            // canonical form (see below)
-range.satisfiable()                          // boolean
-range.intersects(other)                      // boolean
-```
-
-**Checking satisfaction:**
-
-```rust
-// Rust:
-version.satisfies(&range)  // bool
-```
-```typescript
-// TypeScript:
-version.satisfies(range)   // boolean
-range.satisfiedBy(version) // boolean (convenience)
-```
-
-Also available on `Version` (wraps in `ExtendedVersion` with downstream=0).
-
-When no operator is specified in a range string, `^` (caret) is the default.
-
-## Operators
-
-| Syntax | Rust | TS | Meaning |
-|--------|------|----|---------|
-| `=`    | `EQ` | `'='` | Equal |
-| `!=`   | `NEQ` | `'!='` | Not equal |
-| `>`    | `GT` | `'>'` | Greater than |
-| `>=`   | `GTE` | `'>='` | Greater than or equal |
-| `<`    | `LT` | `'<'` | Less than |
-| `<=`   | `LTE` | `'<='` | Less than or equal |
-| `^`    | expanded to `And(GTE, LT)` | `'^'` | Compatible (first non-zero digit unchanged) |
-| `~`    | expanded to `And(GTE, LT)` | `'~'` | Patch-level (minor unchanged) |
-
-## Flavor Rules
-
-- Versions with **different flavors** never satisfy comparison operators (except `!=`, which returns true)
-- `VersionRange::Flavor(Some("bitcoin"))` matches only `#bitcoin:*` versions
-- `VersionRange::Flavor(None)` matches only unflavored versions
-- Flavor constraints compose with `and`/`or`/`not` like any other range
-
-## Reduction and Normalization
-
-### Rust: `reduce()` (shallow)
-
-`VersionRange::reduce(self) -> Self` re-applies smart constructor rules to one level of the AST. Useful for simplifying a node that was constructed directly (e.g. deserialized) rather than through the smart constructors.
-
-**Smart constructor rules applied by `and`, `or`, `not`, and `reduce`:**
-
-`and`:
-- `and(Any, b) → b`, `and(a, Any) → a`
-- `and(None, _) → None`, `and(_, None) → None`
-
-`or`:
-- `or(Any, _) → Any`, `or(_, Any) → Any`
-- `or(None, b) → b`, `or(a, None) → a`
-
-`not`:
-- `not(=v) → !=v`, `not(!=v) → =v`
-- `not(and(a, b)) → or(not(a), not(b))` (De Morgan)
-- `not(or(a, b)) → and(not(a), not(b))` (De Morgan)
-- `not(not(a)) → a`
-- `not(Any) → None`, `not(None) → Any`
-
-### TypeScript: `normalize()` (deep, canonical)
-
-`VersionRange.normalize(): VersionRange` in `sdk/base/lib/exver/index.ts` performs full normalization by converting the range AST into a canonical form. This is a deep operation that produces a semantically equivalent but simplified range.
-
-**How it works:**
-
-1. **`tables()`** — Converts the VersionRange AST into truth tables (`VersionRangeTable`). Each table is a number line split at version boundary points, with boolean values for each segment indicating whether versions in that segment satisfy the range. Separate tables are maintained per flavor (and for flavor negations).
-
-2. **`VersionRangeTable.zip(a, b, func)`** — Merges two tables by walking their boundary points in sorted order and applying a boolean function (`&&` or `||`) to combine segment values. Adjacent segments with the same boolean value are collapsed automatically.
-
-3. **`VersionRangeTable.and/or/not`** — Table-level boolean operations. `and` computes the cross-product of flavor tables (since `#a && #b` for different flavors is unsatisfiable). `not` inverts all segment values.
-
-4. **`VersionRangeTable.collapse()`** — Checks if a table is uniformly true or false across all flavors and segments. Returns `true`, `false`, or `null` (mixed).
-
-5. **`VersionRangeTable.minterms()`** — Converts truth tables back into a VersionRange AST in [sum-of-products](https://en.wikipedia.org/wiki/Canonical_normal_form#Minterms) canonical form. Each `true` segment becomes a product term (conjunction of boundary constraints), and all terms are joined with `or`. Adjacent boundary points collapse into `=` anchors.
-
-**Example:** `normalize` can simplify:
-- `>=1.0.0:0 && <=1.0.0:0` → `=1.0.0:0`
-- `>=2.0.0:0 || >=1.0.0:0` → `>=1.0.0:0`
-- `!(!>=1.0.0:0)` → `>=1.0.0:0`
-
-**Also exposes:**
-- `satisfiable(): boolean` — returns `true` if there exists any version satisfying the range (checks if `collapse(tables())` is not `false`)
-- `intersects(other): boolean` — returns `true` if `and(this, other)` is satisfiable
-
-## API Differences Between Rust and TypeScript
-
-| | Rust | TypeScript |
-|-|------|------------|
-| **`^` / `~`** | Expanded at construction to `And(GTE, LT)` | First-class operator on `Anchor` |
-| **`not()`** | Static, eagerly simplifies (De Morgan, double negation) | Instance method, just wraps |
-| **`and()`/`or()`** | Binary static | Both binary instance and variadic static |
-| **Normalization** | `reduce()` — shallow, one AST level | `normalize()` — deep canonical form via truth tables |
-| **Satisfiability** | Not available | `satisfiable()` and `intersects(other)` |
-| **ExtendedVersion helpers** | `with_flavor()`, `without_flavor()`, `map_upstream()`, `map_downstream()` | `incrementMajor()`, `incrementMinor()`, `greaterThan()`, `lessThan()`, `equals()`, etc. |
-| **Monoid wrappers** | `AnyRange` (fold with `or`) and `AllRange` (fold with `and`) | Not present — use variadic static methods |
-| **`VersionString`** | Wrapper caching parsed + string form | Not present |
-| **Emver compat** | `From<emver::Version>` for `ExtendedVersion` | `ExtendedVersion.parseEmver()`, `VersionRange.parseEmver()` |
-
-## Serde
-
-All types serialize/deserialize as strings (requires `serde` feature, enabled in StartOS):
-
-```json
-{
-  "version": "1.2.3:0",
-  "targetVersion": ">=1.0.0:0 <2.0.0:0",
-  "sourceVersion": "^0.3.0:0"
-}
-```

agents/i18n-patterns.md

@@ -1,100 +0,0 @@
-# i18n Patterns in `core/`
-
-## Library & Setup
-
-**Crate:** [`rust-i18n`](https://crates.io/crates/rust-i18n) v3.1.5 (`core/Cargo.toml`)
-
-**Initialization** (`core/src/lib.rs:3`):
-```rust
-rust_i18n::i18n!("locales", fallback = ["en_US"]);
-```
-This macro scans `core/locales/` at compile time and embeds all translations as constants.
-
-**Prelude re-export** (`core/src/prelude.rs:4`):
-```rust
-pub use rust_i18n::t;
-```
-Most modules import `t!` via the prelude.
-
-## Translation File
-
-**Location:** `core/locales/i18n.yaml`
-**Format:** YAML v2 (~755 keys)
-
-**Supported languages:** `en_US`, `de_DE`, `es_ES`, `fr_FR`, `pl_PL`
-
-**Entry structure:**
-```yaml
-namespace.sub.key-name:
-  en_US: "English text with %{param}"
-  de_DE: "German text with %{param}"
-  # ...
-```
-
-## Using `t!()`
-
-```rust
-// Simple key
-t!("error.unknown")
-
-// With parameter interpolation (%{name} in YAML)
-t!("bins.deprecated.renamed", old = old_name, new = new_name)
-```
-
-## Key Naming Conventions
-
-Keys use **dot-separated hierarchical namespaces** with **kebab-case** for multi-word segments:
-
-```
-<module>.<submodule>.<descriptive-name>
-```
-
-Examples:
-- `error.incorrect-password` — error kind label
-- `bins.start-init.updating-firmware` — startup phase message
-- `backup.bulk.complete-title` — backup notification title
-- `help.arg.acme-contact` — CLI help text for an argument
-- `context.diagnostic.starting-diagnostic-ui` — diagnostic context status
-
-### Top-Level Namespaces
-
-| Namespace | Purpose |
-|-----------|---------|
-| `error.*` | `ErrorKind` display strings (see `src/error.rs`) |
-| `bins.*` | CLI binary messages (deprecated, start-init, startd, etc.) |
-| `init.*` | Initialization phase labels |
-| `setup.*` | First-run setup messages |
-| `context.*` | Context startup messages (diagnostic, setup, CLI) |
-| `service.*` | Service lifecycle messages |
-| `backup.*` | Backup/restore operation messages |
-| `registry.*` | Package registry messages |
-| `net.*` | Network-related messages |
-| `middleware.*` | Request middleware messages (auth, etc.) |
-| `disk.*` | Disk operation messages |
-| `lxc.*` | Container management messages |
-| `system.*` | System monitoring/metrics messages |
-| `notifications.*` | User-facing notification messages |
-| `update.*` | OS update messages |
-| `util.*` | Utility messages (TUI, RPC) |
-| `ssh.*` | SSH operation messages |
-| `shutdown.*` | Shutdown-related messages |
-| `logs.*` | Log-related messages |
-| `auth.*` | Authentication messages |
-| `help.*` | CLI help text (`help.arg.<arg-name>`) |
-| `about.*` | CLI command descriptions |
-
-## Locale Selection
-
-`core/src/bins/mod.rs:15-36` — `set_locale_from_env()`:
-
-1. Reads `LANG` environment variable
-2. Strips `.UTF-8` suffix
-3. Exact-matches against available locales, falls back to language-prefix match (e.g. `en_GB` matches `en_US`)
-
-## Adding New Keys
-
-1. Add the key to `core/locales/i18n.yaml` with all 5 language translations
-2. Use the `t!("your.key.name")` macro in Rust code
-3. Follow existing namespace conventions — match the module path where the key is used
-4. Use kebab-case for multi-word segments
-5. Translations are validated at compile time

agents/rpc-toolkit.md

@@ -1,226 +0,0 @@
-# rpc-toolkit
-
-StartOS uses [rpc-toolkit](https://github.com/Start9Labs/rpc-toolkit) for its JSON-RPC API. This document covers the patterns used in this codebase.
-
-## Overview
-
-The API is JSON-RPC (not REST). All endpoints are RPC methods organized in a hierarchical command structure.
-
-## Handler Functions
-
-There are four types of handler functions, chosen based on the function's characteristics:
-
-### `from_fn_async` - Async handlers
-For standard async functions. Most handlers use this.
-
-```rust
-pub async fn my_handler(ctx: RpcContext, params: MyParams) -> Result<MyResponse, Error> {
-    // Can use .await
-}
-
-from_fn_async(my_handler)
-```
-
-### `from_fn_async_local` - Non-thread-safe async handlers
-For async functions that are not `Send` (cannot be safely moved between threads). Use when working with non-thread-safe types.
-
-```rust
-pub async fn cli_download(ctx: CliContext, params: Params) -> Result<(), Error> {
-    // Non-Send async operations
-}
-
-from_fn_async_local(cli_download)
-```
-
-### `from_fn_blocking` - Sync blocking handlers
-For synchronous functions that perform blocking I/O or long computations.
-
-```rust
-pub fn query_dns(ctx: RpcContext, params: DnsParams) -> Result<DnsResponse, Error> {
-    // Blocking operations (file I/O, DNS lookup, etc.)
-}
-
-from_fn_blocking(query_dns)
-```
-
-### `from_fn` - Sync non-blocking handlers
-For pure functions or quick synchronous operations with no I/O.
-
-```rust
-pub fn echo(ctx: RpcContext, params: EchoParams) -> Result<String, Error> {
-    Ok(params.message)
-}
-
-from_fn(echo)
-```
-
-## ParentHandler
-
-Groups related RPC methods into a hierarchy:
-
-```rust
-use rpc_toolkit::{Context, HandlerExt, ParentHandler, from_fn_async};
-
-pub fn my_api<C: Context>() -> ParentHandler<C> {
-    ParentHandler::new()
-        .subcommand("list", from_fn_async(list_handler).with_call_remote::<CliContext>())
-        .subcommand("create", from_fn_async(create_handler).with_call_remote::<CliContext>())
-}
-```
-
-## Handler Extensions
-
-Chain methods to configure handler behavior.
-
-**Ordering rules:**
-1. `with_about()` must come AFTER other CLI modifiers (`no_display()`, `with_custom_display_fn()`, etc.)
-2. `with_call_remote()` must be the LAST adapter in the chain
-
-| Method | Purpose |
-|--------|---------|
-| `.with_metadata("key", Value)` | Attach metadata for middleware |
-| `.no_cli()` | RPC-only, not available via CLI |
-| `.no_display()` | No CLI output |
-| `.with_display_serializable()` | Default JSON/YAML output for CLI |
-| `.with_custom_display_fn(\|_, res\| ...)` | Custom CLI output formatting |
-| `.with_about("about.description")` | Add help text (i18n key) - **after CLI modifiers** |
-| `.with_call_remote::<CliContext>()` | Enable CLI to call remotely - **must be last** |
-
-### Correct ordering example:
-```rust
-from_fn_async(my_handler)
-    .with_metadata("sync_db", Value::Bool(true))  // metadata early
-    .no_display()                                  // CLI modifier
-    .with_about("about.my-handler")                // after CLI modifiers
-    .with_call_remote::<CliContext>()              // always last
-```
-
-## Metadata by Middleware
-
-Metadata tags are processed by different middleware. Group them logically:
-
-### Auth Middleware (`middleware/auth/mod.rs`)
-
-| Metadata | Default | Description |
-|----------|---------|-------------|
-| `authenticated` | `true` | Whether endpoint requires authentication. Set to `false` for public endpoints. |
-
-### Session Auth Middleware (`middleware/auth/session.rs`)
-
-| Metadata | Default | Description |
-|----------|---------|-------------|
-| `login` | `false` | Special handling for login endpoints (rate limiting, cookie setting) |
-| `get_session` | `false` | Inject session ID into params as `__Auth_session` |
-
-### Signature Auth Middleware (`middleware/auth/signature.rs`)
-
-| Metadata | Default | Description |
-|----------|---------|-------------|
-| `get_signer` | `false` | Inject signer public key into params as `__Auth_signer` |
-
-### Registry Auth (extends Signature Auth)
-
-| Metadata | Default | Description |
-|----------|---------|-------------|
-| `admin` | `false` | Require admin privileges (signer must be in admin list) |
-| `get_device_info` | `false` | Inject device info header for hardware filtering |
-
-### Database Middleware (`middleware/db.rs`)
-
-| Metadata | Default | Description |
-|----------|---------|-------------|
-| `sync_db` | `false` | Sync database after mutation, add `X-Patch-Sequence` header |
-
-## Context Types
-
-Different contexts for different execution environments:
-
-- `RpcContext` - Web/RPC requests with full service access
-- `CliContext` - CLI operations, calls remote RPC
-- `InitContext` - During system initialization
-- `DiagnosticContext` - Diagnostic/recovery mode
-- `RegistryContext` - Registry daemon context
-- `EffectContext` - Service effects context (container-to-host calls)
-
-## Parameter Structs
-
-Parameters use derive macros for JSON-RPC, CLI parsing, and TypeScript generation:
-
-```rust
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]  // JSON-RPC uses camelCase
-#[command(rename_all = "kebab-case")]  // CLI uses kebab-case
-#[ts(export)]  // Generate TypeScript types
-pub struct MyParams {
-    pub package_id: PackageId,
-}
-```
-
-### Middleware Injection
-
-Auth middleware can inject values into params using special field names:
-
-```rust
-#[derive(Deserialize, Serialize, Parser, TS)]
-pub struct MyParams {
-    #[ts(skip)]
-    #[serde(rename = "__Auth_session")]  // Injected by session auth
-    session: InternedString,
-
-    #[ts(skip)]
-    #[serde(rename = "__Auth_signer")]   // Injected by signature auth
-    signer: AnyVerifyingKey,
-
-    #[ts(skip)]
-    #[serde(rename = "__Auth_userAgent")] // Injected during login
-    user_agent: Option<String>,
-}
-```
-
-## Common Patterns
-
-### Adding a New RPC Endpoint
-
-1. Define params struct with `Deserialize, Serialize, Parser, TS`
-2. Choose handler type based on sync/async and thread-safety
-3. Write handler function taking `(Context, Params) -> Result<Response, Error>`
-4. Add to parent handler with appropriate extensions (display modifiers before `with_about`)
-5. TypeScript types auto-generated via `make ts-bindings`
-
-### Public (Unauthenticated) Endpoint
-
-```rust
-from_fn_async(get_info)
-    .with_metadata("authenticated", Value::Bool(false))
-    .with_display_serializable()
-    .with_about("about.get-info")
-    .with_call_remote::<CliContext>()  // last
-```
-
-### Mutating Endpoint with DB Sync
-
-```rust
-from_fn_async(update_config)
-    .with_metadata("sync_db", Value::Bool(true))
-    .no_display()
-    .with_about("about.update-config")
-    .with_call_remote::<CliContext>()  // last
-```
-
-### Session-Aware Endpoint
-
-```rust
-from_fn_async(logout)
-    .with_metadata("get_session", Value::Bool(true))
-    .no_display()
-    .with_about("about.logout")
-    .with_call_remote::<CliContext>()  // last
-```
-
-## File Locations
-
-- Handler definitions: Throughout `core/src/` modules
-- Main API tree: `core/src/lib.rs` (`main_api()`, `server()`, `package()`)
-- Auth middleware: `core/src/middleware/auth/`
-- DB middleware: `core/src/middleware/db.rs`
-- Context types: `core/src/context/`

agents/s9pk-structure.md

@@ -1,122 +0,0 @@
-# S9PK Package Format
-
-S9PK is the package format for StartOS services. Version 2 uses a merkle archive structure for efficient downloading and cryptographic verification.
-
-## File Format
-
-S9PK files begin with a 3-byte header: `0x3b 0x3b 0x02` (magic bytes + version 2).
-
-The archive is cryptographically signed using Ed25519 with prehashed content (SHA-512 over blake3 merkle root hash).
-
-## Archive Structure
-
-```
-/
-├── manifest.json           # Package metadata (required)
-├── icon.<ext>              # Package icon - any image/* format (required)
-├── LICENSE.md              # License text (required)
-├── dependencies/           # Dependency metadata (optional)
-│   └── <package-id>/
-│       ├── metadata.json   # DependencyMetadata
-│       └── icon.<ext>      # Dependency icon
-├── javascript.squashfs     # Package JavaScript code (required)
-├── assets.squashfs         # Static assets (optional, legacy: assets/ directory)
-└── images/                 # Container images by architecture
-    └── <arch>/             # e.g., x86_64, aarch64, riscv64
-        ├── <image-id>.squashfs  # Container filesystem
-        ├── <image-id>.json      # Image metadata
-        └── <image-id>.env       # Environment variables
-```
-
-## Components
-
-### manifest.json
-
-The package manifest contains all metadata:
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `id` | string | Package identifier (e.g., `bitcoind`) |
-| `title` | string | Display name |
-| `version` | string | Extended version string |
-| `satisfies` | string[] | Version ranges this version satisfies |
-| `releaseNotes` | string/object | Release notes (localized) |
-| `canMigrateTo` | string | Version range for forward migration |
-| `canMigrateFrom` | string | Version range for backward migration |
-| `license` | string | License type |
-| `wrapperRepo` | string | StartOS wrapper repository URL |
-| `upstreamRepo` | string | Upstream project URL |
-| `supportSite` | string | Support site URL |
-| `marketingSite` | string | Marketing site URL |
-| `donationUrl` | string? | Optional donation URL |
-| `docsUrl` | string? | Optional documentation URL |
-| `description` | object | Short and long descriptions (localized) |
-| `images` | object | Image configurations by image ID |
-| `volumes` | string[] | Volume IDs for persistent data |
-| `alerts` | object | User alerts for lifecycle events |
-| `dependencies` | object | Package dependencies |
-| `hardwareRequirements` | object | Hardware requirements (arch, RAM, devices) |
-| `hardwareAcceleration` | boolean | Whether package uses hardware acceleration |
-| `gitHash` | string? | Git commit hash |
-| `osVersion` | string | Minimum StartOS version |
-| `sdkVersion` | string? | SDK version used to build |
-
-### javascript.squashfs
-
-Contains the package JavaScript that implements the `ABI` interface from `@start9labs/start-sdk-base`. This code runs in the container runtime and manages the package lifecycle.
-
-The squashfs is mounted at `/usr/lib/startos/package/` and the runtime loads `index.js`.
-
-### images/
-
-Container images organized by architecture:
-
-- **`<image-id>.squashfs`** - Container root filesystem
-- **`<image-id>.json`** - Image metadata (entrypoint, user, workdir, etc.)
-- **`<image-id>.env`** - Environment variables for the container
-
-Images are built from Docker/Podman and converted to squashfs. The `ImageConfig` in manifest specifies:
-- `arch` - Supported architectures
-- `emulateMissingAs` - Fallback architecture for emulation
-- `nvidiaContainer` - Whether to enable NVIDIA container support
-
-### assets.squashfs
-
-Static assets accessible to the package, mounted read-only at `/media/startos/assets/` in the container.
-
-### dependencies/
-
-Metadata for dependencies displayed in the UI:
-- `metadata.json` - Just title for now
-- `icon.<ext>` - Icon for the dependency
-
-## Merkle Archive
-
-The S9PK uses a merkle tree structure where each file and directory has a blake3 hash. This enables:
-
-1. **Partial downloads** - Download and verify individual files
-2. **Integrity verification** - Verify any subset of the archive
-3. **Efficient updates** - Only download changed portions
-4. **DOS protection** - Size limits enforced before downloading content
-
-Files are sorted by priority for streaming (manifest first, then icon, license, dependencies, javascript, assets, images).
-
-## Building S9PK
-
-Use `start-cli s9pk pack` to build packages:
-
-```bash
-start-cli s9pk pack <manifest-path> -o <output.s9pk>
-```
-
-Images can be sourced from:
-- Docker/Podman build (`--docker-build`)
-- Existing Docker tag (`--docker-tag`)
-- Pre-built squashfs files
-
-## Related Code
-
-- `core/src/s9pk/v2/mod.rs` - S9pk struct and serialization
-- `core/src/s9pk/v2/manifest.rs` - Manifest types
-- `core/src/s9pk/v2/pack.rs` - Packing logic
-- `core/src/s9pk/merkle_archive/` - Merkle archive implementation

build/dpkg-deps/depends

@@ -46,7 +46,6 @@ openssh-server
 podman
 psmisc
 qemu-guest-agent
-qemu-user-static
 rfkill
 rsync
 samba-common-bin

build/image-recipe/build.sh

@@ -154,12 +154,9 @@ prompt 0
 timeout 50
 EOF
 
-# Extract splash.png from the deb package
-dpkg-deb --fsys-tarfile $DEB_PATH | tar --to-stdout -xf - ./usr/lib/startos/splash.png > /tmp/splash.png
-cp /tmp/splash.png config/bootloaders/syslinux_common/splash.png
-cp /tmp/splash.png config/bootloaders/isolinux/splash.png
-cp /tmp/splash.png config/bootloaders/grub-pc/splash.png
-rm /tmp/splash.png
+cp $SOURCE_DIR/splash.png config/bootloaders/syslinux_common/splash.png
+cp $SOURCE_DIR/splash.png config/bootloaders/isolinux/splash.png
+cp $SOURCE_DIR/splash.png config/bootloaders/grub-pc/splash.png
 
 sed -i -e '2i set timeout=5' config/bootloaders/grub-pc/config.cfg
 
@@ -292,8 +289,8 @@ fi
 if [ "${IB_TARGET_PLATFORM}" = "raspberrypi" ]; then
     ln -sf /usr/bin/pi-beep /usr/local/bin/beep
     KERNEL_VERSION=${RPI_KERNEL_VERSION} sh /boot/config.sh > /boot/config.txt
-    mkinitramfs -c gzip -o /boot/initrd.img-${RPI_KERNEL_VERSION}-rpi-v8 ${RPI_KERNEL_VERSION}-rpi-v8
-    mkinitramfs -c gzip -o /boot/initrd.img-${RPI_KERNEL_VERSION}-rpi-2712 ${RPI_KERNEL_VERSION}-rpi-2712
+    mkinitramfs -c gzip -o initrd.img-${RPI_KERNEL_VERSION}-rpi-v8 ${RPI_KERNEL_VERSION}-rpi-v8
+    mkinitramfs -c gzip -o initrd.img-${RPI_KERNEL_VERSION}-rpi-2712 ${RPI_KERNEL_VERSION}-rpi-2712
 fi
 
 useradd --shell /bin/bash -G startos -m start9

build/lib/grub-theme/theme.txt

@@ -1,51 +0,0 @@
-desktop-image: "../splash.png"
-title-color: "#ffffff"
-title-font: "Unifont Regular 16"
-title-text: "StartOS Boot Menu with GRUB"
-message-font: "Unifont Regular 16"
-terminal-font: "Unifont Regular 16"
-
-#help bar at the bottom
-+ label {
-        top = 100%-50
-        left = 0
-        width = 100%
-        height = 20
-        text = "@KEYMAP_SHORT@"
-        align = "center"
-        color = "#ffffff"
-        font = "Unifont Regular 16"
-}
-
-#boot menu
-+ boot_menu {
-        left = 10%
-        width = 80%
-        top = 52%
-        height = 48%-80
-        item_color = "#a8a8a8"
-        item_font = "Unifont Regular 16"
-        selected_item_color= "#ffffff"
-        selected_item_font = "Unifont Regular 16"
-        item_height = 16
-        item_padding = 0
-        item_spacing = 4
-        icon_width = 0
-        icon_heigh = 0
-        item_icon_space = 0
-}
-
-#progress bar
-+ progress_bar {
-        id = "__timeout__"
-        left = 15%
-        top = 100%-80
-        height = 16
-        width = 70%
-        font = "Unifont Regular 16"
-        text_color = "#000000"
-        fg_color = "#ffffff"
-        bg_color = "#a8a8a8"
-        border_color = "#ffffff"
-        text = "@TIMEOUT_NOTIFICATION_LONG@"
-}

build/lib/scripts/chroot-and-upgrade

@@ -111,6 +111,6 @@ if [ "$CHROOT_RES" -eq 0 ]; then
     reboot
 fi
 
-umount /media/startos/next
+umount -R /media/startos/next
 umount /media/startos/upper
 rm -rf /media/startos/upper /media/startos/next

build/lib/scripts/prune-images

@@ -29,13 +29,10 @@ if [ -z "$needed" ]; then
     exit 1
 fi
 
-MARGIN=${MARGIN:-1073741824}
-target=$((needed + MARGIN))
-
 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 "$target" ]]; do
+    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 2> /dev/null | grep -v "$current" | tail -n1)"
         if [ -e "$to_prune" ]; then
             echo "  Pruning $to_prune"

build/upload-ota.sh

@@ -15,12 +15,13 @@ if [ "$SKIP_DL" != "1" ]; then
     fi
 
     if [ -n "$RUN_ID" ]; then
-        for arch in aarch64 aarch64-nonfree riscv64 x86_64 x86_64-nonfree; do
+        for arch in aarch64 aarch64-nonfree riscv64 riscv64-nonfree x86_64 x86_64-nonfree raspberrypi; do
             while ! gh run download -R Start9Labs/start-os $RUN_ID -n $arch.squashfs -D $(pwd); do sleep 1; done
         done
-        for arch in aarch64 aarch64-nonfree riscv64 x86_64 x86_64-nonfree; do
+        for arch in aarch64 aarch64-nonfree riscv64 riscv64-nonfree x86_64 x86_64-nonfree; do
             while ! gh run download -R Start9Labs/start-os $RUN_ID -n $arch.iso -D $(pwd); do sleep 1; done
         done
+        while ! gh run download -R Start9Labs/start-os $RUN_ID -n raspberrypi.img -D $(pwd); do sleep 1; done
     fi
 
     if [ -n "$ST_RUN_ID" ]; then
@@ -56,23 +57,31 @@ start-cli --registry=https://alpha-registry-x.start9.com registry os version add
 if [ "$SKIP_UL" = "2" ]; then
     exit 2
 elif [ "$SKIP_UL" != "1" ]; then
-    for file in *.deb start-cli_*; do
+    for file in *.squashfs *.iso *.deb start-cli_*; do
         gh release upload -R Start9Labs/start-os v$VERSION $file
     done
-    for file in *.iso *.squashfs; do
-        s3cmd put -P $file s3://startos-images/v$VERSION/$file
+    for file in *.img; do
+        if ! [ -f $file.gz ]; then
+            cat $file | pigz > $file.gz
+        fi
+        gh release upload -R Start9Labs/start-os v$VERSION $file.gz
     done
 fi
 
 if [ "$SKIP_INDEX" != "1" ]; then
-    for arch in aarch64 aarch64-nonfree riscv64 x86_64 x86_64-nonfree; do
+    for arch in aarch64 aarch64-nonfree riscv64 riscv64-nonfree x86_64 x86_64-nonfree; do
         for file in *_$arch.squashfs *_$arch.iso; do
-            start-cli --registry=https://alpha-registry-x.start9.com registry os asset add --platform=$arch --version=$VERSION $file https://startos-images.nyc3.cdn.digitaloceanspaces.com/v$VERSION/$file
+            start-cli --registry=https://alpha-registry-x.start9.com registry os asset add --platform=$arch --version=$VERSION $file https://github.com/Start9Labs/start-os/releases/download/v$VERSION/$(echo -n "$file" | sed 's/~/./g')
+        done
+    done
+    for arch in raspberrypi; do
+        for file in *_$arch.squashfs; do
+            start-cli --registry=https://alpha-registry-x.start9.com registry os asset add --platform=$arch --version=$VERSION $file https://github.com/Start9Labs/start-os/releases/download/v$VERSION/$(echo -n "$file" | sed 's/~/./g')
         done
     done
 fi
 
-for file in *.iso *.squashfs *.deb start-cli_*; do
+for file in *.iso *.img *.img.gz *.squashfs *.deb start-cli_*; do
     gpg -u 7CFFDA41CA66056A --detach-sign --armor -o "${file}.asc" "$file"
 done
 
@@ -81,30 +90,20 @@ tar -czvf signatures.tar.gz *.asc
 
 gh release upload -R Start9Labs/start-os v$VERSION signatures.tar.gz
 
-cat << EOF
-# ISO Downloads
-
-- [x86_64/AMD64](https://startos-images.nyc3.cdn.digitaloceanspaces.com/v$VERSION/$(ls *_x86_64-nonfree.iso))
-- [x86_64/AMD64-slim (FOSS-only)](https://startos-images.nyc3.cdn.digitaloceanspaces.com/v$VERSION/$(ls *_x86_64.iso) "Without proprietary software or drivers")
-- [aarch64/ARM64](https://startos-images.nyc3.cdn.digitaloceanspaces.com/v$VERSION/$(ls *_aarch64-nonfree.iso))
-- [aarch64/ARM64-slim (FOSS-Only)](https://startos-images.nyc3.cdn.digitaloceanspaces.com/v$VERSION/$(ls *_aarch64.iso) "Without proprietary software or drivers")
-- [RISCV64 (RVA23)](https://startos-images.nyc3.cdn.digitaloceanspaces.com/v$VERSION/$(ls *_riscv64.iso))
-
-EOF
 cat << 'EOF'
 # StartOS Checksums
 
 ## SHA-256
 ```
 EOF
-sha256sum *.iso *.squashfs
+sha256sum *.iso *.img *img.gz *.squashfs
 cat << 'EOF'
 ```
 
 ## BLAKE-3
 ```
 EOF
-b3sum *.iso *.squashfs
+b3sum *.iso *.img *.img.gz *.squashfs
 cat << 'EOF'
 ```
 
@@ -139,4 +138,5 @@ EOF
 b3sum start-cli_*
 cat << 'EOF'
 ```
-EOF
+EOF
+

container-runtime/RPCSpec.md

@@ -1,21 +1,16 @@
-# Container RPC Server Specification
-
-The container runtime exposes a JSON-RPC server over a Unix socket at `/media/startos/rpc/service.sock`.
+# Container RPC SERVER Specification
 
 ## Methods
 
 ### init
 
-Initialize the runtime and system.
+initialize runtime (mount `/proc`, `/sys`, `/dev`, and `/run` to each image in `/media/images`)
 
-#### params
+called after os has mounted js and images to the container
 
-```ts
-{
-  id: string,
-  kind: "install" | "update" | "restore" | null,
-}
-```
+#### args
+
+`[]`
 
 #### response
 
@@ -23,16 +18,11 @@ Initialize the runtime and system.
 
 ### exit
 
-Shutdown runtime and optionally run exit hooks for a target version.
+shutdown runtime
 
-#### params
+#### args
 
-```ts
-{
-  id: string,
-  target: string | null,  // ExtendedVersion or VersionRange
-}
-```
+`[]`
 
 #### response
 
@@ -40,11 +30,11 @@ Shutdown runtime and optionally run exit hooks for a target version.
 
 ### start
 
-Run main method if not already running.
+run main method if not already running
 
-#### params
+#### args
 
-None
+`[]`
 
 #### response
 
@@ -52,11 +42,11 @@ None
 
 ### stop
 
-Stop main method by sending SIGTERM to child processes, and SIGKILL after timeout.
+stop main method by sending SIGTERM to child processes, and SIGKILL after timeout
 
-#### params
+#### args
 
-None
+`{ timeout: millis }`
 
 #### response
 
@@ -64,16 +54,15 @@ None
 
 ### execute
 
-Run a specific package procedure.
+run a specific package procedure
 
-#### params
+#### args
 
 ```ts
 {
-  id: string,           // event ID
-  procedure: string,    // JSON path (e.g., "/backup/create", "/actions/{name}/run")
-  input: any,
-  timeout: number | null,
+    procedure: JsonPath,
+    input: any,
+    timeout: millis,
 }
 ```
 
@@ -83,64 +72,18 @@ Run a specific package procedure.
 
 ### sandbox
 
-Run a specific package procedure in sandbox mode. Same interface as `execute`.
+run a specific package procedure in sandbox mode
 
-UNIMPLEMENTED: this feature is planned but does not exist
-
-#### params
+#### args
 
 ```ts
 {
-  id: string,
-  procedure: string,
-  input: any,
-  timeout: number | null,
+    procedure: JsonPath,
+    input: any,
+    timeout: millis,
 }
 ```
 
 #### response
 
 `any`
-
-### callback
-
-Handle a callback from an effect.
-
-#### params
-
-```ts
-{
-  id: number,
-  args: any[],
-}
-```
-
-#### response
-
-`null` (no response sent)
-
-### eval
-
-Evaluate a script in the runtime context. Used for debugging.
-
-#### params
-
-```ts
-{
-  script: string,
-}
-```
-
-#### response
-
-`any`
-
-## Procedures
-
-The `execute` and `sandbox` methods route to procedures based on the `procedure` path:
-
-| Procedure | Description |
-|-----------|-------------|
-| `/backup/create` | Create a backup |
-| `/actions/{name}/getInput` | Get input spec for an action |
-| `/actions/{name}/run` | Run an action with input |

container-runtime/package-lock.json

@@ -38,7 +38,7 @@
     },
     "../sdk/dist": {
       "name": "@start9labs/start-sdk",
-      "version": "0.4.0-beta.48",
+      "version": "0.4.0-beta.47",
       "license": "MIT",
       "dependencies": {
         "@iarna/toml": "^3.0.0",

container-runtime/src/Adapters/EffectCreator.ts

@@ -319,7 +319,6 @@ export function makeEffects(context: EffectContext): Effects {
   }
   if (context.callbacks?.onLeaveContext)
     self.onLeaveContext(() => {
-      self.constRetry = undefined
       self.isInContext = false
       self.onLeaveContext = () => {
         console.warn(

core/Cargo.lock

@@ -239,15 +239,6 @@ dependencies = [
  "derive_arbitrary",
 ]
 
-[[package]]
-name = "arc-swap"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e"
-dependencies = [
- "rustversion",
-]
-
 [[package]]
 name = "archery"
 version = "1.2.2"
@@ -857,12 +848,6 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "022dfe9eb35f19ebbcb51e0b40a5ab759f46ad60cadf7297e0bd085afb50e076"
 
-[[package]]
-name = "base62"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adf9755786e27479693dedd3271691a92b5e242ab139cacb9fb8e7fb5381111"
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -1124,7 +1109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 dependencies = [
  "memchr",
- "regex-automata 0.4.13",
+ "regex-automata",
  "serde",
 ]
 
@@ -1177,9 +1162,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.53"
+version = "1.2.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755d2fce177175ffca841e9a06afdb2c4ab0f593d53b4dee48147dfaade85932"
+checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -2726,9 +2711,9 @@ dependencies = [
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
+checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41"
 
 [[package]]
 name = "fixed-capacity-vec"
@@ -3109,42 +3094,12 @@ version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
-[[package]]
-name = "glob"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
-
 [[package]]
 name = "glob-match"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d"
 
-[[package]]
-name = "globset"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
-dependencies = [
- "aho-corasick",
- "bstr",
- "log",
- "regex-automata 0.4.13",
- "regex-syntax 0.8.8",
-]
-
-[[package]]
-name = "globwalk"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
-dependencies = [
- "bitflags 1.3.2",
- "ignore",
- "walkdir",
-]
-
 [[package]]
 name = "gloo-timers"
 version = "0.3.0"
@@ -3785,22 +3740,6 @@ dependencies = [
  "icu_properties",
 ]
 
-[[package]]
-name = "ignore"
-version = "0.4.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a"
-dependencies = [
- "crossbeam-deque",
- "globset",
- "log",
- "memchr",
- "regex-automata 0.4.13",
- "same-file",
- "walkdir",
- "winapi-util",
-]
-
 [[package]]
 name = "image"
 version = "0.25.9"
@@ -4186,9 +4125,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.85"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
+checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -4315,7 +4254,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.13",
+ "regex-automata",
 ]
 
 [[package]]
@@ -4540,11 +4479,11 @@ dependencies = [
 
 [[package]]
 name = "matchers"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
 dependencies = [
- "regex-automata 0.1.10",
+ "regex-automata",
 ]
 
 [[package]]
@@ -4845,15 +4784,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "normpath"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "notify"
 version = "8.2.0"
@@ -4888,12 +4818,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.46.0"
+version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "overload",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5270,12 +5199,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "owo-colors"
 version = "4.2.3"
@@ -6441,19 +6364,10 @@ checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.13",
+ "regex-automata",
  "regex-syntax 0.8.8",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
 [[package]]
 name = "regex-automata"
 version = "0.4.13"
@@ -6587,7 +6501,7 @@ dependencies = [
 [[package]]
 name = "rpc-toolkit"
 version = "0.3.2"
-source = "git+https://github.com/Start9Labs/rpc-toolkit.git#39e547ff99d997c19f9b6483b28a4394ca5a07bc"
+source = "git+https://github.com/Start9Labs/rpc-toolkit.git#406ee9e88bf20e3155f150eb755b5b9c2aefd167"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -6671,65 +6585,11 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rust-i18n"
-version = "3.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda2551fdfaf6cc5ee283adc15e157047b92ae6535cf80f6d4962d05717dc332"
-dependencies = [
- "globwalk",
- "once_cell",
- "regex",
- "rust-i18n-macro",
- "rust-i18n-support",
- "smallvec",
-]
-
-[[package]]
-name = "rust-i18n-macro"
-version = "3.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22baf7d7f56656d23ebe24f6bb57a5d40d2bce2a5f1c503e692b5b2fa450f965"
-dependencies = [
- "glob",
- "once_cell",
- "proc-macro2",
- "quote",
- "rust-i18n-support",
- "serde",
- "serde_json",
- "serde_yaml",
- "syn 2.0.114",
-]
-
-[[package]]
-name = "rust-i18n-support"
-version = "3.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "940ed4f52bba4c0152056d771e563b7133ad9607d4384af016a134b58d758f19"
-dependencies = [
- "arc-swap",
- "base62",
- "globwalk",
- "itertools 0.11.0",
- "lazy_static",
- "normpath",
- "once_cell",
- "proc-macro2",
- "regex",
- "serde",
- "serde_json",
- "serde_yaml",
- "siphasher",
- "toml 0.8.23",
- "triomphe",
-]
-
 [[package]]
 name = "rustc-demangle"
-version = "0.1.27"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
 
 [[package]]
 name = "rustc-hash"
@@ -6806,7 +6666,7 @@ dependencies = [
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki 0.103.9",
+ "rustls-webpki 0.103.8",
  "subtle",
  "zeroize",
 ]
@@ -6834,9 +6694,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.14.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
 dependencies = [
  "web-time",
  "zeroize",
@@ -6856,7 +6716,7 @@ dependencies = [
  "rustls 0.23.36",
  "rustls-native-certs",
  "rustls-platform-verifier-android",
- "rustls-webpki 0.103.9",
+ "rustls-webpki 0.103.8",
  "security-framework 3.5.1",
  "security-framework-sys",
  "webpki-root-certs",
@@ -6882,9 +6742,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.9"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -7246,19 +7106,6 @@ dependencies = [
  "syn 2.0.114",
 ]
 
-[[package]]
-name = "serde_yaml"
-version = "0.9.34+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
-dependencies = [
- "indexmap 2.13.0",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
 [[package]]
 name = "serde_yml"
 version = "0.0.12"
@@ -7817,7 +7664,7 @@ dependencies = [
 
 [[package]]
 name = "start-os"
-version = "0.4.0-alpha.19"
+version = "0.4.0-alpha.17"
 dependencies = [
  "aes 0.7.5",
  "arti-client",
@@ -7916,7 +7763,6 @@ dependencies = [
  "rpassword",
  "rpc-toolkit",
  "rust-argon2",
- "rust-i18n",
  "safelog",
  "semver",
  "serde",
@@ -9556,7 +9402,7 @@ dependencies = [
  "paste",
  "pin-project",
  "rustls-pki-types",
- "rustls-webpki 0.103.9",
+ "rustls-webpki 0.103.8",
  "thiserror 2.0.17",
  "tokio",
  "tokio-util",
@@ -9770,14 +9616,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.19"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex",
+ "regex-automata",
  "sharded-slab",
  "smallvec",
  "thread_local",
@@ -9807,17 +9653,6 @@ dependencies = [
  "syn 2.0.114",
 ]
 
-[[package]]
-name = "triomphe"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39"
-dependencies = [
- "arc-swap",
- "serde",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -10019,12 +9854,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3"
 
-[[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"
@@ -10201,9 +10030,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasip2"
-version = "1.0.2+wasi-0.2.9"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
  "wit-bindgen",
 ]
@@ -10225,9 +10054,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.108"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
+checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -10238,12 +10067,11 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.58"
+version = "0.4.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
+checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c"
 dependencies = [
  "cfg-if",
- "futures-util",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -10252,9 +10080,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.108"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
+checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10262,9 +10090,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.108"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
+checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40"
 dependencies = [
  "bumpalo",
  "proc-macro2",
@@ -10275,9 +10103,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.108"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
+checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4"
 dependencies = [
  "unicode-ident",
 ]
@@ -10376,9 +10204,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549"
 
 [[package]]
 name = "web-sys"
-version = "0.3.85"
+version = "0.3.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
+checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -10975,9 +10803,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen"
-version = "0.51.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"

core/Cargo.toml

@@ -15,7 +15,7 @@ license = "MIT"
 name = "start-os"
 readme = "README.md"
 repository = "https://github.com/Start9Labs/start-os"
-version = "0.4.0-alpha.19" # VERSION_BUMP
+version = "0.4.0-alpha.17" # VERSION_BUMP
 
 [lib]
 name = "startos"
@@ -176,7 +176,6 @@ mio = "1"
 new_mime_guess = "4"
 nix = { version = "0.30.1", features = [
   "fs",
-  "hostname",
   "mount",
   "net",
   "process",
@@ -214,7 +213,6 @@ reqwest = { version = "0.12.25", features = [
 reqwest_cookie_store = "0.9.0"
 rpassword = "7.2.0"
 rust-argon2 = "3.0.0"
-rust-i18n = "3.1.5"
 rpc-toolkit = { git = "https://github.com/Start9Labs/rpc-toolkit.git" }
 safelog = { version = "0.4.8", git = "https://github.com/Start9Labs/arti.git", branch = "patch/disable-exit", optional = true }
 semver = { version = "1.0.20", features = ["serde"] }
@@ -265,7 +263,7 @@ tower-service = "0.3.3"
 tracing = "0.1.39"
 tracing-error = "0.2.0"
 tracing-journald = "0.3.0"
-tracing-subscriber = { version = "=0.3.19", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 ts-rs = "9.0.1"
 typed-builder = "0.23.2"
 url = { version = "2.4.1", features = ["serde"] }

core/build/build-cli.sh

@@ -26,7 +26,7 @@ PROFILE=${PROFILE:-release}
 if [ "${PROFILE}" = "release" ]; then
 	BUILD_FLAGS="--release"
 else
-  if [ "$PROFILE" != "debug" ]; then
+  if [ "$PROFILE" != "debug"]; then
     >&2 echo "Unknown profile $PROFILE: falling back to debug..."
     PROFILE=debug
   fi

core/src/action.rs

@@ -23,7 +23,7 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
             "get-input",
             from_fn_async(get_action_input)
                 .with_display_serializable()
-                .with_about("about.get-action-input-spec")
+                .with_about("Get action input spec")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -36,14 +36,14 @@ pub fn action_api<C: Context>() -> ParentHandler<C> {
                     }
                     Ok(())
                 })
-                .with_about("about.run-service-action")
+                .with_about("Run service action")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "clear-task",
             from_fn_async(clear_task)
                 .no_display()
-                .with_about("about.clear-service-task")
+                .with_about("Clear a service task")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -63,9 +63,7 @@ pub struct ActionInput {
 #[derive(Deserialize, Serialize, TS, Parser)]
 #[serde(rename_all = "camelCase")]
 pub struct GetActionInputParams {
-    #[arg(help = "help.arg.package-id")]
     pub package_id: PackageId,
-    #[arg(help = "help.arg.action-id")]
     pub action_id: ActionId,
 }
 
@@ -282,11 +280,8 @@ pub struct RunActionParams {
 
 #[derive(Parser)]
 struct CliRunActionParams {
-    #[arg(help = "help.arg.package-id")]
     pub package_id: PackageId,
-    #[arg(help = "help.arg.event-id")]
     pub event_id: Option<Guid>,
-    #[arg(help = "help.arg.action-id")]
     pub action_id: ActionId,
     #[command(flatten)]
     pub input: StdinDeserializable<Option<Value>>,
@@ -365,11 +360,9 @@ pub async fn run_action(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ClearTaskParams {
-    #[arg(help = "help.arg.package-id")]
     pub package_id: PackageId,
-    #[arg(help = "help.arg.replay-id")]
     pub replay_id: ReplayId,
-    #[arg(long, help = "help.arg.force-clear-task")]
+    #[arg(long)]
     #[serde(default)]
     pub force: bool,
 }

core/src/auth.rs

@@ -51,10 +51,7 @@ pub async fn write_shadow(password: &str) -> Result<(), Error> {
         match line.split_once(":") {
             Some((user, rest)) if user == "start9" || user == "kiosk" => {
                 let (_, rest) = rest.split_once(":").ok_or_else(|| {
-                    Error::new(
-                        eyre!("{}", t!("auth.malformed-etc-shadow")),
-                        ErrorKind::ParseSysInfo,
-                    )
+                    Error::new(eyre!("malformed /etc/shadow"), ErrorKind::ParseSysInfo)
                 })?;
                 shadow_file
                     .write_all(format!("{user}:{hash}:{rest}\n").as_bytes())
@@ -84,7 +81,7 @@ impl PasswordType {
             PasswordType::String(x) => Ok(x),
             PasswordType::EncryptedWire(x) => x.decrypt(current_secret).ok_or_else(|| {
                 Error::new(
-                    color_eyre::eyre::eyre!("{}", t!("auth.couldnt-decode-password")),
+                    color_eyre::eyre::eyre!("Couldn't decode password"),
                     crate::ErrorKind::Unknown,
                 )
             }),
@@ -128,19 +125,19 @@ where
             "login",
             from_fn_async(cli_login::<AC>)
                 .no_display()
-                .with_about("about.login-new-auth-session"),
+                .with_about("Log in a new auth session"),
         )
         .subcommand(
             "logout",
             from_fn_async(logout::<AC>)
                 .with_metadata("get_session", Value::Bool(true))
                 .no_display()
-                .with_about("about.logout-current-auth-session")
+                .with_about("Log out of current auth session")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "session",
-            session::<C, AC>().with_about("about.list-or-kill-auth-sessions"),
+            session::<C, AC>().with_about("List or kill auth sessions"),
         )
         .subcommand(
             "reset-password",
@@ -150,14 +147,14 @@ where
             "reset-password",
             from_fn_async(cli_reset_password)
                 .no_display()
-                .with_about("about.reset-password"),
+                .with_about("Reset password"),
         )
         .subcommand(
             "get-pubkey",
             from_fn_async(get_pubkey)
                 .with_metadata("authenticated", Value::Bool(false))
                 .no_display()
-                .with_about("about.get-pubkey-from-server")
+                .with_about("Get public key derived from server private key")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -211,12 +208,12 @@ pub fn check_password(hash: &str, password: &str) -> Result<(), Error> {
     ensure_code!(
         argon2::verify_encoded(&hash, password.as_bytes()).map_err(|_| {
             Error::new(
-                eyre!("{}", t!("auth.password-incorrect")),
+                eyre!("Password Incorrect"),
                 crate::ErrorKind::IncorrectPassword,
             )
         })?,
         crate::ErrorKind::IncorrectPassword,
-        t!("auth.password-incorrect")
+        "Password Incorrect"
     );
     Ok(())
 }
@@ -330,14 +327,14 @@ where
                 .with_metadata("get_session", Value::Bool(true))
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| display_sessions(handle.params, result))
-                .with_about("about.display-all-auth-sessions")
+                .with_about("Display all auth sessions")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "kill",
             from_fn_async(kill::<AC>)
                 .no_display()
-                .with_about("about.terminate-auth-sessions")
+                .with_about("Terminate existing auth session(s)")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -421,7 +418,6 @@ impl AsLogoutSessionId for KillSessionId {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct KillParams {
-    #[arg(help = "help.arg.session-ids")]
     ids: Vec<String>,
 }
 
@@ -438,9 +434,7 @@ pub async fn kill<C: SessionAuthContext>(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ResetPasswordParams {
-    #[arg(help = "help.arg.old-password")]
     old_password: Option<PasswordType>,
-    #[arg(help = "help.arg.new-password")]
     new_password: Option<PasswordType>,
 }
 
@@ -453,13 +447,13 @@ async fn cli_reset_password(
         ..
     }: HandlerArgs<CliContext>,
 ) -> Result<(), RpcError> {
-    let old_password = rpassword::prompt_password(&t!("auth.prompt-current-password"))?;
+    let old_password = rpassword::prompt_password("Current Password: ")?;
 
     let new_password = {
-        let new_password = rpassword::prompt_password(&t!("auth.prompt-new-password"))?;
-        if new_password != rpassword::prompt_password(&t!("auth.prompt-confirm"))? {
+        let new_password = rpassword::prompt_password("New Password: ")?;
+        if new_password != rpassword::prompt_password("Confirm: ")? {
             return Err(Error::new(
-                eyre!("{}", t!("auth.passwords-do-not-match")),
+                eyre!("Passwords do not match"),
                 crate::ErrorKind::IncorrectPassword,
             )
             .into());
@@ -492,7 +486,7 @@ pub async fn reset_password_impl(
             .with_kind(crate::ErrorKind::IncorrectPassword)?
         {
             return Err(Error::new(
-                eyre!("{}", t!("auth.password-incorrect")),
+                eyre!("Incorrect Password"),
                 crate::ErrorKind::IncorrectPassword,
             ));
         }

core/src/backup/backup_bulk.rs

@@ -33,13 +33,11 @@ use crate::version::VersionT;
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct BackupParams {
-    #[arg(help = "help.arg.backup-target-id")]
     target_id: BackupTargetId,
-    #[arg(long = "old-password", help = "help.arg.old-backup-password")]
+    #[arg(long = "old-password")]
     old_password: Option<crate::auth::PasswordType>,
-    #[arg(long = "package-ids", help = "help.arg.package-ids-to-backup")]
+    #[arg(long = "package-ids")]
     package_ids: Option<Vec<PackageId>>,
-    #[arg(help = "help.arg.backup-password")]
     password: crate::auth::PasswordType,
 }
 
@@ -71,8 +69,8 @@ impl BackupStatusGuard {
                             db,
                             None,
                             NotificationLevel::Success,
-                            t!("backup.bulk.complete-title").to_string(),
-                            t!("backup.bulk.complete-message").to_string(),
+                            "Backup Complete".to_owned(),
+                            "Your backup has completed".to_owned(),
                             BackupReport {
                                 server: ServerBackupReport {
                                     attempted: true,
@@ -90,8 +88,9 @@ impl BackupStatusGuard {
                             db,
                             None,
                             NotificationLevel::Warning,
-                            t!("backup.bulk.complete-title").to_string(),
-                            t!("backup.bulk.complete-with-failures").to_string(),
+                            "Backup Complete".to_owned(),
+                            "Your backup has completed, but some package(s) failed to backup"
+                                .to_owned(),
                             BackupReport {
                                 server: ServerBackupReport {
                                     attempted: true,
@@ -104,7 +103,7 @@ impl BackupStatusGuard {
                     .await
                 }
                 Err(e) => {
-                    tracing::error!("{}", t!("backup.bulk.failed-error", error = e));
+                    tracing::error!("Backup Failed: {}", e);
                     tracing::debug!("{:?}", e);
                     let err_string = e.to_string();
                     db.mutate(|db| {
@@ -112,8 +111,8 @@ impl BackupStatusGuard {
                             db,
                             None,
                             NotificationLevel::Error,
-                            t!("backup.bulk.failed-title").to_string(),
-                            t!("backup.bulk.failed-message").to_string(),
+                            "Backup Failed".to_owned(),
+                            "Your backup failed to complete.".to_owned(),
                             BackupReport {
                                 server: ServerBackupReport {
                                     attempted: true,
@@ -225,7 +224,7 @@ fn assure_backing_up<'a>(
         .as_backup_progress_mut();
     if backing_up.transpose_ref().is_some() {
         return Err(Error::new(
-            eyre!("{}", t!("backup.bulk.already-backing-up")),
+            eyre!("Server is already backing up!"),
             ErrorKind::InvalidRequest,
         ));
     }
@@ -304,7 +303,7 @@ async fn perform_backup(
 
     let mut backup_guard = Arc::try_unwrap(backup_guard).map_err(|_| {
         Error::new(
-            eyre!("{}", t!("backup.bulk.leaked-reference")),
+            eyre!("leaked reference to BackupMountGuard"),
             ErrorKind::Incoherent,
         )
     })?;

core/src/backup/mod.rs

@@ -37,12 +37,12 @@ pub fn backup<C: Context>() -> ParentHandler<C> {
             "create",
             from_fn_async(backup_bulk::backup_all)
                 .no_display()
-                .with_about("about.create-backup-all-packages")
+                .with_about("Create backup for all packages")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "target",
-            target::target::<C>().with_about("about.commands-backup-target"),
+            target::target::<C>().with_about("Commands related to a backup target"),
         )
 }
 
@@ -51,7 +51,7 @@ pub fn package_backup<C: Context>() -> ParentHandler<C> {
         "restore",
         from_fn_async(restore::restore_packages_rpc)
             .no_display()
-            .with_about("about.restore-packages-from-backup")
+            .with_about("Restore package(s) from backup")
             .with_call_remote::<CliContext>(),
     )
 }

core/src/backup/restore.rs

@@ -23,19 +23,16 @@ use crate::progress::ProgressUnits;
 use crate::s9pk::S9pk;
 use crate::service::service_map::DownloadInstallFuture;
 use crate::setup::SetupExecuteProgress;
-use crate::system::{save_language, sync_kiosk};
-use crate::util::serde::{IoFormat, Pem};
+use crate::system::sync_kiosk;
+use crate::util::serde::IoFormat;
 use crate::{PLATFORM, PackageId};
 
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct RestorePackageParams {
-    #[arg(help = "help.arg.package-ids")]
     pub ids: Vec<PackageId>,
-    #[arg(help = "help.arg.backup-target-id")]
     pub target_id: BackupTargetId,
-    #[arg(help = "help.arg.backup-password")]
     pub password: String,
 }
 
@@ -66,10 +63,7 @@ pub async fn restore_packages_rpc(
                 match async { res.await?.await }.await {
                     Ok(_) => (),
                     Err(err) => {
-                        tracing::error!(
-                            "{}",
-                            t!("backup.restore.package-error", id = id, error = err)
-                        );
+                        tracing::error!("Error restoring package {}: {}", id, err);
                         tracing::debug!("{:?}", err);
                     }
                 }
@@ -81,10 +75,10 @@ pub async fn restore_packages_rpc(
 }
 
 #[instrument(skip_all)]
-pub async fn recover_full_server(
+pub async fn recover_full_embassy(
     ctx: &SetupContext,
-    disk_guid: InternedString,
-    password: String,
+    disk_guid: Arc<String>,
+    start_os_password: String,
     recovery_source: TmpMountGuard,
     server_id: &str,
     recovery_password: &str,
@@ -108,7 +102,7 @@ pub async fn recover_full_server(
     )?;
 
     os_backup.account.password = argon2::hash_encoded(
-        password.as_bytes(),
+        start_os_password.as_bytes(),
         &rand::random::<[u8; 16]>()[..],
         &argon2::Config::rfc9106_low_mem(),
     )
@@ -117,32 +111,16 @@ pub async fn recover_full_server(
     let kiosk = Some(kiosk.unwrap_or(true)).filter(|_| &*PLATFORM != "raspberrypi");
     sync_kiosk(kiosk).await?;
 
-    let language = ctx.language.peek(|a| a.clone());
-    let keyboard = ctx.keyboard.peek(|a| a.clone());
-
-    if let Some(language) = &language {
-        save_language(&**language).await?;
-    }
-
-    if let Some(keyboard) = &keyboard {
-        keyboard.save().await?;
-    }
-
     let db = ctx.db().await?;
-    db.put(
-        &ROOT,
-        &Database::init(&os_backup.account, kiosk, language, keyboard)?,
-    )
-    .await?;
+    db.put(&ROOT, &Database::init(&os_backup.account, kiosk)?)
+        .await?;
     drop(db);
 
-    let config = ctx.config.peek(|c| c.clone());
-
-    let init_result = init(&ctx.webserver, &config, init_phases).await?;
+    let init_result = init(&ctx.webserver, &ctx.config, init_phases).await?;
 
     let rpc_ctx = RpcContext::init(
         &ctx.webserver,
-        &config,
+        &ctx.config,
         disk_guid.clone(),
         Some(init_result),
         rpc_ctx_phases,
@@ -167,10 +145,7 @@ pub async fn recover_full_server(
                 match async { res.await?.await }.await {
                     Ok(_) => (),
                     Err(err) => {
-                        tracing::error!(
-                            "{}",
-                            t!("backup.restore.package-error", id = id, error = err)
-                        );
+                        tracing::error!("Error restoring package {}: {}", id, err);
                         tracing::debug!("{:?}", err);
                     }
                 }
@@ -180,14 +155,7 @@ pub async fn recover_full_server(
         .await;
     restore_phase.lock().await.complete();
 
-    Ok((
-        SetupResult {
-            hostname: os_backup.account.hostname,
-            root_ca: Pem(os_backup.account.root_ca_cert),
-            needs_restart: ctx.install_rootfs.peek(|a| a.is_some()),
-        },
-        rpc_ctx,
-    ))
+    Ok(((&os_backup.account).try_into()?, rpc_ctx))
 }
 
 #[instrument(skip(ctx, backup_guard))]

core/src/backup/target/cifs.rs

@@ -52,21 +52,21 @@ pub fn cifs<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_about("about.add-new-backup-target")
+                .with_about("Add a new backup target")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "update",
             from_fn_async(update)
                 .no_display()
-                .with_about("about.update-existing-backup-target")
+                .with_about("Update an existing backup target")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
-                .with_about("about.remove-existing-backup-target")
+                .with_about("Remove an existing backup target")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -75,13 +75,9 @@ pub fn cifs<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
-    #[arg(help = "help.arg.cifs-hostname")]
     pub hostname: String,
-    #[arg(help = "help.arg.cifs-path")]
     pub path: PathBuf,
-    #[arg(help = "help.arg.cifs-username")]
     pub username: String,
-    #[arg(help = "help.arg.cifs-password")]
     pub password: Option<String>,
 }
 
@@ -134,15 +130,10 @@ pub async fn add(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UpdateParams {
-    #[arg(help = "help.arg.backup-target-id")]
     pub id: BackupTargetId,
-    #[arg(help = "help.arg.cifs-hostname")]
     pub hostname: String,
-    #[arg(help = "help.arg.cifs-path")]
     pub path: PathBuf,
-    #[arg(help = "help.arg.cifs-username")]
     pub username: String,
-    #[arg(help = "help.arg.cifs-password")]
     pub password: Option<String>,
 }
 
@@ -160,7 +151,7 @@ pub async fn update(
         id
     } else {
         return Err(Error::new(
-            eyre!("{}", t!("backup.target.cifs.target-not-found", id = id)),
+            eyre!("Backup Target ID {} Not Found", id),
             ErrorKind::NotFound,
         ));
     };
@@ -180,13 +171,7 @@ pub async fn update(
                 .as_idx_mut(&id)
                 .ok_or_else(|| {
                     Error::new(
-                        eyre!(
-                            "{}",
-                            t!(
-                                "backup.target.cifs.target-not-found",
-                                id = BackupTargetId::Cifs { id }
-                            )
-                        ),
+                        eyre!("Backup Target ID {} Not Found", BackupTargetId::Cifs { id }),
                         ErrorKind::NotFound,
                     )
                 })?
@@ -210,7 +195,6 @@ pub async fn update(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct RemoveParams {
-    #[arg(help = "help.arg.backup-target-id")]
     pub id: BackupTargetId,
 }
 
@@ -219,7 +203,7 @@ pub async fn remove(ctx: RpcContext, RemoveParams { id }: RemoveParams) -> Resul
         id
     } else {
         return Err(Error::new(
-            eyre!("{}", t!("backup.target.cifs.target-not-found", id = id)),
+            eyre!("Backup Target ID {} Not Found", id),
             ErrorKind::NotFound,
         ));
     };
@@ -236,7 +220,7 @@ pub fn load(db: &DatabaseModel, id: u32) -> Result<Cifs, Error> {
         .as_idx(&id)
         .ok_or_else(|| {
             Error::new(
-                eyre!("{}", t!("backup.target.cifs.target-not-found-id", id = id)),
+                eyre!("Backup Target ID {} Not Found", id),
                 ErrorKind::NotFound,
             )
         })?

core/src/backup/target/mod.rs

@@ -143,13 +143,13 @@ pub fn target<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "cifs",
-            cifs::cifs::<C>().with_about("about.add-remove-update-backup-target"),
+            cifs::cifs::<C>().with_about("Add, remove, or update a backup target"),
         )
         .subcommand(
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_about("about.list-existing-backup-targets")
+                .with_about("List existing backup targets")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -159,20 +159,20 @@ pub fn target<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn::<CliContext, _>(|params, info| {
                     display_backup_info(params.params, info)
                 })
-                .with_about("about.display-package-backup-information")
+                .with_about("Display package backup information")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "mount",
             from_fn_async(mount)
-                .with_about("about.mount-backup-target")
+                .with_about("Mount backup target")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "umount",
             from_fn_async(umount)
                 .no_display()
-                .with_about("about.unmount-backup-target")
+                .with_about("Unmount backup target")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -268,11 +268,8 @@ fn display_backup_info(params: WithIoFormat<InfoParams>, info: BackupInfo) -> Re
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct InfoParams {
-    #[arg(help = "help.arg.backup-target-id")]
     target_id: BackupTargetId,
-    #[arg(help = "help.arg.server-id")]
     server_id: String,
-    #[arg(help = "help.arg.backup-password")]
     password: String,
 }
 
@@ -308,13 +305,11 @@ lazy_static::lazy_static! {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct MountParams {
-    #[arg(help = "help.arg.backup-target-id")]
     target_id: BackupTargetId,
-    #[arg(long, help = "help.arg.server-id")]
+    #[arg(long)]
     server_id: Option<String>,
-    #[arg(help = "help.arg.backup-password")]
     password: String, // TODO: rpassword
-    #[arg(long, help = "help.arg.allow-partial-backup")]
+    #[arg(long)]
     allow_partial: bool,
 }
 
@@ -390,7 +385,6 @@ pub async fn mount(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UmountParams {
-    #[arg(help = "help.arg.backup-target-id")]
     target_id: Option<BackupTargetId>,
 }
 

core/src/bins/container_cli.rs

@@ -17,7 +17,6 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         |cfg: ContainerClientConfig| Ok(ContainerCliContext::init(cfg)),
         crate::service::effects::handler(),
     )
-    .mutate_command(super::translate_cli)
     .run(args)
     {
         match e.data {

core/src/bins/deprecated.rs

@@ -1,11 +1,9 @@
-use rust_i18n::t;
-
 pub fn renamed(old: &str, new: &str) -> ! {
-    eprintln!("{}", t!("bins.deprecated.renamed", old = old, new = new));
+    eprintln!("{old} has been renamed to {new}");
     std::process::exit(1)
 }
 
 pub fn removed(name: &str) -> ! {
-    eprintln!("{}", t!("bins.deprecated.removed", name = name));
+    eprintln!("{name} has been removed");
     std::process::exit(1)
 }

core/src/bins/mod.rs

@@ -2,8 +2,6 @@ use std::collections::{BTreeMap, VecDeque};
 use std::ffi::OsString;
 use std::path::Path;
 
-use rust_i18n::t;
-
 pub mod container_cli;
 pub mod deprecated;
 pub mod registry;
@@ -12,85 +10,6 @@ pub mod start_init;
 pub mod startd;
 pub mod tunnel;
 
-pub fn set_locale_from_env() {
-    let lang = std::env::var("LANG").ok();
-    let lang = lang
-        .as_deref()
-        .map_or("C", |l| l.strip_suffix(".UTF-8").unwrap_or(l));
-    set_locale(lang)
-}
-
-pub fn set_locale(lang: &str) {
-    let mut best = None;
-    let prefix = lang.split_inclusive("_").next().unwrap();
-    for l in rust_i18n::available_locales!() {
-        if l == lang {
-            best = Some(l);
-            break;
-        }
-        if best.is_none() && l.starts_with(prefix) {
-            best = Some(l);
-        }
-    }
-    rust_i18n::set_locale(best.unwrap_or(lang));
-}
-
-pub fn translate_cli(mut cmd: clap::Command) -> clap::Command {
-    fn translate(s: impl std::fmt::Display) -> String {
-        t!(s.to_string()).into_owned()
-    }
-    if let Some(s) = cmd.get_about() {
-        let s = translate(s);
-        cmd = cmd.about(s);
-    }
-    if let Some(s) = cmd.get_long_about() {
-        let s = translate(s);
-        cmd = cmd.long_about(s);
-    }
-    if let Some(s) = cmd.get_before_help() {
-        let s = translate(s);
-        cmd = cmd.before_help(s);
-    }
-    if let Some(s) = cmd.get_before_long_help() {
-        let s = translate(s);
-        cmd = cmd.before_long_help(s);
-    }
-    if let Some(s) = cmd.get_after_help() {
-        let s = translate(s);
-        cmd = cmd.after_help(s);
-    }
-    if let Some(s) = cmd.get_after_long_help() {
-        let s = translate(s);
-        cmd = cmd.after_long_help(s);
-    }
-
-    let arg_ids = cmd
-        .get_arguments()
-        .map(|a| a.get_id().clone())
-        .collect::<Vec<_>>();
-    for id in arg_ids {
-        cmd = cmd.mut_arg(id, |arg| {
-            let arg = if let Some(s) = arg.get_help() {
-                let s = translate(s);
-                arg.help(s)
-            } else {
-                arg
-            };
-            if let Some(s) = arg.get_long_help() {
-                let s = translate(s);
-                arg.long_help(s)
-            } else {
-                arg
-            }
-        });
-    }
-    for cmd in cmd.get_subcommands_mut() {
-        *cmd = translate_cli(cmd.clone());
-    }
-
-    cmd
-}
-
 #[derive(Default)]
 pub struct MultiExecutable {
     default: Option<&'static str>,
@@ -139,7 +58,7 @@ impl MultiExecutable {
         if let Some((name, _)) = self.bins.get_key_value(name) {
             self.default = Some(*name);
         } else {
-            panic!("{}", t!("bins.mod.does-not-exist", name = name));
+            panic!("{name} does not exist in MultiExecutable");
         }
         self
     }
@@ -149,8 +68,6 @@ impl MultiExecutable {
     }
 
     pub fn execute(&self) {
-        set_locale_from_env();
-
         let mut popped = Vec::with_capacity(2);
         let mut args = std::env::args_os().collect::<VecDeque<_>>();
 
@@ -179,15 +96,11 @@ impl MultiExecutable {
         }
         let args = std::env::args().collect::<VecDeque<_>>();
         eprintln!(
-            "{}",
-            t!(
-                "bins.mod.unknown-executable",
-                name = args
-                    .get(1)
-                    .or_else(|| args.get(0))
-                    .map(|s| s.as_str())
-                    .unwrap_or("N/A")
-            )
+            "unknown executable: {}",
+            args.get(1)
+                .or_else(|| args.get(0))
+                .map(|s| s.as_str())
+                .unwrap_or("N/A")
         );
         std::process::exit(1);
     }

core/src/bins/registry.rs

@@ -3,7 +3,6 @@ use std::ffi::OsString;
 use clap::Parser;
 use futures::FutureExt;
 use rpc_toolkit::CliApp;
-use rust_i18n::t;
 use tokio::signal::unix::signal;
 use tracing::instrument;
 
@@ -78,7 +77,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         let rt = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
             .build()
-            .expect(&t!("bins.registry.failed-to-initialize-runtime"));
+            .expect("failed to initialize runtime");
         rt.block_on(inner_main(&config))
     };
 
@@ -100,7 +99,6 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
         crate::registry::registry_api(),
     )
-    .mutate_command(super::translate_cli)
     .run(args)
     {
         match e.data {

core/src/bins/start_cli.rs

@@ -19,7 +19,6 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
         crate::main_api(),
     )
-    .mutate_command(super::translate_cli)
     .run(args)
     {
         match e.data {

core/src/bins/start_init.rs

@@ -1,9 +1,11 @@
+use std::sync::Arc;
+
 use tokio::process::Command;
 use tracing::instrument;
 
 use crate::context::config::ServerConfig;
 use crate::context::rpc::InitRpcContextPhases;
-use crate::context::{DiagnosticContext, InitContext, RpcContext, SetupContext};
+use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::disk::REPAIR_DISK_PATH;
 use crate::disk::fsck::RepairStrategy;
 use crate::disk::main::DEFAULT_PASSWORD;
@@ -25,13 +27,7 @@ async fn setup_or_init(
     if let Some(firmware) = check_for_firmware_update()
         .await
         .map_err(|e| {
-            tracing::warn!(
-                "{}",
-                t!(
-                    "bins.start-init.error-checking-firmware",
-                    error = e.to_string()
-                )
-            );
+            tracing::warn!("Error checking for firmware update: {e}");
             tracing::debug!("{e:?}");
         })
         .ok()
@@ -39,21 +35,14 @@ async fn setup_or_init(
     {
         let init_ctx = InitContext::init(config).await?;
         let handle = &init_ctx.progress;
-        let mut update_phase =
-            handle.add_phase(t!("bins.start-init.updating-firmware").into(), Some(10));
-        let mut reboot_phase = handle.add_phase(t!("bins.start-init.rebooting").into(), Some(1));
+        let mut update_phase = handle.add_phase("Updating Firmware".into(), Some(10));
+        let mut reboot_phase = handle.add_phase("Rebooting".into(), Some(1));
 
         server.serve_ui_for(init_ctx);
 
         update_phase.start();
         if let Err(e) = update_firmware(firmware).await {
-            tracing::warn!(
-                "{}",
-                t!(
-                    "bins.start-init.error-firmware-update",
-                    error = e.to_string()
-                )
-            );
+            tracing::warn!("Error performing firmware update: {e}");
             tracing::debug!("{e:?}");
         } else {
             update_phase.complete();
@@ -90,11 +79,40 @@ async fn setup_or_init(
         .invoke(crate::ErrorKind::OpenSsl)
         .await?;
 
+    if tokio::fs::metadata("/run/live/medium").await.is_ok() {
+        Command::new("sed")
+            .arg("-i")
+            .arg("s/PasswordAuthentication no/PasswordAuthentication yes/g")
+            .arg("/etc/ssh/sshd_config")
+            .invoke(crate::ErrorKind::Filesystem)
+            .await?;
+        Command::new("systemctl")
+            .arg("reload")
+            .arg("ssh")
+            .invoke(crate::ErrorKind::OpenSsh)
+            .await?;
+
+        let ctx = InstallContext::init().await?;
+
+        server.serve_ui_for(ctx.clone());
+
+        ctx.shutdown
+            .subscribe()
+            .recv()
+            .await
+            .expect("context dropped");
+
+        return Ok(Err(Shutdown {
+            disk_guid: None,
+            restart: true,
+        }));
+    }
+
     if tokio::fs::metadata("/media/startos/config/disk.guid")
         .await
         .is_err()
     {
-        let ctx = SetupContext::init(server, config.clone())?;
+        let ctx = SetupContext::init(server, config)?;
 
         server.serve_ui_for(ctx.clone());
 
@@ -109,13 +127,7 @@ async fn setup_or_init(
             .invoke(ErrorKind::NotFound)
             .await
         {
-            tracing::error!(
-                "{}",
-                t!(
-                    "bins.start-init.failed-to-kill-kiosk",
-                    error = e.to_string()
-                )
-            );
+            tracing::error!("Failed to kill kiosk: {}", e);
             tracing::debug!("{:?}", e);
         }
 
@@ -124,7 +136,7 @@ async fn setup_or_init(
             Some(Err(e)) => return Err(e.clone_output()),
             None => {
                 return Err(Error::new(
-                    eyre!("{}", t!("bins.start-init.setup-mode-exited")),
+                    eyre!("Setup mode exited before setup completed"),
                     ErrorKind::Unknown,
                 ));
             }
@@ -134,8 +146,7 @@ async fn setup_or_init(
         let handle = init_ctx.progress.clone();
         let err_channel = init_ctx.error.clone();
 
-        let mut disk_phase =
-            handle.add_phase(t!("bins.start-init.opening-data-drive").into(), Some(10));
+        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);
 
@@ -145,9 +156,9 @@ async fn setup_or_init(
             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 = InternedString::intern(guid_string.trim());
+            let disk_guid = Arc::new(String::from(guid_string.trim()));
             let requires_reboot = crate::disk::main::import(
-                &*disk_guid,
+                &**disk_guid,
                 DATA_DIR,
                 if tokio::fs::metadata(REPAIR_DISK_PATH).await.is_ok() {
                     RepairStrategy::Aggressive
@@ -167,12 +178,11 @@ async fn setup_or_init(
                     .with_ctx(|_| (crate::ErrorKind::Filesystem, REPAIR_DISK_PATH))?;
             }
             disk_phase.complete();
-            tracing::info!("{}", t!("bins.start-init.loaded-disk"));
+            tracing::info!("Loaded Disk");
 
             if requires_reboot.0 {
-                tracing::info!("{}", t!("bins.start-init.rebooting"));
-                let mut reboot_phase =
-                    handle.add_phase(t!("bins.start-init.rebooting").into(), Some(1));
+                tracing::info!("Rebooting...");
+                let mut reboot_phase = handle.add_phase("Rebooting".into(), Some(1));
                 reboot_phase.start();
                 return Ok(Err(Shutdown {
                     disk_guid: Some(disk_guid),
@@ -226,10 +236,11 @@ pub async fn main(
                         .await
                         .is_ok()
                     {
-                        Some(InternedString::intern(
+                        Some(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
                                 .await?
-                                .trim(),
+                                .trim()
+                                .to_owned(),
                         ))
                     } else {
                         None

core/src/bins/startd.rs

@@ -1,11 +1,11 @@
 use std::cmp::max;
 use std::ffi::OsString;
+use std::sync::Arc;
 use std::time::Duration;
 
 use clap::Parser;
 use color_eyre::eyre::eyre;
 use futures::{FutureExt, TryFutureExt};
-use rust_i18n::t;
 use tokio::signal::unix::signal;
 use tracing::instrument;
 
@@ -15,11 +15,11 @@ use crate::context::{DiagnosticContext, InitContext, RpcContext};
 use crate::net::gateway::{BindTcp, SelfContainedNetworkInterfaceListener, UpgradableListener};
 use crate::net::static_server::refresher;
 use crate::net::web_server::{Acceptor, WebServer};
-use crate::prelude::*;
 use crate::shutdown::Shutdown;
 use crate::system::launch_metrics_task;
 use crate::util::io::append_file;
 use crate::util::logger::LOGGER;
+use crate::{Error, ErrorKind, ResultExt};
 
 #[instrument(skip_all)]
 async fn inner_main(
@@ -53,10 +53,11 @@ async fn inner_main(
         let ctx = RpcContext::init(
             &server.acceptor_setter(),
             config,
-            InternedString::intern(
+            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
                     .await?
-                    .trim(),
+                    .trim()
+                    .to_owned(),
             ),
             None,
             rpc_ctx_phases,
@@ -113,11 +114,11 @@ async fn inner_main(
         metrics_task
             .map_err(|e| {
                 Error::new(
-                    eyre!("{}", e).wrap_err(t!("bins.startd.metrics-daemon-panicked").to_string()),
+                    eyre!("{}", e).wrap_err("Metrics daemon panicked!"),
                     ErrorKind::Unknown,
                 )
             })
-            .map_ok(|_| tracing::debug!("{}", t!("bins.startd.metrics-daemon-shutdown")))
+            .map_ok(|_| tracing::debug!("Metrics daemon Shutdown"))
             .await?;
 
         let shutdown = shutdown_recv
@@ -145,7 +146,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
             .worker_threads(max(1, num_cpus::get()))
             .enable_all()
             .build()
-            .expect(&t!("bins.startd.failed-to-initialize-runtime"));
+            .expect("failed to initialize runtime");
         let res = rt.block_on(async {
             let mut server = WebServer::new(
                 Acceptor::bind_upgradable(SelfContainedNetworkInterfaceListener::bind(BindTcp, 80)),
@@ -166,10 +167,11 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
                                 .await
                                 .is_ok()
                             {
-                                Some(InternedString::intern(
+                                Some(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
                                         .await?
-                                        .trim(),
+                                        .trim()
+                                        .to_owned(),
                                 ))
                             } else {
                                 None

core/src/bins/tunnel.rs

@@ -6,7 +6,6 @@ use std::time::Duration;
 use clap::Parser;
 use futures::FutureExt;
 use rpc_toolkit::CliApp;
-use rust_i18n::t;
 use tokio::signal::unix::signal;
 use tracing::instrument;
 use visit_rs::Visit;
@@ -71,7 +70,7 @@ async fn inner_main(config: &TunnelConfig) -> Result<(), Error> {
                                         true
                                     }
                                     Err(e) => {
-                                        tracing::error!("{}", t!("bins.tunnel.error-adding-ssl-listener", error = e.to_string()));
+                                        tracing::error!("error adding ssl listener: {e}");
                                         tracing::debug!("{e:?}");
 
                                         false
@@ -93,7 +92,7 @@ async fn inner_main(config: &TunnelConfig) -> Result<(), Error> {
                 }
                 .await
                 {
-                    tracing::error!("{}", t!("bins.tunnel.error-updating-webserver-bind", error = e.to_string()));
+                    tracing::error!("error updating webserver bind: {e}");
                     tracing::debug!("{e:?}");
                     tokio::time::sleep(Duration::from_secs(5)).await;
                 }
@@ -158,7 +157,7 @@ pub fn main(args: impl IntoIterator<Item = OsString>) {
         let rt = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
             .build()
-            .expect(&t!("bins.tunnel.failed-to-initialize-runtime"));
+            .expect("failed to initialize runtime");
         rt.block_on(inner_main(&config))
     };
 
@@ -180,7 +179,6 @@ pub fn cli(args: impl IntoIterator<Item = OsString>) {
         |cfg: ClientConfig| Ok(CliContext::init(cfg.load()?)?),
         crate::tunnel::api::tunnel_api(),
     )
-    .mutate_command(super::translate_cli)
     .run(args)
     {
         match e.data {

core/src/context/cli.rs

@@ -23,7 +23,7 @@ use tracing::instrument;
 
 use super::setup::CURRENT_SECRET;
 use crate::context::config::{ClientConfig, local_config_path};
-use crate::context::{DiagnosticContext, InitContext, RpcContext, SetupContext};
+use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::developer::{OS_DEVELOPER_KEY_PATH, default_developer_key_path};
 use crate::middleware::auth::local::LocalAuthContext;
 use crate::prelude::*;
@@ -38,8 +38,6 @@ pub struct CliContextSeed {
     pub registry_url: Option<Url>,
     pub registry_hostname: Vec<InternedString>,
     pub registry_listen: Option<SocketAddr>,
-    pub s9pk_s3base: Option<Url>,
-    pub s9pk_s3bucket: Option<InternedString>,
     pub tunnel_addr: Option<SocketAddr>,
     pub tunnel_listen: Option<SocketAddr>,
     pub client: Client,
@@ -131,8 +129,6 @@ impl CliContext {
                 .transpose()?,
             registry_hostname: config.registry_hostname.unwrap_or_default(),
             registry_listen: config.registry_listen,
-            s9pk_s3base: config.s9pk_s3base,
-            s9pk_s3bucket: config.s9pk_s3bucket,
             tunnel_addr: config.tunnel,
             tunnel_listen: config.tunnel_listen,
             client: {
@@ -164,23 +160,21 @@ impl CliContext {
                 if !path.exists() {
                     continue;
                 }
-                let pair =
-                    <ed25519::KeypairBytes as ed25519::pkcs8::DecodePrivateKey>::from_pkcs8_pem(
-                        &std::fs::read_to_string(path)?,
+                let pair = <ed25519::KeypairBytes as ed25519::pkcs8::DecodePrivateKey>::from_pkcs8_pem(
+                    &std::fs::read_to_string(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,
                     )
-                    .with_kind(crate::ErrorKind::Pem)?;
-                let secret =
-                    ed25519_dalek::SecretKey::try_from(&pair.secret_key[..]).map_err(|_| {
-                        Error::new(
-                            eyre!("{}", t!("context.cli.pkcs8-key-incorrect-length")),
-                            ErrorKind::OpenSsl,
-                        )
-                    })?;
-                return Ok(secret.into());
+                })?;
+                return Ok(secret.into())
             }
             Err(Error::new(
-                eyre!("{}", t!("context.cli.developer-key-does-not-exist")),
-                crate::ErrorKind::Uninitialized,
+                eyre!("Developer Key does not exist! Please run `start-cli init-key` before running this command."),
+                crate::ErrorKind::Uninitialized
             ))
         })
     }
@@ -195,18 +189,14 @@ impl CliContext {
             "http" => "ws",
             _ => {
                 return Err(Error::new(
-                    eyre!("{}", t!("context.cli.cannot-parse-scheme-from-base-url")),
+                    eyre!("Cannot parse scheme from base URL"),
                     crate::ErrorKind::ParseUrl,
                 )
                 .into());
             }
         };
-        url.set_scheme(ws_scheme).map_err(|_| {
-            Error::new(
-                eyre!("{}", t!("context.cli.cannot-set-url-scheme")),
-                crate::ErrorKind::ParseUrl,
-            )
-        })?;
+        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)?
@@ -404,3 +394,22 @@ impl CallRemote<SetupContext> for CliContext {
         .await
     }
 }
+impl CallRemote<InstallContext> for CliContext {
+    async fn call_remote(
+        &self,
+        method: &str,
+        _: OrdMap<&'static str, Value>,
+        params: Value,
+        _: Empty,
+    ) -> Result<Value, RpcError> {
+        crate::middleware::auth::signature::call_remote(
+            self,
+            self.rpc_url.clone(),
+            HeaderMap::new(),
+            self.rpc_url.host_str(),
+            method,
+            params,
+        )
+        .await
+    }
+}

core/src/context/config.rs

@@ -58,31 +58,27 @@ pub trait ContextConfig: DeserializeOwned + Default {
 #[command(rename_all = "kebab-case")]
 #[command(version = crate::version::Current::default().semver().to_string())]
 pub struct ClientConfig {
-    #[arg(short = 'c', long, help = "help.arg.config-file-path")]
+    #[arg(short = 'c', long)]
     pub config: Option<PathBuf>,
-    #[arg(short = 'H', long, help = "help.arg.host-url")]
+    #[arg(short = 'H', long)]
     pub host: Option<Url>,
-    #[arg(short = 'r', long, help = "help.arg.registry-url")]
+    #[arg(short = 'r', long)]
     pub registry: Option<Url>,
-    #[arg(long, help = "help.arg.registry-hostname")]
+    #[arg(long)]
     pub registry_hostname: Option<Vec<InternedString>>,
     #[arg(skip)]
     pub registry_listen: Option<SocketAddr>,
-    #[arg(long, help = "help.s9pk-s3base")]
-    pub s9pk_s3base: Option<Url>,
-    #[arg(long, help = "help.s9pk-s3bucket")]
-    pub s9pk_s3bucket: Option<InternedString>,
-    #[arg(short = 't', long, help = "help.arg.tunnel-address")]
+    #[arg(short = 't', long)]
     pub tunnel: Option<SocketAddr>,
     #[arg(skip)]
     pub tunnel_listen: Option<SocketAddr>,
-    #[arg(short = 'p', long, help = "help.arg.proxy-url")]
+    #[arg(short = 'p', long)]
     pub proxy: Option<Url>,
     #[arg(skip)]
     pub socks_listen: Option<SocketAddr>,
-    #[arg(long, help = "help.arg.cookie-path")]
+    #[arg(long)]
     pub cookie_path: Option<PathBuf>,
-    #[arg(long, help = "help.arg.developer-key-path")]
+    #[arg(long)]
     pub developer_key_path: Option<PathBuf>,
 }
 impl ContextConfig for ClientConfig {
@@ -93,13 +89,8 @@ impl ContextConfig for ClientConfig {
         self.host = self.host.take().or(other.host);
         self.registry = self.registry.take().or(other.registry);
         self.registry_hostname = self.registry_hostname.take().or(other.registry_hostname);
-        self.registry_listen = self.registry_listen.take().or(other.registry_listen);
-        self.s9pk_s3base = self.s9pk_s3base.take().or(other.s9pk_s3base);
-        self.s9pk_s3bucket = self.s9pk_s3bucket.take().or(other.s9pk_s3bucket);
         self.tunnel = self.tunnel.take().or(other.tunnel);
-        self.tunnel_listen = self.tunnel_listen.take().or(other.tunnel_listen);
         self.proxy = self.proxy.take().or(other.proxy);
-        self.socks_listen = self.socks_listen.take().or(other.socks_listen);
         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);
     }
@@ -118,19 +109,21 @@ impl ClientConfig {
 #[serde(rename_all = "kebab-case")]
 #[command(rename_all = "kebab-case")]
 pub struct ServerConfig {
-    #[arg(short, long, help = "help.arg.config-file-path")]
+    #[arg(short, long)]
     pub config: Option<PathBuf>,
+    #[arg(long)]
+    pub ethernet_interface: Option<String>,
     #[arg(skip)]
     pub os_partitions: Option<OsPartitionInfo>,
-    #[arg(long, help = "help.arg.socks-listen-address")]
+    #[arg(long)]
     pub socks_listen: Option<SocketAddr>,
-    #[arg(long, help = "help.arg.revision-cache-size")]
+    #[arg(long)]
     pub revision_cache_size: Option<usize>,
-    #[arg(long, help = "help.arg.disable-encryption")]
+    #[arg(long)]
     pub disable_encryption: Option<bool>,
-    #[arg(long, help = "help.arg.multi-arch-s9pks")]
+    #[arg(long)]
     pub multi_arch_s9pks: Option<bool>,
-    #[arg(long, help = "help.arg.developer-key-path")]
+    #[arg(long)]
     pub developer_key_path: Option<PathBuf>,
 }
 impl ContextConfig for ServerConfig {
@@ -138,6 +131,7 @@ impl ContextConfig for ServerConfig {
         self.config.take()
     }
     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.socks_listen = self.socks_listen.take().or(other.socks_listen);
         self.revision_cache_size = self

core/src/context/diagnostic.rs

@@ -6,15 +6,15 @@ use rpc_toolkit::yajrc::RpcError;
 use tokio::sync::broadcast::Sender;
 use tracing::instrument;
 
+use crate::Error;
 use crate::context::config::ServerConfig;
-use crate::prelude::*;
 use crate::rpc_continuations::RpcContinuations;
 use crate::shutdown::Shutdown;
 
 pub struct DiagnosticContextSeed {
     pub shutdown: Sender<Shutdown>,
     pub error: Arc<RpcError>,
-    pub disk_guid: Option<InternedString>,
+    pub disk_guid: Option<Arc<String>>,
     pub rpc_continuations: RpcContinuations,
 }
 
@@ -24,13 +24,10 @@ impl DiagnosticContext {
     #[instrument(skip_all)]
     pub fn init(
         _config: &ServerConfig,
-        disk_guid: Option<InternedString>,
+        disk_guid: Option<Arc<String>>,
         error: Error,
     ) -> Result<Self, Error> {
-        tracing::error!(
-            "{}",
-            t!("context.diagnostic.starting-diagnostic-ui", error = error)
-        );
+        tracing::error!("Error: {}: Starting diagnostic UI", error);
         tracing::debug!("{:?}", error);
 
         let (shutdown, _) = tokio::sync::broadcast::channel(1);

core/src/context/install.rs

@@ -0,0 +1,44 @@
+use std::ops::Deref;
+use std::sync::Arc;
+
+use rpc_toolkit::Context;
+use tokio::sync::broadcast::Sender;
+use tracing::instrument;
+
+use crate::Error;
+use crate::net::utils::find_eth_iface;
+use crate::rpc_continuations::RpcContinuations;
+
+pub struct InstallContextSeed {
+    pub ethernet_interface: String,
+    pub shutdown: Sender<()>,
+    pub rpc_continuations: RpcContinuations,
+}
+
+#[derive(Clone)]
+pub struct InstallContext(Arc<InstallContextSeed>);
+impl InstallContext {
+    #[instrument(skip_all)]
+    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?,
+            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;
+    fn deref(&self) -> &Self::Target {
+        &*self.0
+    }
+}

core/src/context/mod.rs

@@ -2,11 +2,13 @@ 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;

core/src/context/rpc.rs

@@ -60,7 +60,7 @@ pub struct RpcContextSeed {
     pub os_partitions: OsPartitionInfo,
     pub wifi_interface: Option<String>,
     pub ethernet_interface: String,
-    pub disk_guid: InternedString,
+    pub disk_guid: Arc<String>,
     pub ephemeral_sessions: SyncMutex<Sessions>,
     pub db: TypedPatchDb<Database>,
     pub sync_db: watch::Sender<u64>,
@@ -84,7 +84,7 @@ pub struct RpcContextSeed {
 }
 impl Drop for RpcContextSeed {
     fn drop(&mut self) {
-        tracing::info!("{}", t!("context.rpc.rpc-context-dropped"));
+        tracing::info!("RpcContext is dropped");
     }
 }
 
@@ -134,7 +134,7 @@ impl RpcContext {
     pub async fn init(
         webserver: &WebServerAcceptorSetter<UpgradableListener>,
         config: &ServerConfig,
-        disk_guid: InternedString,
+        disk_guid: Arc<String>,
         init_result: Option<InitResult>,
         InitRpcContextPhases {
             mut load_db,
@@ -155,7 +155,7 @@ impl RpcContext {
         let peek = db.peek().await;
         let account = AccountInfo::load(&peek)?;
         load_db.complete();
-        tracing::info!("{}", t!("context.rpc.opened-patchdb"));
+        tracing::info!("Opened PatchDB");
 
         init_net_ctrl.start();
         let (net_controller, os_net_service) = if let Some(InitResult {
@@ -172,15 +172,15 @@ impl RpcContext {
             (net_ctrl, os_net_service)
         };
         init_net_ctrl.complete();
-        tracing::info!("{}", t!("context.rpc.initialized-net-controller"));
+        tracing::info!("Initialized Net Controller");
 
         if PLATFORM.ends_with("-nonfree") {
             if let Err(e) = Command::new("nvidia-smi")
                 .invoke(ErrorKind::ParseSysInfo)
                 .await
             {
-                tracing::warn!("{}", t!("context.rpc.nvidia-smi-error", error = e));
-                tracing::info!("{}", t!("context.rpc.nvidia-warning-can-be-ignored"));
+                tracing::warn!("nvidia-smi: {e}");
+                tracing::info!("The above warning can be ignored if no NVIDIA card is present");
             } else {
                 async {
                     let version: InternedString = String::from_utf8(
@@ -279,7 +279,7 @@ impl RpcContext {
                             .arg("100000")
                             .invoke(ErrorKind::Filesystem)
                             .await?;
-                        // tmp.unmount_and_delete().await?;
+                        tmp.unmount_and_delete().await?;
                     }
                     BlockDev::new(&sqfs)
                         .mount(NVIDIA_OVERLAY_PATH, ReadOnly)
@@ -335,12 +335,16 @@ impl RpcContext {
             is_closed: AtomicBool::new(false),
             os_partitions: config.os_partitions.clone().ok_or_else(|| {
                 Error::new(
-                    eyre!("{}", t!("context.rpc.os-partition-info-missing")),
+                    eyre!("OS Partition Information Missing"),
                     ErrorKind::Filesystem,
                 )
             })?,
             wifi_interface: wifi_interface.clone(),
-            ethernet_interface: find_eth_iface().await?,
+            ethernet_interface: if let Some(eth) = config.ethernet_interface.clone() {
+                eth
+            } else {
+                find_eth_iface().await?
+            },
             disk_guid,
             ephemeral_sessions: SyncMutex::new(Sessions::new()),
             sync_db: watch::Sender::new(db.sequence().await),
@@ -365,9 +369,9 @@ impl RpcContext {
             current_secret: Arc::new(
                 Jwk::generate_ec_key(josekit::jwk::alg::ec::EcCurve::P256).map_err(|e| {
                     tracing::debug!("{:?}", e);
-                    tracing::error!("{}", t!("context.rpc.couldnt-generate-ec-key"));
+                    tracing::error!("Couldn't generate ec key");
                     Error::new(
-                        color_eyre::eyre::eyre!("{}", t!("context.rpc.couldnt-generate-ec-key")),
+                        color_eyre::eyre::eyre!("Couldn't generate ec key"),
                         crate::ErrorKind::Unknown,
                     )
                 })?,
@@ -382,10 +386,10 @@ impl RpcContext {
 
         let res = Self(seed.clone());
         res.cleanup_and_initialize(cleanup_init).await?;
-        tracing::info!("{}", t!("context.rpc.cleaned-up-transient-states"));
+        tracing::info!("Cleaned up transient states");
 
         crate::version::post_init(&res, run_migrations).await?;
-        tracing::info!("{}", t!("context.rpc.completed-migrations"));
+        tracing::info!("Completed migrations");
         Ok(res)
     }
 
@@ -394,7 +398,7 @@ impl RpcContext {
         self.crons.mutate(|c| std::mem::take(c));
         self.services.shutdown_all().await?;
         self.is_closed.store(true, Ordering::SeqCst);
-        tracing::info!("{}", t!("context.rpc.rpc-context-shutdown"));
+        tracing::info!("RpcContext is shutdown");
         Ok(())
     }
 
@@ -463,10 +467,7 @@ impl RpcContext {
                     .await
                     .result
                 {
-                    tracing::error!(
-                        "{}",
-                        t!("context.rpc.error-in-session-cleanup-cron", error = e)
-                    );
+                    tracing::error!("Error in session cleanup cron: {e}");
                     tracing::debug!("{e:?}");
                 }
             }
@@ -579,7 +580,6 @@ impl RpcContext {
     pub async fn call_remote<RemoteContext>(
         &self,
         method: &str,
-        metadata: OrdMap<&'static str, Value>,
         params: Value,
     ) -> Result<Value, RpcError>
     where
@@ -588,7 +588,7 @@ impl RpcContext {
         <Self as CallRemote<RemoteContext, Empty>>::call_remote(
             &self,
             method,
-            metadata,
+            OrdMap::new(),
             params,
             Empty {},
         )
@@ -597,15 +597,20 @@ impl RpcContext {
     pub async fn call_remote_with<RemoteContext, T>(
         &self,
         method: &str,
-        metadata: OrdMap<&'static str, Value>,
         params: Value,
         extra: T,
     ) -> Result<Value, RpcError>
     where
         Self: CallRemote<RemoteContext, T>,
     {
-        <Self as CallRemote<RemoteContext, T>>::call_remote(&self, method, metadata, params, extra)
-            .await
+        <Self as CallRemote<RemoteContext, T>>::call_remote(
+            &self,
+            method,
+            OrdMap::new(),
+            params,
+            extra,
+        )
+        .await
     }
 }
 impl AsRef<Client> for RpcContext {

core/src/context/setup.rs

@@ -6,7 +6,6 @@ use std::time::Duration;
 use futures::{Future, StreamExt};
 use imbl_value::InternedString;
 use josekit::jwk::Jwk;
-use openssl::x509::X509;
 use patch_db::PatchDb;
 use rpc_toolkit::Context;
 use serde::{Deserialize, Serialize};
@@ -16,9 +15,10 @@ use tracing::instrument;
 use ts_rs::TS;
 
 use crate::MAIN_DATA;
+use crate::account::AccountInfo;
 use crate::context::RpcContext;
 use crate::context::config::ServerConfig;
-use crate::disk::mount::guard::{MountGuard, TmpMountGuard};
+use crate::disk::OsPartitionInfo;
 use crate::hostname::Hostname;
 use crate::net::gateway::UpgradableListener;
 use crate::net::web_server::{WebServer, WebServerAcceptorSetter};
@@ -27,15 +27,12 @@ use crate::progress::FullProgressTracker;
 use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
 use crate::setup::SetupProgress;
 use crate::shutdown::Shutdown;
-use crate::system::KeyboardOptions;
 use crate::util::future::NonDetachingJoinHandle;
-use crate::util::serde::Pem;
-use crate::util::sync::SyncMutex;
 
 lazy_static::lazy_static! {
     pub static ref CURRENT_SECRET: Jwk = Jwk::generate_ec_key(josekit::jwk::alg::ec::EcCurve::P256).unwrap_or_else(|e| {
         tracing::debug!("{:?}", e);
-        tracing::error!("{}", t!("context.setup.couldnt-generate-ec-key"));
+        tracing::error!("Couldn't generate ec key");
         panic!("Couldn't generate ec key")
     });
 }
@@ -44,25 +41,40 @@ lazy_static::lazy_static! {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct SetupResult {
+    pub tor_addresses: Vec<String>,
     #[ts(type = "string")]
     pub hostname: Hostname,
-    pub root_ca: Pem<X509>,
-    pub needs_restart: bool,
+    #[ts(type = "string")]
+    pub lan_address: InternedString,
+    pub root_ca: String,
+}
+impl TryFrom<&AccountInfo> for SetupResult {
+    type Error = Error;
+    fn try_from(value: &AccountInfo) -> Result<Self, Self::Error> {
+        Ok(Self {
+            tor_addresses: value
+                .tor_keys
+                .iter()
+                .map(|tor_key| format!("https://{}", tor_key.onion_address()))
+                .collect(),
+            hostname: value.hostname.clone(),
+            lan_address: value.hostname.lan_address(),
+            root_ca: String::from_utf8(value.root_ca_cert.to_pem()?)?,
+        })
+    }
 }
 
 pub struct SetupContextSeed {
     pub webserver: WebServerAcceptorSetter<UpgradableListener>,
-    pub config: SyncMutex<ServerConfig>,
+    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 disk_guid: OnceCell<InternedString>,
+    pub disk_guid: OnceCell<Arc<String>>,
     pub shutdown: Sender<Option<Shutdown>>,
     pub rpc_continuations: RpcContinuations,
-    pub install_rootfs: SyncMutex<Option<(TmpMountGuard, MountGuard)>>,
-    pub keyboard: SyncMutex<Option<KeyboardOptions>>,
-    pub language: SyncMutex<Option<InternedString>>,
 }
 
 #[derive(Clone)]
@@ -71,24 +83,27 @@ impl SetupContext {
     #[instrument(skip_all)]
     pub fn init(
         webserver: &WebServer<UpgradableListener>,
-        config: ServerConfig,
+        config: &ServerConfig,
     ) -> Result<Self, Error> {
         let (shutdown, _) = tokio::sync::broadcast::channel(1);
         let mut progress = FullProgressTracker::new();
         progress.enable_logging(true);
         Ok(Self(Arc::new(SetupContextSeed {
             webserver: webserver.acceptor_setter(),
+            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),
-            config: SyncMutex::new(config),
             progress,
             task: OnceCell::new(),
             result: OnceCell::new(),
             disk_guid: OnceCell::new(),
             shutdown,
             rpc_continuations: RpcContinuations::new(),
-            install_rootfs: SyncMutex::new(None),
-            language: SyncMutex::new(None),
-            keyboard: SyncMutex::new(None),
         })))
     }
     #[instrument(skip_all)]
@@ -114,14 +129,11 @@ impl SetupContext {
                         .get_or_init(|| async {
                             match f().await {
                                 Ok(res) => {
-                                    tracing::info!("{}", t!("context.setup.setup-complete"));
+                                    tracing::info!("Setup complete!");
                                     Ok(res)
                                 }
                                 Err(e) => {
-                                    tracing::error!(
-                                        "{}",
-                                        t!("context.setup.setup-failed", error = e)
-                                    );
+                                    tracing::error!("Setup failed: {e}");
                                     tracing::debug!("{e:?}");
                                     Err(e)
                                 }
@@ -134,13 +146,10 @@ impl SetupContext {
             )
             .map_err(|_| {
                 if self.result.initialized() {
-                    Error::new(
-                        eyre!("{}", t!("context.setup.setup-already-complete")),
-                        ErrorKind::InvalidRequest,
-                    )
+                    Error::new(eyre!("Setup already complete"), ErrorKind::InvalidRequest)
                 } else {
                     Error::new(
-                        eyre!("{}", t!("context.setup.setup-already-in-progress")),
+                        eyre!("Setup already in progress"),
                         ErrorKind::InvalidRequest,
                     )
                 }
@@ -190,7 +199,7 @@ impl SetupContext {
                         }
                         .await
                         {
-                            tracing::error!("{}", t!("context.setup.error-in-setup-progress-websocket", error = e));
+                            tracing::error!("Error in setup progress websocket: {e}");
                             tracing::debug!("{e:?}");
                         }
                     },

core/src/control.rs

@@ -11,7 +11,6 @@ use crate::{Error, PackageId};
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ControlParams {
-    #[arg(help = "help.arg.package-id")]
     pub id: PackageId,
 }
 

core/src/db/mod.rs

@@ -54,7 +54,7 @@ pub fn db<C: Context>() -> ParentHandler<C> {
             "dump",
             from_fn_async(cli_dump)
                 .with_display_serializable()
-                .with_about("about.filter-query-db"),
+                .with_about("Filter/query db to display tables and records"),
         )
         .subcommand("dump", from_fn_async(dump).no_cli())
         .subcommand(
@@ -65,13 +65,13 @@ pub fn db<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "put",
-            put::<C>().with_about("about.command-add-ui-record-db"),
+            put::<C>().with_about("Command for adding UI record to db"),
         )
         .subcommand(
             "apply",
             from_fn_async(cli_apply)
                 .no_display()
-                .with_about("about.update-db-record"),
+                .with_about("Update a db record"),
         )
         .subcommand("apply", from_fn_async(apply).no_cli())
 }
@@ -87,14 +87,9 @@ pub enum RevisionsRes {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliDumpParams {
-    #[arg(
-        long = "include-private",
-        short = 'p',
-        help = "help.arg.include-private-data"
-    )]
+    #[arg(long = "include-private", short = 'p')]
     #[serde(default)]
     include_private: bool,
-    #[arg(help = "help.arg.db-path")]
     path: Option<PathBuf>,
 }
 
@@ -263,11 +258,9 @@ pub async fn subscribe(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CliApplyParams {
-    #[arg(long, help = "help.arg.allow-model-mismatch")]
+    #[arg(long)]
     allow_model_mismatch: bool,
-    #[arg(help = "help.arg.db-apply-expr")]
     expr: String,
-    #[arg(help = "help.arg.db-path")]
     path: Option<PathBuf>,
 }
 
@@ -334,7 +327,6 @@ async fn cli_apply(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ApplyParams {
-    #[arg(help = "help.arg.db-apply-expr")]
     expr: String,
 }
 
@@ -366,7 +358,7 @@ pub fn put<C: Context>() -> ParentHandler<C> {
         "ui",
         from_fn_async(ui)
             .with_display_serializable()
-            .with_about("about.add-path-value-db")
+            .with_about("Add path and value to db")
             .with_call_remote::<CliContext>(),
     )
 }
@@ -374,10 +366,8 @@ pub fn put<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UiParams {
-    #[arg(help = "help.arg.json-pointer")]
     #[ts(type = "string")]
     pointer: JsonPointer,
-    #[arg(help = "help.arg.json-value")]
     #[ts(type = "any")]
     value: Value,
 }

core/src/db/model/mod.rs

@@ -14,7 +14,6 @@ use crate::notifications::Notifications;
 use crate::prelude::*;
 use crate::sign::AnyVerifyingKey;
 use crate::ssh::SshKeys;
-use crate::system::KeyboardOptions;
 use crate::util::serde::Pem;
 
 pub mod package;
@@ -29,14 +28,9 @@ pub struct Database {
     pub private: Private,
 }
 impl Database {
-    pub fn init(
-        account: &AccountInfo,
-        kiosk: Option<bool>,
-        language: Option<InternedString>,
-        keyboard: Option<KeyboardOptions>,
-    ) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo, kiosk: Option<bool>) -> Result<Self, Error> {
         Ok(Self {
-            public: Public::init(account, kiosk, language, keyboard)?,
+            public: Public::init(account, kiosk)?,
             private: Private {
                 key_store: KeyStore::new(account)?,
                 password: account.password.clone(),

core/src/db/model/package.rs

@@ -14,7 +14,7 @@ use crate::net::host::Hosts;
 use crate::net::service_interface::ServiceInterface;
 use crate::prelude::*;
 use crate::progress::FullProgress;
-use crate::s9pk::manifest::{LocaleString, Manifest};
+use crate::s9pk::manifest::Manifest;
 use crate::status::StatusInfo;
 use crate::util::DataUrl;
 use crate::util::serde::{Pem, is_partial_of};
@@ -417,7 +417,8 @@ impl Map for CurrentDependencies {
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct CurrentDependencyInfo {
-    pub title: Option<LocaleString>,
+    #[ts(type = "string | null")]
+    pub title: Option<InternedString>,
     pub icon: Option<DataUrl<'static>>,
     #[serde(flatten)]
     pub kind: CurrentDependencyKind,

core/src/db/model/public.rs

@@ -25,7 +25,7 @@ use crate::net::utils::ipv6_is_local;
 use crate::net::vhost::AlpnInfo;
 use crate::prelude::*;
 use crate::progress::FullProgress;
-use crate::system::{KeyboardOptions, SmtpValue};
+use crate::system::SmtpValue;
 use crate::util::cpupower::Governor;
 use crate::util::lshw::LshwDevice;
 use crate::util::serde::MaybeUtf8String;
@@ -45,12 +45,7 @@ pub struct Public {
     pub ui: Value,
 }
 impl Public {
-    pub fn init(
-        account: &AccountInfo,
-        kiosk: Option<bool>,
-        language: Option<InternedString>,
-        keyboard: Option<KeyboardOptions>,
-    ) -> Result<Self, Error> {
+    pub fn init(account: &AccountInfo, kiosk: Option<bool>) -> Result<Self, Error> {
         Ok(Self {
             server_info: ServerInfo {
                 arch: get_arch(),
@@ -144,8 +139,6 @@ impl Public {
                 ram: 0,
                 devices: Vec::new(),
                 kiosk,
-                language,
-                keyboard,
             },
             package_data: AllPackageData::default(),
             ui: serde_json::from_str(*DB_UI_SEED_CELL.get().unwrap_or(&"null"))
@@ -202,8 +195,6 @@ pub struct ServerInfo {
     pub ram: u64,
     pub devices: Vec<LshwDevice>,
     pub kiosk: Option<bool>,
-    pub language: Option<InternedString>,
-    pub keyboard: Option<KeyboardOptions>,
 }
 
 #[derive(Debug, Default, Deserialize, Serialize, HasModel, TS)]

core/src/dependencies.rs

@@ -1,11 +1,11 @@
 use std::collections::BTreeMap;
 use std::path::Path;
 
+use imbl_value::InternedString;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 use crate::prelude::*;
-use crate::s9pk::manifest::LocaleString;
 use crate::util::PathOrUrl;
 use crate::{Error, PackageId};
 
@@ -28,7 +28,7 @@ impl Map for Dependencies {
 #[serde(rename_all = "camelCase")]
 #[model = "Model<Self>"]
 pub struct DepInfo {
-    pub description: Option<LocaleString>,
+    pub description: Option<String>,
     pub optional: bool,
     #[serde(flatten)]
     pub metadata: Option<MetadataSrc>,
@@ -73,7 +73,7 @@ pub enum MetadataSrc {
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct Metadata {
-    pub title: LocaleString,
+    pub title: InternedString,
     pub icon: PathOrUrl,
 }
 
@@ -82,5 +82,5 @@ pub struct Metadata {
 #[model = "Model<Self>"]
 pub struct DependencyMetadata {
     #[ts(type = "string")]
-    pub title: LocaleString,
+    pub title: InternedString,
 }

core/src/diagnostic.rs

@@ -17,46 +17,45 @@ pub fn diagnostic<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "error",
             from_fn(error)
-                .with_about("about.display-diagnostic-error")
+                .with_about("Display diagnostic error")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "logs",
-            crate::system::logs::<DiagnosticContext>().with_about("about.display-os-logs"),
+            crate::system::logs::<DiagnosticContext>().with_about("Display OS logs"),
         )
         .subcommand(
             "logs",
             from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>)
                 .no_display()
-                .with_about("about.display-os-logs"),
+                .with_about("Display OS logs"),
         )
         .subcommand(
             "kernel-logs",
-            crate::system::kernel_logs::<DiagnosticContext>()
-                .with_about("about.display-kernel-logs"),
+            crate::system::kernel_logs::<DiagnosticContext>().with_about("Display kernel logs"),
         )
         .subcommand(
             "kernel-logs",
             from_fn_async(crate::logs::cli_logs::<DiagnosticContext, Empty>)
                 .no_display()
-                .with_about("about.display-kernel-logs"),
+                .with_about("Display kernal logs"),
         )
         .subcommand(
             "restart",
             from_fn(restart)
                 .no_display()
-                .with_about("about.restart-server")
+                .with_about("Restart the server")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "disk",
-            disk::<C>().with_about("about.command-remove-disk-filesystem"),
+            disk::<C>().with_about("Command to remove disk from filesystem"),
         )
         .subcommand(
             "rebuild",
             from_fn_async(rebuild)
                 .no_display()
-                .with_about("about.teardown-rebuild-containers")
+                .with_about("Teardown and rebuild service containers")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -90,16 +89,16 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
                 from_fn_async(forget_disk::<RpcContext>).no_display(),
             )
             .no_display()
-            .with_about("about.remove-disk-filesystem"),
+            .with_about("Remove disk from filesystem"),
         )
         .subcommand("repair", from_fn_async(|_: C| repair()).no_cli())
         .subcommand(
             "repair",
             CallRemoteHandler::<CliContext, _, _>::new(
-                from_fn_async(|_: RpcContext| repair()).no_display(),
-            )
-            .no_display()
-            .with_about("about.repair-disk-corruption"),
+                from_fn_async(|_: RpcContext| repair())
+                    .no_display()
+                    .with_about("Repair disk in the event of corruption"),
+            ),
         )
 }
 

core/src/disk/fsck/ext4.rs

@@ -4,7 +4,6 @@ use std::path::Path;
 use color_eyre::eyre::eyre;
 use futures::FutureExt;
 use futures::future::BoxFuture;
-use rust_i18n::t;
 use tokio::process::Command;
 use tracing::instrument;
 
@@ -63,39 +62,33 @@ async fn e2fsck_runner(
     let e2fsck_stderr = String::from_utf8(e2fsck_out.stderr)?;
     let code = e2fsck_out.status.code().ok_or_else(|| {
         Error::new(
-            eyre!("{}", t!("disk.fsck.process-terminated-by-signal")),
+            eyre!("e2fsck: process terminated by signal"),
             crate::ErrorKind::DiskManagement,
         )
     })?;
     if code & 4 != 0 {
         tracing::error!(
-            "{}",
-            t!(
-                "disk.fsck.errors-not-corrected",
-                device = logicalname.as_ref().display(),
-                stderr = e2fsck_stderr
-            ),
+            "some filesystem errors NOT corrected on {}:\n{}",
+            logicalname.as_ref().display(),
+            e2fsck_stderr,
         );
     } else if code & 1 != 0 {
         tracing::warn!(
-            "{}",
-            t!(
-                "disk.fsck.errors-corrected",
-                device = logicalname.as_ref().display(),
-                stderr = e2fsck_stderr
-            ),
+            "filesystem errors corrected on {}:\n{}",
+            logicalname.as_ref().display(),
+            e2fsck_stderr,
         );
     }
     if code < 8 {
         if code & 2 != 0 {
-            tracing::warn!("{}", t!("disk.fsck.reboot-required"));
+            tracing::warn!("reboot required");
             Ok(RequiresReboot(true))
         } else {
             Ok(RequiresReboot(false))
         }
     } else {
         Err(Error::new(
-            eyre!("{}", t!("disk.fsck.e2fsck-error", stderr = e2fsck_stderr)),
+            eyre!("e2fsck: {}", e2fsck_stderr),
             crate::ErrorKind::DiskManagement,
         ))
     }

core/src/disk/main.rs

@@ -2,8 +2,6 @@ use std::collections::BTreeMap;
 use std::path::{Path, PathBuf};
 
 use color_eyre::eyre::eyre;
-use imbl_value::InternedString;
-use rust_i18n::t;
 use tokio::process::Command;
 use tracing::instrument;
 
@@ -22,10 +20,10 @@ pub const MAIN_FS_SIZE: FsSize = FsSize::Gigabytes(8);
 #[instrument(skip_all)]
 pub async fn create<I, P>(
     disks: &I,
-    pvscan: &BTreeMap<PathBuf, Option<InternedString>>,
+    pvscan: &BTreeMap<PathBuf, Option<String>>,
     datadir: impl AsRef<Path>,
     password: Option<&str>,
-) -> Result<InternedString, Error>
+) -> Result<String, Error>
 where
     for<'a> &'a I: IntoIterator<Item = &'a P>,
     P: AsRef<Path>,
@@ -39,9 +37,9 @@ where
 #[instrument(skip_all)]
 pub async fn create_pool<I, P>(
     disks: &I,
-    pvscan: &BTreeMap<PathBuf, Option<InternedString>>,
+    pvscan: &BTreeMap<PathBuf, Option<String>>,
     encrypted: bool,
-) -> Result<InternedString, Error>
+) -> Result<String, Error>
 where
     for<'a> &'a I: IntoIterator<Item = &'a P>,
     P: AsRef<Path>,
@@ -81,7 +79,7 @@ where
         cmd.arg(disk.as_ref());
     }
     cmd.invoke(crate::ErrorKind::DiskManagement).await?;
-    Ok(guid.into())
+    Ok(guid)
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -226,7 +224,7 @@ pub async fn import<P: AsRef<Path>>(
         .is_none()
     {
         return Err(Error::new(
-            eyre!("{}", t!("disk.main.disk-not-found")),
+            eyre!("StartOS disk not found."),
             crate::ErrorKind::DiskNotAvailable,
         ));
     }
@@ -236,7 +234,7 @@ pub async fn import<P: AsRef<Path>>(
         .any(|id| id == guid)
     {
         return Err(Error::new(
-            eyre!("{}", t!("disk.main.incorrect-disk")),
+            eyre!("A StartOS disk was found, but it is not the correct disk for this device."),
             crate::ErrorKind::IncorrectDisk,
         ));
     }

core/src/disk/mod.rs

@@ -25,8 +25,6 @@ pub struct OsPartitionInfo {
     pub bios: Option<PathBuf>,
     pub boot: PathBuf,
     pub root: PathBuf,
-    #[serde(skip)] // internal use only
-    pub data: Option<PathBuf>,
 }
 impl OsPartitionInfo {
     pub fn contains(&self, logicalname: impl AsRef<Path>) -> bool {
@@ -51,7 +49,7 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
             from_fn_async(list)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| display_disk_info(handle.params, result))
-                .with_about("about.list-disk-info")
+                .with_about("List disk info")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand("repair", from_fn_async(|_: C| repair()).no_cli())
@@ -60,7 +58,7 @@ pub fn disk<C: Context>() -> ParentHandler<C> {
             CallRemoteHandler::<CliContext, _, _>::new(
                 from_fn_async(|_: RpcContext| repair())
                     .no_display()
-                    .with_about("about.repair-disk-corruption"),
+                    .with_about("Repair disk in the event of corruption"),
             ),
         )
 }

core/src/disk/mount/filesystem/bind.rs

@@ -29,31 +29,25 @@ impl Default for FileType {
 pub struct Bind<Src: AsRef<Path>> {
     src: Src,
     filetype: FileType,
-    recursive: bool,
 }
 impl<Src: AsRef<Path>> Bind<Src> {
     pub fn new(src: Src) -> Self {
         Self {
             src,
             filetype: FileType::Directory,
-            recursive: false,
         }
     }
     pub fn with_type(mut self, filetype: FileType) -> Self {
         self.filetype = filetype;
         self
     }
-    pub fn recursive(mut self, recursive: bool) -> Self {
-        self.recursive = recursive;
-        self
-    }
 }
 impl<Src: AsRef<Path> + Send + Sync> FileSystem for Bind<Src> {
     async fn source(&self) -> Result<Option<impl AsRef<Path>>, Error> {
         Ok(Some(&self.src))
     }
     fn extra_args(&self) -> impl IntoIterator<Item = impl AsRef<std::ffi::OsStr>> {
-        [if self.recursive { "--rbind" } else { "--bind" }]
+        ["--bind"]
     }
     async fn pre_mount(&self, mountpoint: &Path, mount_type: MountType) -> Result<(), Error> {
         let from_meta = tokio::fs::metadata(&self.src).await.ok();

core/src/disk/mount/util.rs

@@ -23,12 +23,9 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
     read_only: bool,
 ) -> Result<(), Error> {
     tracing::info!(
-        "{}",
-        t!(
-            "disk.mount.binding",
-            src = src.as_ref().display(),
-            dst = dst.as_ref().display()
-        )
+        "Binding {} to {}",
+        src.as_ref().display(),
+        dst.as_ref().display()
     );
     if is_mountpoint(&dst).await? {
         unmount(dst.as_ref(), true).await?;

core/src/disk/util.rs

@@ -20,9 +20,9 @@ use super::mount::guard::TmpMountGuard;
 use crate::disk::OsPartitionInfo;
 use crate::disk::mount::guard::GenericMountGuard;
 use crate::hostname::Hostname;
-use crate::prelude::*;
 use crate::util::Invoke;
 use crate::util::serde::IoFormat;
+use crate::{Error, ResultExt as _};
 
 #[derive(Clone, Copy, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -40,7 +40,7 @@ pub struct DiskInfo {
     pub model: Option<String>,
     pub partitions: Vec<PartitionInfo>,
     pub capacity: u64,
-    pub guid: Option<InternedString>,
+    pub guid: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -51,7 +51,7 @@ pub struct PartitionInfo {
     pub capacity: u64,
     pub used: Option<u64>,
     pub start_os: BTreeMap<String, StartOsRecoveryInfo>,
-    pub guid: Option<InternedString>,
+    pub guid: Option<String>,
 }
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
@@ -95,7 +95,7 @@ pub async fn get_vendor<P: AsRef<Path>>(path: P) -> Result<Option<String>, Error
         Path::new(SYS_BLOCK_PATH)
             .join(path.as_ref().strip_prefix("/dev").map_err(|_| {
                 Error::new(
-                    eyre!("{}", t!("disk.util.not-canonical-block-device")),
+                    eyre!("not a canonical block device"),
                     crate::ErrorKind::BlockDevice,
                 )
             })?)
@@ -118,7 +118,7 @@ pub async fn get_model<P: AsRef<Path>>(path: P) -> Result<Option<String>, Error>
         Path::new(SYS_BLOCK_PATH)
             .join(path.as_ref().strip_prefix("/dev").map_err(|_| {
                 Error::new(
-                    eyre!("{}", t!("disk.util.not-canonical-block-device")),
+                    eyre!("not a canonical block device"),
                     crate::ErrorKind::BlockDevice,
                 )
             })?)
@@ -215,7 +215,7 @@ pub async fn get_percentage<P: AsRef<Path>>(path: P) -> Result<u64, Error> {
 }
 
 #[instrument(skip_all)]
-pub async fn pvscan() -> Result<BTreeMap<PathBuf, Option<InternedString>>, Error> {
+pub async fn pvscan() -> Result<BTreeMap<PathBuf, Option<String>>, Error> {
     let pvscan_out = Command::new("pvscan")
         .invoke(crate::ErrorKind::DiskManagement)
         .await?;
@@ -259,31 +259,6 @@ pub async fn recovery_info(
     Ok(res)
 }
 
-/// Returns the canonical path of the source device for a given mount point,
-/// or None if the mount point doesn't exist or isn't mounted.
-#[instrument(skip_all)]
-pub async fn get_mount_source(mountpoint: impl AsRef<Path>) -> Result<Option<PathBuf>, Error> {
-    let mounts_content = tokio::fs::read_to_string("/proc/mounts")
-        .await
-        .with_ctx(|_| (crate::ErrorKind::Filesystem, "/proc/mounts"))?;
-
-    let mountpoint = mountpoint.as_ref();
-    for line in mounts_content.lines() {
-        let mut parts = line.split_whitespace();
-        let source = parts.next();
-        let mount = parts.next();
-        if let (Some(source), Some(mount)) = (source, mount) {
-            if Path::new(mount) == mountpoint {
-                // Try to canonicalize the source path
-                if let Ok(canonical) = tokio::fs::canonicalize(source).await {
-                    return Ok(Some(canonical));
-                }
-            }
-        }
-    }
-    Ok(None)
-}
-
 #[instrument(skip_all)]
 pub async fn list(os: &OsPartitionInfo) -> Result<Vec<DiskInfo>, Error> {
     struct DiskIndex {
@@ -399,53 +374,23 @@ async fn disk_info(disk: PathBuf) -> DiskInfo {
         .await
         .map_err(|e| {
             tracing::warn!(
-                "{}",
-                t!(
-                    "disk.util.could-not-get-partition-table",
-                    disk = disk.display(),
-                    error = e.source
-                )
+                "Could not get partition table of {}: {}",
+                disk.display(),
+                e.source
             )
         })
         .unwrap_or_default();
     let vendor = get_vendor(&disk)
         .await
-        .map_err(|e| {
-            tracing::warn!(
-                "{}",
-                t!(
-                    "disk.util.could-not-get-vendor",
-                    disk = disk.display(),
-                    error = e.source
-                )
-            )
-        })
+        .map_err(|e| tracing::warn!("Could not get vendor of {}: {}", disk.display(), e.source))
         .unwrap_or_default();
     let model = get_model(&disk)
         .await
-        .map_err(|e| {
-            tracing::warn!(
-                "{}",
-                t!(
-                    "disk.util.could-not-get-model",
-                    disk = disk.display(),
-                    error = e.source
-                )
-            )
-        })
+        .map_err(|e| tracing::warn!("Could not get model of {}: {}", disk.display(), e.source))
         .unwrap_or_default();
     let capacity = get_capacity(&disk)
         .await
-        .map_err(|e| {
-            tracing::warn!(
-                "{}",
-                t!(
-                    "disk.util.could-not-get-capacity",
-                    disk = disk.display(),
-                    error = e.source
-                )
-            )
-        })
+        .map_err(|e| tracing::warn!("Could not get capacity of {}: {}", disk.display(), e.source))
         .unwrap_or_default();
     DiskInfo {
         logicalname: disk,
@@ -462,49 +407,21 @@ async fn part_info(part: PathBuf) -> PartitionInfo {
     let mut start_os = BTreeMap::new();
     let label = get_label(&part)
         .await
-        .map_err(|e| {
-            tracing::warn!(
-                "{}",
-                t!(
-                    "disk.util.could-not-get-label",
-                    part = part.display(),
-                    error = e.source
-                )
-            )
-        })
+        .map_err(|e| tracing::warn!("Could not get label of {}: {}", part.display(), e.source))
         .unwrap_or_default();
     let capacity = get_capacity(&part)
         .await
-        .map_err(|e| {
-            tracing::warn!(
-                "{}",
-                t!(
-                    "disk.util.could-not-get-capacity-part",
-                    part = part.display(),
-                    error = e.source
-                )
-            )
-        })
+        .map_err(|e| tracing::warn!("Could not get capacity of {}: {}", part.display(), e.source))
         .unwrap_or_default();
     let mut used = None;
 
     match TmpMountGuard::mount(&BlockDev::new(&part), ReadOnly).await {
-        Err(e) => tracing::warn!(
-            "{}",
-            t!("disk.util.could-not-collect-usage-info", error = e.source)
-        ),
+        Err(e) => tracing::warn!("Could not collect usage information: {}", e.source),
         Ok(mount_guard) => {
             used = get_used(mount_guard.path())
                 .await
                 .map_err(|e| {
-                    tracing::warn!(
-                        "{}",
-                        t!(
-                            "disk.util.could-not-get-usage",
-                            part = part.display(),
-                            error = e.source
-                        )
-                    )
+                    tracing::warn!("Could not get usage of {}: {}", part.display(), e.source)
                 })
                 .ok();
             match recovery_info(mount_guard.path()).await {
@@ -512,21 +429,11 @@ async fn part_info(part: PathBuf) -> PartitionInfo {
                     start_os = a;
                 }
                 Err(e) => {
-                    tracing::error!(
-                        "{}",
-                        t!("disk.util.error-fetching-backup-metadata", error = e)
-                    );
+                    tracing::error!("Error fetching unencrypted backup metadata: {}", e);
                 }
             }
             if let Err(e) = mount_guard.unmount().await {
-                tracing::error!(
-                    "{}",
-                    t!(
-                        "disk.util.error-unmounting-partition",
-                        part = part.display(),
-                        error = e
-                    )
-                );
+                tracing::error!("Error unmounting partition {}: {}", part.display(), e);
             }
         }
     }
@@ -541,7 +448,7 @@ async fn part_info(part: PathBuf) -> PartitionInfo {
     }
 }
 
-fn parse_pvscan_output(pvscan_output: &str) -> BTreeMap<PathBuf, Option<InternedString>> {
+fn parse_pvscan_output(pvscan_output: &str) -> BTreeMap<PathBuf, Option<String>> {
     fn parse_line(line: &str) -> IResult<&str, (&str, Option<&str>)> {
         let pv_parse = preceded(
             tag("  PV "),
@@ -564,10 +471,10 @@ fn parse_pvscan_output(pvscan_output: &str) -> BTreeMap<PathBuf, Option<Interned
     for entry in entries {
         match parse_line(entry) {
             Ok((_, (pv, vg))) => {
-                ret.insert(PathBuf::from(pv), vg.map(InternedString::intern));
+                ret.insert(PathBuf::from(pv), vg.map(|s| s.to_owned()));
             }
             Err(_) => {
-                tracing::warn!("{}", t!("disk.util.failed-to-parse-pvscan", line = entry));
+                tracing::warn!("Failed to parse pvscan output line: {}", entry);
             }
         }
     }

core/src/error.rs

@@ -4,19 +4,17 @@ use axum::http::StatusCode;
 use axum::http::uri::InvalidUri;
 use color_eyre::eyre::eyre;
 use num_enum::TryFromPrimitive;
-use patch_db::Value;
+use patch_db::Revision;
 use rpc_toolkit::reqwest;
 use rpc_toolkit::yajrc::{
     INVALID_PARAMS_ERROR, INVALID_REQUEST_ERROR, METHOD_NOT_FOUND_ERROR, PARSE_ERROR, RpcError,
 };
-use rust_i18n::t;
 use serde::{Deserialize, Serialize};
 use tokio::task::JoinHandle;
 use tokio_rustls::rustls;
 use ts_rs::TS;
 
 use crate::InvalidId;
-use crate::prelude::to_value;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, TryFromPrimitive)]
 #[repr(i32)]
@@ -99,98 +97,95 @@ pub enum ErrorKind {
     InstallFailed = 76,
     UpdateFailed = 77,
     Smtp = 78,
-    SetSysInfo = 79,
 }
 impl ErrorKind {
-    pub fn as_str(&self) -> String {
+    pub fn as_str(&self) -> &'static str {
         use ErrorKind::*;
         match self {
-            Unknown => t!("error.unknown"),
-            Filesystem => t!("error.filesystem"),
-            Docker => t!("error.docker"),
-            ConfigSpecViolation => t!("error.config-spec-violation"),
-            ConfigRulesViolation => t!("error.config-rules-violation"),
-            NotFound => t!("error.not-found"),
-            IncorrectPassword => t!("error.incorrect-password"),
-            VersionIncompatible => t!("error.version-incompatible"),
-            Network => t!("error.network"),
-            Registry => t!("error.registry"),
-            Serialization => t!("error.serialization"),
-            Deserialization => t!("error.deserialization"),
-            Utf8 => t!("error.utf8"),
-            ParseVersion => t!("error.parse-version"),
-            IncorrectDisk => t!("error.incorrect-disk"),
-            // Nginx => t!("error.nginx"),
-            Dependency => t!("error.dependency"),
-            ParseS9pk => t!("error.parse-s9pk"),
-            ParseUrl => t!("error.parse-url"),
-            DiskNotAvailable => t!("error.disk-not-available"),
-            BlockDevice => t!("error.block-device"),
-            InvalidOnionAddress => t!("error.invalid-onion-address"),
-            Pack => t!("error.pack"),
-            ValidateS9pk => t!("error.validate-s9pk"),
-            DiskCorrupted => t!("error.disk-corrupted"), // Remove
-            Tor => t!("error.tor"),
-            ConfigGen => t!("error.config-gen"),
-            ParseNumber => t!("error.parse-number"),
-            Database => t!("error.database"),
-            InvalidId => t!("error.invalid-id"),
-            InvalidSignature => t!("error.invalid-signature"),
-            Backup => t!("error.backup"),
-            Restore => t!("error.restore"),
-            Authorization => t!("error.authorization"),
-            AutoConfigure => t!("error.auto-configure"),
-            Action => t!("error.action"),
-            RateLimited => t!("error.rate-limited"),
-            InvalidRequest => t!("error.invalid-request"),
-            MigrationFailed => t!("error.migration-failed"),
-            Uninitialized => t!("error.uninitialized"),
-            ParseNetAddress => t!("error.parse-net-address"),
-            ParseSshKey => t!("error.parse-ssh-key"),
-            SoundError => t!("error.sound-error"),
-            ParseTimestamp => t!("error.parse-timestamp"),
-            ParseSysInfo => t!("error.parse-sys-info"),
-            Wifi => t!("error.wifi"),
-            Journald => t!("error.journald"),
-            DiskManagement => t!("error.disk-management"),
-            OpenSsl => t!("error.openssl"),
-            PasswordHashGeneration => t!("error.password-hash-generation"),
-            DiagnosticMode => t!("error.diagnostic-mode"),
-            ParseDbField => t!("error.parse-db-field"),
-            Duplicate => t!("error.duplicate"),
-            MultipleErrors => t!("error.multiple-errors"),
-            Incoherent => t!("error.incoherent"),
-            InvalidBackupTargetId => t!("error.invalid-backup-target-id"),
-            ProductKeyMismatch => t!("error.product-key-mismatch"),
-            LanPortConflict => t!("error.lan-port-conflict"),
-            Javascript => t!("error.javascript"),
-            Pem => t!("error.pem"),
-            TLSInit => t!("error.tls-init"),
-            Ascii => t!("error.ascii"),
-            MissingHeader => t!("error.missing-header"),
-            Grub => t!("error.grub"),
-            Systemd => t!("error.systemd"),
-            OpenSsh => t!("error.openssh"),
-            Zram => t!("error.zram"),
-            Lshw => t!("error.lshw"),
-            CpuSettings => t!("error.cpu-settings"),
-            Firmware => t!("error.firmware"),
-            Timeout => t!("error.timeout"),
-            Lxc => t!("error.lxc"),
-            Cancelled => t!("error.cancelled"),
-            Git => t!("error.git"),
-            DBus => t!("error.dbus"),
-            InstallFailed => t!("error.install-failed"),
-            UpdateFailed => t!("error.update-failed"),
-            Smtp => t!("error.smtp"),
-            SetSysInfo => t!("error.set-sys-info"),
+            Unknown => "Unknown Error",
+            Filesystem => "Filesystem I/O Error",
+            Docker => "Docker Error",
+            ConfigSpecViolation => "Config Spec Violation",
+            ConfigRulesViolation => "Config Rules Violation",
+            NotFound => "Not Found",
+            IncorrectPassword => "Incorrect Password",
+            VersionIncompatible => "Version Incompatible",
+            Network => "Network Error",
+            Registry => "Registry Error",
+            Serialization => "Serialization Error",
+            Deserialization => "Deserialization Error",
+            Utf8 => "UTF-8 Parse Error",
+            ParseVersion => "Version Parsing Error",
+            IncorrectDisk => "Incorrect Disk",
+            // Nginx => "Nginx Error",
+            Dependency => "Dependency Error",
+            ParseS9pk => "S9PK Parsing Error",
+            ParseUrl => "URL Parsing Error",
+            DiskNotAvailable => "Disk Not Available",
+            BlockDevice => "Block Device Error",
+            InvalidOnionAddress => "Invalid Onion Address",
+            Pack => "Pack Error",
+            ValidateS9pk => "S9PK Validation Error",
+            DiskCorrupted => "Disk Corrupted", // Remove
+            Tor => "Tor Daemon Error",
+            ConfigGen => "Config Generation Error",
+            ParseNumber => "Number Parsing Error",
+            Database => "Database Error",
+            InvalidId => "Invalid ID",
+            InvalidSignature => "Invalid Signature",
+            Backup => "Backup Error",
+            Restore => "Restore Error",
+            Authorization => "Unauthorized",
+            AutoConfigure => "Auto-Configure Error",
+            Action => "Action Failed",
+            RateLimited => "Rate Limited",
+            InvalidRequest => "Invalid Request",
+            MigrationFailed => "Migration Failed",
+            Uninitialized => "Uninitialized",
+            ParseNetAddress => "Net Address Parsing Error",
+            ParseSshKey => "SSH Key Parsing Error",
+            SoundError => "Sound Interface Error",
+            ParseTimestamp => "Timestamp Parsing Error",
+            ParseSysInfo => "System Info Parsing Error",
+            Wifi => "WiFi Internal Error",
+            Journald => "Journald Error",
+            DiskManagement => "Disk Management Error",
+            OpenSsl => "OpenSSL Internal Error",
+            PasswordHashGeneration => "Password Hash Generation Error",
+            DiagnosticMode => "Server is in Diagnostic Mode",
+            ParseDbField => "Database Field Parse Error",
+            Duplicate => "Duplication Error",
+            MultipleErrors => "Multiple Errors",
+            Incoherent => "Incoherent",
+            InvalidBackupTargetId => "Invalid Backup Target ID",
+            ProductKeyMismatch => "Incompatible Product Keys",
+            LanPortConflict => "Incompatible LAN Port Configuration",
+            Javascript => "Javascript Engine Error",
+            Pem => "PEM Encoding Error",
+            TLSInit => "TLS Backend Initialization Error",
+            Ascii => "ASCII Parse Error",
+            MissingHeader => "Missing Header",
+            Grub => "Grub Error",
+            Systemd => "Systemd Error",
+            OpenSsh => "OpenSSH Error",
+            Zram => "Zram Error",
+            Lshw => "LSHW Error",
+            CpuSettings => "CPU Settings Error",
+            Firmware => "Firmware Error",
+            Timeout => "Timeout Error",
+            Lxc => "LXC Error",
+            Cancelled => "Cancelled",
+            Git => "Git Error",
+            DBus => "DBus Error",
+            InstallFailed => "Install Failed",
+            UpdateFailed => "Update Failed",
+            Smtp => "SMTP Error",
         }
-        .to_string()
     }
 }
 impl Display for ErrorKind {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", &self.as_str())
+        write!(f, "{}", self.as_str())
     }
 }
 
@@ -198,13 +193,13 @@ pub struct Error {
     pub source: color_eyre::eyre::Error,
     pub debug: Option<color_eyre::eyre::Error>,
     pub kind: ErrorKind,
-    pub info: Value,
+    pub revision: Option<Revision>,
     pub task: Option<JoinHandle<()>>,
 }
 
 impl Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}: {:#}", &self.kind.as_str(), self.source)
+        write!(f, "{}: {:#}", self.kind.as_str(), self.source)
     }
 }
 impl Debug for Error {
@@ -212,7 +207,7 @@ impl Debug for Error {
         write!(
             f,
             "{}: {:?}",
-            &self.kind.as_str(),
+            self.kind.as_str(),
             self.debug.as_ref().unwrap_or(&self.source)
         )
     }
@@ -229,7 +224,7 @@ impl Error {
             source: source.into(),
             debug,
             kind,
-            info: Value::Null,
+            revision: None,
             task: None,
         }
     }
@@ -238,7 +233,7 @@ impl Error {
             source: eyre!("{}", self.source),
             debug: self.debug.as_ref().map(|e| eyre!("{e}")),
             kind: self.kind,
-            info: self.info.clone(),
+            revision: self.revision.clone(),
             task: None,
         }
     }
@@ -246,10 +241,6 @@ impl Error {
         self.task = Some(task);
         self
     }
-    pub fn with_info(mut self, info: Value) -> Self {
-        self.info = info;
-        self
-    }
     pub async fn wait(mut self) -> Self {
         if let Some(task) = &mut self.task {
             task.await.log_err();
@@ -428,8 +419,6 @@ impl From<patch_db::value::Error> for Error {
 pub struct ErrorData {
     pub details: String,
     pub debug: String,
-    #[serde(default)]
-    pub info: Value,
 }
 impl Display for ErrorData {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -447,7 +436,6 @@ impl From<Error> for ErrorData {
         Self {
             details: value.to_string(),
             debug: format!("{:?}", value),
-            info: value.info,
         }
     }
 }
@@ -478,40 +466,47 @@ impl From<&RpcError> for ErrorData {
                         .or_else(|| d.as_str().map(|s| s.to_owned()))
                 })
                 .unwrap_or_else(|| value.message.clone().into_owned()),
-            info: to_value(
-                &value
-                    .data
-                    .as_ref()
-                    .and_then(|d| d.as_object().and_then(|d| d.get("info"))),
-            )
-            .unwrap_or_default(),
         }
     }
 }
 
 impl From<Error> for RpcError {
     fn from(e: Error) -> Self {
-        let kind = e.kind;
-        let data = ErrorData::from(e);
-        RpcError {
-            code: kind as i32,
-            message: kind.as_str().into(),
-            data: Some(match serde_json::to_value(&data) {
+        let mut data_object = serde_json::Map::with_capacity(3);
+        data_object.insert("details".to_owned(), format!("{}", e.source).into());
+        data_object.insert("debug".to_owned(), format!("{:?}", e.source).into());
+        data_object.insert(
+            "revision".to_owned(),
+            match serde_json::to_value(&e.revision) {
                 Ok(a) => a,
                 Err(e) => {
-                    tracing::warn!("Error serializing ErrorData object: {}", e);
+                    tracing::warn!("Error serializing revision for Error object: {}", e);
                     serde_json::Value::Null
                 }
-            }),
+            },
+        );
+        RpcError {
+            code: e.kind as i32,
+            message: e.kind.as_str().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 {
-        let data = ErrorData::from(&e);
-        let info = data.info.clone();
         Error::new(
-            data,
+            ErrorData::from(&e),
             if let Ok(kind) = e.code.try_into() {
                 kind
             } else if e.code == METHOD_NOT_FOUND_ERROR.code {
@@ -525,7 +520,6 @@ impl From<RpcError> for Error {
                 ErrorKind::Unknown
             },
         )
-        .with_info(info)
     }
 }
 
@@ -608,7 +602,7 @@ where
                 kind,
                 source,
                 debug,
-                info: Value::Null,
+                revision: None,
                 task: None,
             }
         })

core/src/init.rs

@@ -81,28 +81,26 @@ impl InitPhases {
     pub fn new(handle: &FullProgressTracker) -> Self {
         Self {
             preinit: if Path::new("/media/startos/config/preinit.sh").exists() {
-                Some(handle.add_phase(t!("init.running-preinit").into(), Some(5)))
+                Some(handle.add_phase("Running preinit.sh".into(), Some(5)))
             } else {
                 None
             },
-            local_auth: handle.add_phase(t!("init.enabling-local-auth").into(), Some(1)),
-            load_database: handle.add_phase(t!("init.loading-database").into(), Some(5)),
-            load_ssh_keys: handle.add_phase(t!("init.loading-ssh-keys").into(), Some(1)),
-            start_net: handle.add_phase(t!("init.starting-network-controller").into(), Some(1)),
-            mount_logs: handle.add_phase(t!("init.switching-logs-to-data-drive").into(), Some(1)),
-            load_ca_cert: handle.add_phase(t!("init.loading-ca-certificate").into(), Some(1)),
-            load_wifi: handle.add_phase(t!("init.loading-wifi-configuration").into(), Some(1)),
-            init_tmp: handle.add_phase(t!("init.initializing-temporary-files").into(), Some(1)),
-            set_governor: handle
-                .add_phase(t!("init.setting-cpu-performance-profile").into(), Some(1)),
-            sync_clock: handle.add_phase(t!("init.synchronizing-system-clock").into(), Some(10)),
-            enable_zram: handle.add_phase(t!("init.enabling-zram").into(), Some(1)),
-            update_server_info: handle.add_phase(t!("init.updating-server-info").into(), Some(1)),
-            launch_service_network: handle
-                .add_phase(t!("init.launching-service-intranet").into(), Some(1)),
-            validate_db: handle.add_phase(t!("init.validating-database").into(), Some(1)),
+            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(1)),
+            validate_db: handle.add_phase("Validating database".into(), Some(1)),
             postinit: if Path::new("/media/startos/config/postinit.sh").exists() {
-                Some(handle.add_phase(t!("init.running-postinit").into(), Some(5)))
+                Some(handle.add_phase("Running postinit.sh".into(), Some(5)))
             } else {
                 None
             },
@@ -129,14 +127,7 @@ pub async fn run_script<P: AsRef<Path>>(path: P, mut progress: PhaseProgressTrac
     }
     .await
     {
-        tracing::error!(
-            "{}",
-            t!(
-                "init.error-running-script",
-                script = script.display(),
-                error = e
-            )
-        );
+        tracing::error!("Error Running {}: {}", script.display(), e);
         tracing::debug!("{:?}", e);
     }
     progress.complete();
@@ -239,7 +230,6 @@ pub async fn init(
         .arg("-R")
         .arg("+C")
         .arg("/var/log/journal")
-        .env("LANG", "C.UTF-8")
         .invoke(ErrorKind::Filesystem)
         .await
     {
@@ -324,17 +314,14 @@ pub async fn init(
         {
             Some(governor)
         } else {
-            tracing::warn!(
-                "{}",
-                t!("init.cpu-governor-not-available", governor = governor)
-            );
+            tracing::warn!("CPU Governor \"{governor}\" Not Available");
             None
         }
     } else {
         cpupower::get_preferred_governor().await?
     };
     if let Some(governor) = governor {
-        tracing::info!("{}", t!("init.setting-cpu-governor", governor = governor));
+        tracing::info!("Setting CPU Governor to \"{governor}\"");
         cpupower::set_governor(governor).await?;
     }
     set_governor.complete();
@@ -362,14 +349,14 @@ pub async fn init(
         }
     }
     if !ntp_synced {
-        tracing::warn!("{}", t!("init.clock-sync-timeout"));
+        tracing::warn!("Timed out waiting for system time to synchronize");
     }
     sync_clock.complete();
 
     enable_zram.start();
     if server_info.as_zram().de()? {
         crate::system::enable_zram().await?;
-        tracing::info!("{}", t!("init.enabled-zram"));
+        tracing::info!("Enabled ZRAM");
     }
     enable_zram.complete();
 
@@ -417,7 +404,7 @@ pub async fn init(
         run_script("/media/startos/config/postinit.sh", progress).await;
     }
 
-    tracing::info!("{}", t!("init.system-initialized"));
+    tracing::info!("System initialized.");
 
     Ok(InitResult {
         net_ctrl,
@@ -429,30 +416,30 @@ pub fn init_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "logs",
-            crate::system::logs::<InitContext>().with_about("about.display-os-logs"),
+            crate::system::logs::<InitContext>().with_about("Disply OS logs"),
         )
         .subcommand(
             "logs",
             from_fn_async(crate::logs::cli_logs::<InitContext, Empty>)
                 .no_display()
-                .with_about("about.display-os-logs"),
+                .with_about("Display OS logs"),
         )
         .subcommand(
             "kernel-logs",
-            crate::system::kernel_logs::<InitContext>().with_about("about.display-kernel-logs"),
+            crate::system::kernel_logs::<InitContext>().with_about("Display kernel logs"),
         )
         .subcommand(
             "kernel-logs",
             from_fn_async(crate::logs::cli_logs::<InitContext, Empty>)
                 .no_display()
-                .with_about("about.display-kernel-logs"),
+                .with_about("Display kernel logs"),
         )
         .subcommand("subscribe", from_fn_async(init_progress).no_cli())
         .subcommand(
             "subscribe",
             from_fn_async(cli_init_progress)
                 .no_display()
-                .with_about("about.get-initialization-progress"),
+                .with_about("Get initialization progress"),
         )
 }
 
@@ -508,7 +495,7 @@ pub async fn init_progress(ctx: InitContext) -> Result<InitProgressRes, Error> {
                     );
 
                     if let Err(e) = ws.close_result(res.map(|_| "complete")).await {
-                        tracing::error!("{}", t!("init.error-closing-websocket", error = e));
+                        tracing::error!("error closing init progress websocket: {e}");
                         tracing::debug!("{e:?}");
                     }
                 },
@@ -539,7 +526,7 @@ pub async fn cli_init_progress(
         .await?,
     )?;
     let mut ws = ctx.ws_continuation(res.guid).await?;
-    let mut bar = PhasedProgressBar::new(&t!("init.initializing"));
+    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)?);

core/src/install/mod.rs

@@ -131,13 +131,9 @@ pub async fn install(
     let package: GetPackageResponse = from_value(
         ctx.call_remote_with::<RegistryContext, _>(
             "package.get",
-            [("get_device_info", Value::Bool(true))]
-                .into_iter()
-                .collect(),
             json!({
                 "id": id,
                 "targetVersion": VersionRange::exactly(version.deref().clone()),
-                "otherVersions": "none",
             }),
             RegistryUrlParams {
                 registry: registry.clone(),
@@ -287,7 +283,6 @@ pub async fn sideload(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CancelInstallParams {
-    #[arg(help = "help.arg.package-id")]
     pub id: PackageId,
 }
 
@@ -304,9 +299,7 @@ pub fn cancel_install(
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct QueryPackageParams {
-    #[arg(help = "help.arg.package-id")]
     id: PackageId,
-    #[arg(help = "help.arg.version-range")]
     version: Option<VersionRange>,
 }
 
@@ -364,7 +357,6 @@ impl FromArgMatches for CliInstallParams {
 #[derive(Deserialize, Serialize, Parser, TS)]
 #[ts(export)]
 pub struct InstalledVersionParams {
-    #[arg(help = "help.arg.package-id")]
     id: PackageId,
 }
 
@@ -485,7 +477,7 @@ pub async fn cli_install(
             let mut packages: GetPackageResponse = from_value(
                 ctx.call_remote::<RegistryContext>(
                     "package.get",
-                    json!({ "id": &id, "targetVersion": version, "sourceVersion": source_version, "otherVersions": "none" }),
+                    json!({ "id": &id, "targetVersion": version, "sourceVersion": source_version }),
                 )
                 .await?,
             )?;
@@ -524,12 +516,11 @@ pub async fn cli_install(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct UninstallParams {
-    #[arg(help = "help.arg.package-id")]
     id: PackageId,
-    #[arg(long, help = "help.arg.soft-uninstall")]
+    #[arg(long, help = "Do not delete the service data")]
     #[serde(default)]
     soft: bool,
-    #[arg(long, help = "help.arg.force-uninstall")]
+    #[arg(long, help = "Ignore errors in service uninit script")]
     #[serde(default)]
     force: bool,
 }

core/src/lib.rs

@@ -1,7 +1,5 @@
 use const_format::formatcp;
 
-rust_i18n::i18n!("locales", fallback = ["en_US"]);
-
 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");
@@ -10,7 +8,7 @@ pub use std::env::consts::ARCH;
 lazy_static::lazy_static! {
     pub static ref PLATFORM: String = {
         if let Ok(platform) = std::fs::read_to_string("/usr/lib/startos/PLATFORM.txt") {
-            platform.trim().to_string()
+            platform
         } else {
             ARCH.to_string()
         }
@@ -20,17 +18,6 @@ lazy_static::lazy_static! {
     };
 }
 
-/// Map a platform string to its architecture
-pub fn platform_to_arch(platform: &str) -> &str {
-    if let Some(arch) = platform.strip_suffix("-nonfree") {
-        return arch;
-    }
-    match platform {
-        "raspberrypi" | "rockchip64" => "aarch64",
-        _ => platform,
-    }
-}
-
 mod cap {
     #![allow(non_upper_case_globals)]
 
@@ -110,7 +97,6 @@ use crate::util::serde::{HandlerExtSerde, WithIoFormat, display_serializable};
 #[command(rename_all = "kebab-case")]
 #[ts(export)]
 pub struct EchoParams {
-    #[arg(help = "help.arg.echo-message")]
     message: String,
 }
 
@@ -136,63 +122,80 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
     let mut api = ParentHandler::new()
         .subcommand(
             "git-info",
-            from_fn(|_: C| version::git_info()).with_about("about.display-githash"),
+            from_fn(|_: C| 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("about.echo-message")
+                .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("about.display-current-api")
+                .with_about("Display the API that is currently serving")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: InitContext| Ok::<_, Error>(ApiState::Initializing))
                 .with_metadata("authenticated", Value::Bool(false))
-                .with_about("about.display-current-api")
+                .with_about("Display the API that is currently serving")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "state",
             from_fn(|_: DiagnosticContext| Ok::<_, Error>(ApiState::Error))
                 .with_metadata("authenticated", Value::Bool(false))
-                .with_about("about.display-current-api")
+                .with_about("Display the API that is currently serving")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("server", server::<C>().with_about("about.commands-server"))
+        .subcommand(
+            "server",
+            server::<C>()
+                .with_about("Commands related to the server i.e. restart, update, and shutdown"),
+        )
         .subcommand(
             "package",
-            package::<C>().with_about("about.commands-packages"),
+            package::<C>().with_about("Commands related to packages"),
         )
         .subcommand(
             "net",
-            net::net_api::<C>().with_about("about.network-commands"),
+            net::net_api::<C>().with_about("Network commands related to tor and dhcp"),
         )
         .subcommand(
             "auth",
-            auth::auth::<C, RpcContext>().with_about("about.commands-authentication"),
+            auth::auth::<C, RpcContext>()
+                .with_about("Commands related to Authentication i.e. login, logout"),
+        )
+        .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("db", db::db::<C>().with_about("about.commands-db"))
-        .subcommand("ssh", ssh::ssh::<C>().with_about("about.commands-ssh-keys"))
         .subcommand(
             "wifi",
-            net::wifi::wifi::<C>().with_about("about.commands-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("disk", disk::disk::<C>().with_about("about.commands-disk"))
         .subcommand(
             "notification",
-            notifications::notification::<C>().with_about("about.commands-notifications"),
+            notifications::notification::<C>().with_about("Create, delete, or list notifications"),
         )
         .subcommand(
             "backup",
-            backup::backup::<C>().with_about("about.commands-backup"),
+            backup::backup::<C>()
+                .with_about("Commands related to backup creation and backup targets"),
         )
         .subcommand(
             "registry",
@@ -203,7 +206,7 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "registry",
-            registry::registry_api::<CliContext>().with_about("about.commands-registry"),
+            registry::registry_api::<CliContext>().with_about("Commands related to the registry"),
         )
         .subcommand(
             "tunnel",
@@ -212,46 +215,41 @@ pub fn main_api<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "tunnel",
-            tunnel::api::tunnel_api::<CliContext>().with_about("about.commands-tunnel"),
+            tunnel::api::tunnel_api::<CliContext>().with_about("Commands related to StartTunnel"),
+        )
+        .subcommand(
+            "s9pk",
+            s9pk::rpc::s9pk().with_about("Commands for interacting with s9pk files"),
         )
-        .subcommand("s9pk", s9pk::rpc::s9pk().with_about("about.commands-s9pk"))
         .subcommand(
             "util",
-            util::rpc::util::<C>().with_about("about.command-blake3-hash"),
+            util::rpc::util::<C>().with_about("Command for calculating the blake3 hash of a file"),
         )
         .subcommand(
             "init-key",
             from_fn_async(developer::init)
                 .no_display()
-                .with_about("about.create-developer-key"),
+                .with_about("Create developer key if it doesn't exist"),
         )
         .subcommand(
             "pubkey",
-            from_fn_blocking(developer::pubkey).with_about("about.get-developer-pubkey"),
+            from_fn_blocking(developer::pubkey)
+                .with_about("Get public key for developer private key"),
         )
         .subcommand(
             "diagnostic",
-            diagnostic::diagnostic::<C>().with_about("about.commands-diagnostic"),
+            diagnostic::diagnostic::<C>()
+                .with_about("Commands to display logs, restart the server, etc"),
         )
+        .subcommand("init", init::init_api::<C>())
+        .subcommand("setup", setup::setup::<C>())
         .subcommand(
-            "init",
-            init::init_api::<C>().with_about("about.commands-init"),
-        )
-        .subcommand(
-            "setup",
-            setup::setup::<C>().with_about("about.commands-setup"),
+            "install",
+            os_install::install::<C>()
+                .with_about("Commands to list disk info, install StartOS, and reboot"),
         );
     if &*PLATFORM != "raspberrypi" {
-        api = api.subcommand("kiosk", kiosk::<C>().with_about("about.commands-kiosk"));
-    }
-    #[cfg(target_os = "linux")]
-    {
-        api = api.subcommand(
-            "flash-os",
-            from_fn_async(os_install::cli_install_os)
-                .no_display()
-                .with_about("about.flash-startos"),
-        );
+        api = api.subcommand("kiosk", kiosk::<C>());
     }
     api
 }
@@ -265,32 +263,29 @@ pub fn server<C: Context>() -> ParentHandler<C> {
                 .with_custom_display_fn(|handle, result| {
                     system::display_time(handle.params, result)
                 })
-                .with_about("about.display-time-uptime")
-                .with_call_remote::<CliContext>(),
+                .with_about("Display current time and server uptime")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "experimental",
-            system::experimental::<C>().with_about("about.commands-experimental"),
+            system::experimental::<C>()
+                .with_about("Commands related to configuring experimental options such as zram and cpu governor"),
         )
         .subcommand(
             "logs",
-            system::logs::<RpcContext>().with_about("about.display-os-logs"),
+            system::logs::<RpcContext>().with_about("Display OS logs"),
         )
         .subcommand(
             "logs",
-            from_fn_async(logs::cli_logs::<RpcContext, Empty>)
-                .no_display()
-                .with_about("about.display-os-logs"),
+            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display().with_about("Display OS logs"),
         )
         .subcommand(
             "kernel-logs",
-            system::kernel_logs::<RpcContext>().with_about("about.display-kernel-logs"),
+            system::kernel_logs::<RpcContext>().with_about("Display Kernel logs"),
         )
         .subcommand(
             "kernel-logs",
-            from_fn_async(logs::cli_logs::<RpcContext, Empty>)
-                .no_display()
-                .with_about("about.display-kernel-logs"),
+            from_fn_async(logs::cli_logs::<RpcContext, Empty>).no_display().with_about("Display Kernel logs"),
         )
         .subcommand(
             "metrics",
@@ -298,31 +293,35 @@ pub fn server<C: Context>() -> ParentHandler<C> {
                 .root_handler(
                     from_fn_async(system::metrics)
                         .with_display_serializable()
-                        .with_about("about.display-server-metrics")
-                        .with_call_remote::<CliContext>(),
+                        .with_about("Display information about the server i.e. temperature, RAM, CPU, and disk usage")
+                        .with_call_remote::<CliContext>()
+                )
+                .subcommand(
+                    "follow", 
+                    from_fn_async(system::metrics_follow)
+                        .no_cli()
                 )
-                .subcommand("follow", from_fn_async(system::metrics_follow).no_cli()),
         )
         .subcommand(
             "shutdown",
             from_fn_async(shutdown::shutdown)
                 .no_display()
-                .with_about("about.shutdown-server")
-                .with_call_remote::<CliContext>(),
+                .with_about("Shutdown the server")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "restart",
             from_fn_async(shutdown::restart)
                 .no_display()
-                .with_about("about.restart-server")
-                .with_call_remote::<CliContext>(),
+                .with_about("Restart the server")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "rebuild",
             from_fn_async(shutdown::rebuild)
                 .no_display()
-                .with_about("about.teardown-rebuild-containers")
-                .with_call_remote::<CliContext>(),
+                .with_about("Teardown and rebuild service containers")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "update",
@@ -332,9 +331,7 @@ pub fn server<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "update",
-            from_fn_async(update::cli_update_system)
-                .no_display()
-                .with_about("about.check-update-startos"),
+            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",
@@ -349,55 +346,37 @@ pub fn server<C: Context>() -> ParentHandler<C> {
             .with_custom_display_fn(|_handle, result| {
                 Ok(firmware::display_firmware_update_result(result))
             })
-            .with_about("about.update-firmware")
-            .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_about("about.set-smtp")
-                .with_call_remote::<CliContext>(),
+                .with_about("Set system smtp server and credentials")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
-            "test-smtp",
+            "test-smtp", 
             from_fn_async(system::test_smtp)
                 .no_display()
-                .with_about("about.test-smtp")
-                .with_call_remote::<CliContext>(),
+                .with_about("Send test email using provided smtp server and credentials")
+                .with_call_remote::<CliContext>()
         )
         .subcommand(
             "clear-smtp",
             from_fn_async(system::clear_system_smtp)
                 .no_display()
-                .with_about("about.clear-smtp")
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "host",
-            net::host::server_host_api::<C>().with_about("about.commands-host-system-ui"),
-        )
-        .subcommand(
-            "set-keyboard",
-            from_fn_async(system::set_keyboard)
-                .no_display()
-                .with_about("about.set-keyboard")
-                .with_call_remote::<CliContext>(),
-        )
-        .subcommand(
-            "set-language",
-            from_fn_async(system::set_language)
-                .no_display()
-                .with_about("about.set-language")
-                .with_call_remote::<CliContext>(),
-        )
+                .with_about("Remove system smtp server and credentials")
+                .with_call_remote::<CliContext>()
+        ).subcommand("host", net::host::server_host_api::<C>().with_about("Commands for modifying the host for the system ui"))
 }
 
 pub fn package<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "action",
-            action::action_api::<C>().with_about("about.commands-action"),
+            action::action_api::<C>().with_about("Commands to get action input or run an action"),
         )
         .subcommand(
             "install",
@@ -415,13 +394,13 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             "install",
             from_fn_async_local(install::cli_install)
                 .no_display()
-                .with_about("about.install-package"),
+                .with_about("Install a package from a marketplace or via sideloading"),
         )
         .subcommand(
             "cancel-install",
             from_fn(install::cancel_install)
                 .no_display()
-                .with_about("about.cancel-install-package")
+                .with_about("Cancel an install of a package")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -429,21 +408,21 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(install::uninstall)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.remove-package")
+                .with_about("Remove a package")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "list",
             from_fn_async(install::list)
                 .with_display_serializable()
-                .with_about("about.list-installed-packages")
+                .with_about("List installed packages")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "installed-version",
             from_fn_async(install::installed_version)
                 .with_display_serializable()
-                .with_about("about.display-installed-version")
+                .with_about("Display installed version for a PackageId")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -451,7 +430,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::start)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.start-service")
+                .with_about("Start a service")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -459,7 +438,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::stop)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.stop-service")
+                .with_about("Stop a service")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -467,7 +446,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(control::restart)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.restart-service")
+                .with_about("Restart a service")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -475,7 +454,7 @@ pub fn package<C: Context>() -> ParentHandler<C> {
             from_fn_async(service::rebuild)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.rebuild-service-container")
+                .with_about("Rebuild service container")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -515,37 +494,35 @@ pub fn package<C: Context>() -> ParentHandler<C> {
                     table.print_tty(false)?;
                     Ok(())
                 })
-                .with_about("about.list-lxc-container-info")
+                .with_about("List information related to the lxc containers i.e. CPU, Memory, Disk")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand("logs", logs::package_logs())
         .subcommand(
             "logs",
-            logs::package_logs().with_about("about.display-package-logs"),
+            logs::package_logs().with_about("Display package logs"),
         )
         .subcommand(
             "logs",
             from_fn_async(logs::cli_logs::<RpcContext, logs::PackageIdParams>)
                 .no_display()
-                .with_about("about.display-package-logs"),
+                .with_about("Display package logs"),
         )
         .subcommand(
             "backup",
-            backup::package_backup::<C>().with_about("about.commands-restore-backup"),
+            backup::package_backup::<C>()
+                .with_about("Commands for restoring package(s) from backup"),
         )
         .subcommand(
             "attach",
             from_fn_async(service::attach)
                 .with_metadata("get_session", Value::Bool(true))
-                .with_about("about.execute-commands-container")
+                .with_about("Execute commands within a service container")
                 .no_cli(),
         )
-        .subcommand(
-            "attach",
-            from_fn_async_local(service::cli_attach).no_display(),
-        )
+        .subcommand("attach", from_fn_async(service::cli_attach).no_display())
         .subcommand(
             "host",
-            net::host::host_api::<C>().with_about("about.manage-network-hosts-package"),
+            net::host::host_api::<C>().with_about("Manage network hosts for a package"),
         )
 }

core/src/logs.rs

@@ -6,6 +6,7 @@ use std::str::FromStr;
 use std::time::{Duration, UNIX_EPOCH};
 
 use axum::extract::ws;
+use crate::util::net::WebSocket;
 use chrono::{DateTime, Utc};
 use clap::builder::ValueParserFactory;
 use clap::{Args, FromArgMatches, Parser};
@@ -30,7 +31,6 @@ use crate::context::{CliContext, RpcContext};
 use crate::error::ResultExt;
 use crate::prelude::*;
 use crate::rpc_continuations::{Guid, RpcContinuation, RpcContinuations};
-use crate::util::net::WebSocket;
 use crate::util::serde::Reversible;
 use crate::util::{FromStrParser, Invoke};
 
@@ -232,7 +232,6 @@ pub const SYSTEM_UNIT: &str = "startd";
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct PackageIdParams {
-    #[arg(help = "help.arg.package-id")]
     id: PackageId,
 }
 
@@ -328,24 +327,14 @@ pub struct LogsParams<Extra: FromArgMatches + Args = Empty> {
     #[command(flatten)]
     #[serde(flatten)]
     extra: Extra,
-    #[arg(short = 'l', long = "limit", help = "help.arg.log-limit")]
+    #[arg(short = 'l', long = "limit")]
     limit: Option<usize>,
-    #[arg(
-        short = 'c',
-        long = "cursor",
-        conflicts_with = "follow",
-        help = "help.arg.log-cursor"
-    )]
+    #[arg(short = 'c', long = "cursor", conflicts_with = "follow")]
     cursor: Option<String>,
-    #[arg(short = 'b', long = "boot", help = "help.arg.log-boot")]
+    #[arg(short = 'b', long = "boot")]
     #[serde(default)]
     boot: Option<BootIdentifier>,
-    #[arg(
-        short = 'B',
-        long = "before",
-        conflicts_with = "follow",
-        help = "help.arg.log-before"
-    )]
+    #[arg(short = 'B', long = "before", conflicts_with = "follow")]
     #[serde(default)]
     before: bool,
 }
@@ -357,7 +346,7 @@ pub struct CliLogsParams<Extra: FromArgMatches + Args = Empty> {
     #[command(flatten)]
     #[serde(flatten)]
     rpc_params: LogsParams<Extra>,
-    #[arg(short = 'f', long = "follow", help = "help.arg.log-follow")]
+    #[arg(short = 'f', long = "follow")]
     #[serde(default)]
     follow: bool,
 }
@@ -563,12 +552,10 @@ pub async fn journalctl(
             follow_cmd.arg("--lines=0");
         }
         let mut child = follow_cmd.stdout(Stdio::piped()).spawn()?;
-        let out = BufReader::new(child.stdout.take().ok_or_else(|| {
-            Error::new(
-                eyre!("{}", t!("logs.no-stdout-available")),
-                crate::ErrorKind::Journald,
-            )
-        })?);
+        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());
 
@@ -713,10 +700,7 @@ pub async fn follow_logs<Context: AsRef<RpcContinuations>>(
             RpcContinuation::ws(
                 move |socket| async move {
                     if let Err(e) = ws_handler(first_entry, stream, socket).await {
-                        tracing::error!(
-                            "{}",
-                            t!("logs.error-in-log-stream", error = e.to_string())
-                        );
+                        tracing::error!("Error in log stream: {}", e);
                     }
                 },
                 Duration::from_secs(30),

core/src/lxc/mod.rs

@@ -141,7 +141,7 @@ impl LxcManager {
                         > 0
                     {
                         return Err(Error::new(
-                            eyre!("{}", t!("lxc.mod.rootfs-not-empty")),
+                            eyre!("rootfs is not empty, refusing to delete"),
                             ErrorKind::InvalidRequest,
                         ));
                     }
@@ -249,7 +249,6 @@ impl LxcContainer {
                 .arg("-R")
                 .arg("+C")
                 .arg(&log_mount_point)
-                .env("LANG", "C.UTF-8")
                 .invoke(ErrorKind::Filesystem)
                 .await
             {
@@ -382,7 +381,7 @@ impl LxcContainer {
             }
             if start.elapsed() > CONTAINER_DHCP_TIMEOUT {
                 return Err(Error::new(
-                    eyre!("{}", t!("lxc.mod.dhcp-timeout")),
+                    eyre!("Timed out waiting for container to acquire DHCP lease"),
                     ErrorKind::Timeout,
                 ));
             }
@@ -408,12 +407,9 @@ impl LxcContainer {
         if !output.status.success() {
             return Err(Error::new(
                 eyre!(
-                    "{}",
-                    t!(
-                        "lxc.mod.command-failed",
-                        code = format!("{:?}", output.status.code()),
-                        message = format!("{:?}", String::from_utf8(output.stderr))
-                    )
+                    "Command failed with exit code: {:?} \n Message: {:?}",
+                    output.status.code(),
+                    String::from_utf8(output.stderr)
                 ),
                 ErrorKind::Docker,
             ));
@@ -441,7 +437,7 @@ impl LxcContainer {
                 > 0
         {
             return Err(Error::new(
-                eyre!("{}", t!("lxc.mod.rootfs-not-empty")),
+                eyre!("rootfs is not empty, refusing to delete"),
                 ErrorKind::InvalidRequest,
             ));
         }
@@ -477,19 +473,13 @@ impl LxcContainer {
                         .await
                 );
                 return Err(Error::new(
-                    eyre!("{}", t!("lxc.mod.socket-timeout")),
+                    eyre!("timed out waiting for socket"),
                     ErrorKind::Timeout,
                 ));
             }
             tokio::time::sleep(Duration::from_millis(100)).await;
         }
-        tracing::info!(
-            "{}",
-            t!(
-                "lxc.mod.connected-to-socket",
-                elapsed = format!("{:?}", started.elapsed())
-            )
-        );
+        tracing::info!("Connected to socket in {:?}", started.elapsed());
         Ok(UnixRpcClient::new(sock_path))
     }
 
@@ -579,11 +569,8 @@ impl Drop for LxcContainer {
     fn drop(&mut self) {
         if !self.exited {
             tracing::warn!(
-                "{}",
-                t!(
-                    "lxc.mod.container-ungracefully-dropped",
-                    container = &**self.guid
-                )
+                "Container {} was ungracefully dropped. Cleaning up dangling containers...",
+                &**self.guid
             );
             let rootfs = self.rootfs.take();
             let guid = std::mem::take(&mut self.guid);
@@ -602,25 +589,16 @@ impl Drop for LxcContainer {
                     }
                     .await
                     {
-                        tracing::error!(
-                            "{}",
-                            t!("lxc.mod.error-reading-crashed-logs", error = e.to_string())
-                        );
+                        tracing::error!("Error reading logs from crashed container: {e}");
                         tracing::debug!("{e:?}")
                     }
                     rootfs.unmount(true).await.log_err();
                     drop(guid);
                     if let Err(e) = manager.gc().await {
-                        tracing::error!(
-                            "{}",
-                            t!(
-                                "lxc.mod.error-cleaning-up-containers",
-                                error = e.to_string()
-                            )
-                        );
+                        tracing::error!("Error cleaning up dangling LXC containers: {e}");
                         tracing::debug!("{e:?}")
                     } else {
-                        tracing::info!("{}", t!("lxc.mod.cleaned-up-containers"));
+                        tracing::info!("Successfully cleaned up dangling LXC containers");
                     }
                 });
             }

core/src/main/startbox.rs

@@ -11,6 +11,11 @@ fn main() {
             "$CARGO_MANIFEST_DIR/../web/dist/static/setup-wizard"
         ))
         .ok();
+    startos::net::static_server::INSTALL_WIZARD_CELL
+        .set(include_dir::include_dir!(
+            "$CARGO_MANIFEST_DIR/../web/dist/static/install-wizard"
+        ))
+        .ok();
     #[cfg(not(feature = "beta"))]
     startos::db::model::public::DB_UI_SEED_CELL
         .set(include_str!(concat!(

core/src/middleware/auth/local.rs

@@ -40,10 +40,7 @@ impl LocalAuthContext for RpcContext {
 }
 
 fn unauthorized() -> Error {
-    Error::new(
-        eyre!("{}", t!("middleware.auth.unauthorized")),
-        crate::ErrorKind::Authorization,
-    )
+    Error::new(eyre!("UNAUTHORIZED"), crate::ErrorKind::Authorization)
 }
 
 async fn check_from_header<C: LocalAuthContext>(header: Option<&HeaderValue>) -> Result<(), Error> {

core/src/middleware/auth/session.rs

@@ -146,7 +146,7 @@ impl HashSessionToken {
             }
         }
         Err(Error::new(
-            eyre!("{}", t!("middleware.auth.unauthorized")),
+            eyre!("UNAUTHORIZED"),
             crate::ErrorKind::Authorization,
         ))
     }
@@ -221,7 +221,7 @@ impl ValidSessionToken {
             }
         }
         Err(Error::new(
-            eyre!("{}", t!("middleware.auth.unauthorized")),
+            eyre!("UNAUTHORIZED"),
             crate::ErrorKind::Authorization,
         ))
     }
@@ -244,10 +244,7 @@ impl ValidSessionToken {
                     C::access_sessions(db)
                         .as_idx_mut(session_hash)
                         .ok_or_else(|| {
-                            Error::new(
-                                eyre!("{}", t!("middleware.auth.unauthorized")),
-                                crate::ErrorKind::Authorization,
-                            )
+                            Error::new(eyre!("UNAUTHORIZED"), crate::ErrorKind::Authorization)
                         })?
                         .mutate(|s| {
                             s.last_active = Utc::now();
@@ -308,7 +305,7 @@ impl<C: SessionAuthContext> Middleware<C> for SessionAuth {
                 self.rate_limiter.mutate(|(count, time)| {
                     if time.elapsed() < Duration::from_secs(20) && *count >= 3 {
                         Err(Error::new(
-                            eyre!("{}", t!("middleware.auth.rate-limited-login")),
+                            eyre!("Please limit login attempts to 3 per 20 seconds."),
                             crate::ErrorKind::RateLimited,
                         ))
                     } else {

core/src/middleware/auth/signature.rs

@@ -90,7 +90,7 @@ impl SignatureAuthContext for RpcContext {
         }
 
         Err(Error::new(
-            eyre!("{}", t!("middleware.auth.key-not-authorized")),
+            eyre!("Key is not authorized"),
             ErrorKind::IncorrectPassword,
         ))
     }
@@ -141,7 +141,7 @@ impl SignatureAuth {
         let mut cache = self.nonce_cache.lock().await;
         if cache.values().any(|n| *n == nonce) {
             return Err(Error::new(
-                eyre!("{}", t!("middleware.auth.replay-attack-detected")),
+                eyre!("replay attack detected"),
                 ErrorKind::Authorization,
             ));
         }
@@ -226,7 +226,7 @@ impl<C: SignatureAuthContext> Middleware<C> for SignatureAuth {
 
                     context.sig_context().await.into_iter().fold(
                         Err(Error::new(
-                            eyre!("{}", t!("middleware.auth.no-valid-sig-context")),
+                            eyre!("no valid signature context available to verify"),
                             ErrorKind::Authorization,
                         )),
                         |acc, x| {
@@ -249,7 +249,7 @@ impl<C: SignatureAuthContext> Middleware<C> for SignatureAuth {
                         .unwrap_or_else(|e| e.duration().as_secs() as i64 * -1);
                     if (now - commitment.timestamp).abs() > 30 {
                         return Err(Error::new(
-                            eyre!("{}", t!("middleware.auth.timestamp-not-within-30s")),
+                            eyre!("timestamp not within 30s of now"),
                             ErrorKind::InvalidSignature,
                         ));
                     }
@@ -347,10 +347,6 @@ pub async fn call_remote<Ctx: SigningContext + AsRef<Client>>(
                 .with_kind(ErrorKind::Deserialization)?
                 .result
         }
-        _ => Err(Error::new(
-            eyre!("{}", t!("middleware.auth.unknown-content-type")),
-            ErrorKind::Network,
-        )
-        .into()),
+        _ => Err(Error::new(eyre!("unknown content type"), ErrorKind::Network).into()),
     }
 }

core/src/middleware/db.rs

@@ -2,7 +2,6 @@ use axum::response::Response;
 use http::HeaderValue;
 use http::header::InvalidHeaderValue;
 use rpc_toolkit::{Middleware, RpcRequest, RpcResponse};
-use rust_i18n::t;
 use serde::Deserialize;
 
 use crate::context::RpcContext;
@@ -47,13 +46,7 @@ impl Middleware<RpcContext> for SyncDb {
         }
         .await
         {
-            tracing::error!(
-                "{}",
-                t!(
-                    "middleware.db.error-writing-patch-sequence-header",
-                    error = e
-                )
-            );
+            tracing::error!("error writing X-Patch-Sequence header: {e}");
             tracing::debug!("{e:?}");
         }
     }

core/src/net/acme.rs

@@ -395,7 +395,7 @@ pub fn acme_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(init)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.setup-acme-certificate-acquisition")
+                .with_about("Setup ACME certificate acquisition")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -403,7 +403,7 @@ pub fn acme_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(remove)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.remove-acme-certificate-acquisition-configuration")
+                .with_about("Remove ACME certificate acquisition configuration")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -463,9 +463,9 @@ impl ValueParserFactory for AcmeProvider {
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct InitAcmeParams {
-    #[arg(long, help = "help.arg.acme-provider")]
+    #[arg(long)]
     pub provider: AcmeProvider,
-    #[arg(long, help = "help.arg.acme-contact")]
+    #[arg(long)]
     pub contact: Vec<String>,
 }
 
@@ -488,7 +488,7 @@ pub async fn init(
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct RemoveAcmeParams {
-    #[arg(long, help = "help.arg.acme-provider")]
+    #[arg(long)]
     pub provider: AcmeProvider,
 }
 

core/src/net/dns.rs

@@ -54,13 +54,13 @@ pub fn dns_api<C: Context>() -> ParentHandler<C> {
 
                     Ok(())
                 })
-                .with_about("about.test-dns-configuration-for-domain"),
+                .with_about("Test the DNS configuration for a domain"),
         )
         .subcommand(
             "set-static",
             from_fn_async(set_static_dns)
                 .no_display()
-                .with_about("about.set-static-dns-servers")
+                .with_about("Set static DNS servers")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -88,14 +88,13 @@ pub fn dns_api<C: Context>() -> ParentHandler<C> {
 
                     Ok(())
                 })
-                .with_about("about.dump-address-resolution-table")
+                .with_about("Dump address resolution table")
                 .with_call_remote::<CliContext>(),
         )
 }
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct QueryDnsParams {
-    #[arg(help = "help.arg.fqdn")]
     pub fqdn: InternedString,
 }
 
@@ -135,7 +134,6 @@ pub fn query_dns<C: Context>(
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct SetStaticDnsParams {
-    #[arg(help = "help.arg.dns-servers")]
     pub servers: Option<Vec<String>>,
 }
 
@@ -294,7 +292,7 @@ impl Resolver {
                                     .await
                                     .map_err(|_| {
                                         Error::new(
-                                            eyre!("{}", t!("net.dns.timeout-updating-catalog")),
+                                            eyre!("timed out waiting to update dns catalog"),
                                             ErrorKind::Timeout,
                                         )
                                     })?;
@@ -350,13 +348,7 @@ impl Resolver {
                 }) {
                     return Some(res);
                 } else {
-                    tracing::warn!(
-                        "{}",
-                        t!(
-                            "net.dns.could-not-determine-source-interface",
-                            src = src.to_string()
-                        )
-                    );
+                    tracing::warn!("Could not determine source interface of {src}");
                 }
             }
             if STARTOS.zone_of(name) || EMBASSY.zone_of(name) {
@@ -481,10 +473,7 @@ impl RequestHandler for Resolver {
             Ok(Some(a)) => return a,
             Ok(None) => (),
             Err(e) => {
-                tracing::error!(
-                    "{}",
-                    t!("net.dns.error-resolving-internal", error = e.to_string())
-                );
+                tracing::error!("Error resolving internal DNS: {e}");
                 tracing::debug!("{e:?}");
                 let mut header = Header::response_from_request(request.header());
                 header.set_recursion_available(true);
@@ -568,7 +557,7 @@ impl DnsController {
             })
         } else {
             Err(Error::new(
-                eyre!("{}", t!("net.dns.server-thread-exited")),
+                eyre!("DNS Server Thread has exited"),
                 crate::ErrorKind::Network,
             ))
         }
@@ -588,7 +577,7 @@ impl DnsController {
             })
         } else {
             Err(Error::new(
-                eyre!("{}", t!("net.dns.server-thread-exited")),
+                eyre!("DNS Server Thread has exited"),
                 crate::ErrorKind::Network,
             ))
         }
@@ -609,7 +598,7 @@ impl DnsController {
             })
         } else {
             Err(Error::new(
-                eyre!("{}", t!("net.dns.server-thread-exited")),
+                eyre!("DNS Server Thread has exited"),
                 crate::ErrorKind::Network,
             ))
         }
@@ -635,7 +624,7 @@ impl DnsController {
             })
         } else {
             Err(Error::new(
-                eyre!("{}", t!("net.dns.server-thread-exited")),
+                eyre!("DNS Server Thread has exited"),
                 crate::ErrorKind::Network,
             ))
         }

core/src/net/forward.rs

@@ -34,7 +34,7 @@ impl AvailablePorts {
     pub fn alloc(&mut self) -> Result<u16, Error> {
         self.0.request_id().ok_or_else(|| {
             Error::new(
-                eyre!("{}", t!("net.forward.no-dynamic-ports-available")),
+                eyre!("No more dynamic ports available!"),
                 ErrorKind::Network,
             )
         })
@@ -240,13 +240,7 @@ impl PortForwardController {
             }
             .await
             {
-                tracing::error!(
-                    "{}",
-                    t!(
-                        "net.forward.error-initializing-controller",
-                        error = format!("{e:#}")
-                    )
-                );
+                tracing::error!("error initializing PortForwardController: {e:#}");
                 tracing::debug!("{e:?}");
                 tokio::time::sleep(Duration::from_secs(5)).await;
             }
@@ -406,7 +400,7 @@ impl InterfaceForwardEntry {
     ) -> Result<Arc<()>, Error> {
         if external != self.external {
             return Err(Error::new(
-                eyre!("{}", t!("net.forward.mismatched-external-port")),
+                eyre!("Mismatched external port in InterfaceForwardEntry"),
                 ErrorKind::InvalidRequest,
             ));
         }
@@ -483,7 +477,7 @@ impl InterfaceForwardState {
 
 fn err_has_exited<T>(_: T) -> Error {
     Error::new(
-        eyre!("{}", t!("net.forward.controller-thread-exited")),
+        eyre!("PortForwardController thread has exited"),
         ErrorKind::Unknown,
     )
 }

core/src/net/gateway.rs

@@ -95,7 +95,7 @@ pub fn gateway_api<C: Context>() -> ParentHandler<C> {
 
                     Ok(())
                 })
-                .with_about("about.show-gateways-startos-can-listen-on")
+                .with_about("Show gateways StartOS can listen on")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -103,7 +103,7 @@ pub fn gateway_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(set_public)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.indicate-gateway-inbound-access-from-wan")
+                .with_about("Indicate whether this gateway has inbound access from the WAN")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -111,7 +111,10 @@ pub fn gateway_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(unset_public)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.allow-gateway-infer-inbound-access-from-wan")
+                .with_about(concat!(
+                    "Allow this gateway to infer whether it has",
+                    " inbound access from the WAN based on its IPv4 address"
+                ))
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -119,7 +122,7 @@ pub fn gateway_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(forget_iface)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.forget-disconnected-gateway")
+                .with_about("Forget a disconnected gateway")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -127,7 +130,7 @@ pub fn gateway_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(set_name)
                 .with_metadata("sync_db", Value::Bool(true))
                 .no_display()
-                .with_about("about.rename-gateway")
+                .with_about("Rename a gateway")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -140,9 +143,7 @@ async fn list_interfaces(
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 struct NetworkInterfaceSetPublicParams {
-    #[arg(help = "help.arg.gateway-id")]
     gateway: GatewayId,
-    #[arg(help = "help.arg.is-public")]
     public: Option<bool>,
 }
 
@@ -158,7 +159,6 @@ async fn set_public(
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 struct UnsetPublicParams {
-    #[arg(help = "help.arg.gateway-id")]
     gateway: GatewayId,
 }
 
@@ -174,7 +174,6 @@ async fn unset_public(
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 struct ForgetGatewayParams {
-    #[arg(help = "help.arg.gateway-id")]
     gateway: GatewayId,
 }
 
@@ -187,9 +186,7 @@ async fn forget_iface(
 
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 struct RenameGatewayParams {
-    #[arg(help = "help.arg.gateway-id")]
     id: GatewayId,
-    #[arg(help = "help.arg.gateway-name")]
     name: InternedString,
 }
 
@@ -467,8 +464,7 @@ async fn watcher(
                         ensure_code!(
                             !devices.is_empty(),
                             ErrorKind::Network,
-                            "{}",
-                            t!("net.gateway.no-devices-returned")
+                            "NetworkManager returned no devices. Trying again..."
                         );
                         let mut ifaces = BTreeSet::new();
                         let mut jobs = Vec::new();
@@ -735,8 +731,7 @@ async fn watch_ip(
                                                 Ok(a) => a,
                                                 Err(e) => {
                                                     tracing::error!(
-                                                    "{}",
-                                                    t!("net.gateway.failed-to-determine-wan-ip", iface = iface.to_string(), error = e.to_string())
+                                                    "Failed to determine WAN IP for {iface}: {e}"
                                                 );
                                                     tracing::debug!("{e:?}");
                                                     None
@@ -1026,13 +1021,7 @@ impl NetworkInterfaceController {
                             info
                         }
                         Err(e) => {
-                            tracing::error!(
-                                "{}",
-                                t!(
-                                    "net.gateway.error-loading-interface-info",
-                                    error = e.to_string()
-                                )
-                            );
+                            tracing::error!("Error loading network interface info: {e}");
                             tracing::debug!("{e:?}");
                             OrdMap::new()
                         }
@@ -1061,10 +1050,7 @@ impl NetworkInterfaceController {
                         }
                         .await
                         {
-                            tracing::error!(
-                                "{}",
-                                t!("net.gateway.error-syncing-ip-info", error = e.to_string())
-                            );
+                            tracing::error!("Error syncing ip info to db: {e}");
                             tracing::debug!("{e:?}");
                         }
 
@@ -1074,10 +1060,7 @@ impl NetworkInterfaceController {
                 }
                 .await;
                 if let Err(e) = res {
-                    tracing::error!(
-                        "{}",
-                        t!("net.gateway.error-syncing-ip-info", error = e.to_string())
-                    );
+                    tracing::error!("Error syncing ip info to db: {e}");
                     tracing::debug!("{e:?}");
                 }
             })
@@ -1138,7 +1121,7 @@ impl NetworkInterfaceController {
                 .map_or(false, |i| i.ip_info.is_some())
             {
                 err = Some(Error::new(
-                    eyre!("{}", t!("net.gateway.cannot-forget-connected-interface")),
+                    eyre!("Cannot forget currently connected interface"),
                     ErrorKind::InvalidRequest,
                 ));
                 return false;
@@ -1184,7 +1167,7 @@ impl NetworkInterfaceController {
 
             if &*ac == "/" {
                 return Err(Error::new(
-                    eyre!("{}", t!("net.gateway.cannot-delete-without-connection")),
+                    eyre!("Cannot delete device without active connection"),
                     ErrorKind::InvalidRequest,
                 ));
             }

core/src/net/host/address.rs

@@ -120,7 +120,7 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
                                 .with_metadata("sync_db", Value::Bool(true))
                                 .with_inherited(|_, a| a)
                                 .no_display()
-                                .with_about("about.add-public-domain-to-host")
+                                .with_about("Add a public domain to this host")
                                 .with_call_remote::<CliContext>(),
                         )
                         .subcommand(
@@ -129,7 +129,7 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
                                 .with_metadata("sync_db", Value::Bool(true))
                                 .with_inherited(|_, a| a)
                                 .no_display()
-                                .with_about("about.remove-public-domain-from-host")
+                                .with_about("Remove a public domain from this host")
                                 .with_call_remote::<CliContext>(),
                         )
                         .with_inherited(|_, a| a),
@@ -143,7 +143,7 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
                                 .with_metadata("sync_db", Value::Bool(true))
                                 .with_inherited(|_, a| a)
                                 .no_display()
-                                .with_about("about.add-private-domain-to-host")
+                                .with_about("Add a private domain to this host")
                                 .with_call_remote::<CliContext>(),
                         )
                         .subcommand(
@@ -152,7 +152,7 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
                                 .with_metadata("sync_db", Value::Bool(true))
                                 .with_inherited(|_, a| a)
                                 .no_display()
-                                .with_about("about.remove-private-domain-from-host")
+                                .with_about("Remove a private domain from this host")
                                 .with_call_remote::<CliContext>(),
                         )
                         .with_inherited(|_, a| a),
@@ -168,7 +168,7 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
                         .with_metadata("sync_db", Value::Bool(true))
                         .with_inherited(|_, a| a)
                         .no_display()
-                        .with_about("about.add-address-to-host")
+                        .with_about("Add an address to this host")
                         .with_call_remote::<CliContext>(),
                 )
                 .subcommand(
@@ -177,7 +177,7 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
                         .with_metadata("sync_db", Value::Bool(true))
                         .with_inherited(|_, a| a)
                         .no_display()
-                        .with_about("about.remove-address-from-host")
+                        .with_about("Remove an address from this host")
                         .with_call_remote::<CliContext>(),
                 )
                 .with_inherited(Kind::inheritance),
@@ -230,18 +230,16 @@ pub fn address_api<C: Context, Kind: HostApiKind>()
 
                     Ok(())
                 })
-                .with_about("about.list-addresses-for-host")
+                .with_about("List addresses for this host")
                 .with_call_remote::<CliContext>(),
         )
 }
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct AddPublicDomainParams {
-    #[arg(help = "help.arg.fqdn")]
     pub fqdn: InternedString,
-    #[arg(long, help = "help.arg.acme-provider")]
+    #[arg(long)]
     pub acme: Option<AcmeProvider>,
-    #[arg(help = "help.arg.gateway-id")]
     pub gateway: GatewayId,
 }
 
@@ -286,7 +284,6 @@ pub async fn add_public_domain<Kind: HostApiKind>(
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct RemoveDomainParams {
-    #[arg(help = "help.arg.fqdn")]
     pub fqdn: InternedString,
 }
 
@@ -310,7 +307,6 @@ pub async fn remove_public_domain<Kind: HostApiKind>(
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct AddPrivateDomainParams {
-    #[arg(help = "help.arg.fqdn")]
     pub fqdn: InternedString,
 }
 
@@ -353,7 +349,6 @@ pub async fn remove_private_domain<Kind: HostApiKind>(
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct OnionParams {
-    #[arg(help = "help.arg.onion-address")]
     pub onion: String,
 }
 

core/src/net/host/binding.rs

@@ -209,7 +209,7 @@ pub fn binding<C: Context, Kind: HostApiKind>()
 
                     Ok(())
                 })
-                .with_about("about.list-bindings-for-host")
+                .with_about("List bindinges for this host")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -218,7 +218,7 @@ pub fn binding<C: Context, Kind: HostApiKind>()
                 .with_metadata("sync_db", Value::Bool(true))
                 .with_inherited(Kind::inheritance)
                 .no_display()
-                .with_about("about.set-gateway-enabled-for-binding")
+                .with_about("Set whether this gateway should be enabled for this binding")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -237,11 +237,9 @@ pub async fn list_bindings<Kind: HostApiKind>(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct BindingGatewaySetEnabledParams {
-    #[arg(help = "help.arg.internal-port")]
     internal_port: u16,
-    #[arg(help = "help.arg.gateway-id")]
     gateway: GatewayId,
-    #[arg(long, help = "help.arg.binding-enabled")]
+    #[arg(long)]
     enabled: Option<bool>,
 }
 

core/src/net/host/mod.rs

@@ -166,13 +166,11 @@ impl Model<Host> {
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct RequiresPackageId {
-    #[arg(help = "help.arg.package-id")]
     package: PackageId,
 }
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct RequiresHostId {
-    #[arg(help = "help.arg.host-id")]
     host: HostId,
 }
 
@@ -245,7 +243,7 @@ pub fn host_api<C: Context>() -> ParentHandler<C, RequiresPackageId> {
                     }
                     Ok(())
                 })
-                .with_about("about.list-host-ids-for-service"),
+                .with_about("List host IDs available for this service"),
         )
         .subcommand(
             "address",

core/src/net/mod.rs

@@ -23,29 +23,32 @@ pub mod wifi;
 
 pub fn net_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
-        .subcommand("tor", tor::tor_api::<C>().with_about("about.tor-commands"))
+        .subcommand(
+            "tor",
+            tor::tor_api::<C>().with_about("Tor commands such as list-services, logs, and reset"),
+        )
         .subcommand(
             "acme",
-            acme::acme_api::<C>().with_about("about.setup-acme-certificate"),
+            acme::acme_api::<C>().with_about("Setup automatic clearnet certificate acquisition"),
         )
         .subcommand(
             "dns",
-            dns::dns_api::<C>().with_about("about.manage-query-dns"),
+            dns::dns_api::<C>().with_about("Manage and query DNS"),
         )
         .subcommand(
             "forward",
-            forward::forward_api::<C>().with_about("about.manage-port-forwards"),
+            forward::forward_api::<C>().with_about("Manage port forwards"),
         )
         .subcommand(
             "gateway",
-            gateway::gateway_api::<C>().with_about("about.view-edit-gateway-configs"),
+            gateway::gateway_api::<C>().with_about("View and edit gateway configurations"),
         )
         .subcommand(
             "tunnel",
-            tunnel::tunnel_api::<C>().with_about("about.manage-tunnels"),
+            tunnel::tunnel_api::<C>().with_about("Manage tunnels"),
         )
         .subcommand(
             "vhost",
-            vhost::vhost_api::<C>().with_about("about.manage-ssl-vhost-proxy"),
+            vhost::vhost_api::<C>().with_about("Manage ssl virtual host proxy"),
         )
 }

core/src/net/ssl.rs

@@ -170,7 +170,7 @@ impl FullchainCertData {
         ]
         .into_iter()
         .min()
-        .ok_or_else(|| Error::new(eyre!("{}", t!("net.ssl.unreachable")), ErrorKind::Unknown))
+        .ok_or_else(|| Error::new(eyre!("unreachable"), ErrorKind::Unknown))
     }
 }
 

core/src/net/static_server.rs

@@ -30,7 +30,7 @@ use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeekExt, BufReader};
 use tokio_util::io::ReaderStream;
 use url::Url;
 
-use crate::context::{DiagnosticContext, InitContext, RpcContext, SetupContext};
+use crate::context::{DiagnosticContext, InitContext, InstallContext, RpcContext, SetupContext};
 use crate::hostname::Hostname;
 use crate::middleware::auth::Auth;
 use crate::middleware::auth::session::ValidSessionToken;
@@ -178,6 +178,20 @@ impl UiContext for SetupContext {
     }
 }
 
+pub static INSTALL_WIZARD_CELL: OnceLock<Dir<'static>> = OnceLock::new();
+
+impl UiContext for InstallContext {
+    fn ui_dir() -> &'static Dir<'static> {
+        INSTALL_WIZARD_CELL.get().unwrap_or(&EMPTY_DIR)
+    }
+    fn api() -> ParentHandler<Self> {
+        main_api()
+    }
+    fn middleware(server: Server<Self>) -> HttpServer<Self> {
+        server.middleware(Cors::new())
+    }
+}
+
 pub fn rpc_router<C: Context + Clone + AsRef<RpcContinuations>>(
     ctx: C,
     server: HttpServer<C>,

core/src/net/tls.rs

@@ -171,13 +171,16 @@ where
             let mut tls_handler = self.tls_handler.clone();
             let mut fut = async move {
                 let res = async {
-                    let mut acceptor =
-                        LazyConfigAcceptor::new(Acceptor::default(), BackTrackingIO::new(stream));
+                    let mut acceptor = LazyConfigAcceptor::new(
+                        Acceptor::default(),
+                        BackTrackingIO::new(stream),
+                    );
                     let mut mid: tokio_rustls::StartHandshake<BackTrackingIO<AcceptStream>> =
                         match (&mut acceptor).await {
                             Ok(a) => a,
                             Err(e) => {
-                                let mut stream = acceptor.take_io().or_not_found("acceptor io")?;
+                                let mut stream =
+                                    acceptor.take_io().or_not_found("acceptor io")?;
                                 let (_, buf) = stream.rewind();
                                 if std::str::from_utf8(buf)
                                     .ok()

core/src/net/tor/arti.rs

@@ -107,10 +107,7 @@ impl TorSecretKey {
         Ok(Self(
             tor_llcrypto::pk::ed25519::ExpandedKeypair::from_secret_key_bytes(bytes)
                 .ok_or_else(|| {
-                    Error::new(
-                        eyre!("{}", t!("net.tor.invalid-ed25519-key")),
-                        ErrorKind::Tor,
-                    )
+                    Error::new(eyre!("invalid ed25519 expanded secret key"), ErrorKind::Tor)
                 })?
                 .into(),
         ))
@@ -229,19 +226,19 @@ pub fn tor_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(list_services)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| display_services(handle.params, result))
-                .with_about("about.display-tor-v3-onion-addresses")
+                .with_about("Display Tor V3 Onion Addresses")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "reset",
             from_fn_async(reset)
                 .no_display()
-                .with_about("about.reset-tor-daemon")
+                .with_about("Reset Tor daemon")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "key",
-            key::<C>().with_about("about.manage-onion-service-key-store"),
+            key::<C>().with_about("Manage the onion service key store"),
         )
 }
 
@@ -250,13 +247,13 @@ pub fn key<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "generate",
             from_fn_async(generate_key)
-                .with_about("about.generate-onion-service-key-add-to-store")
+                .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("about.add-onion-service-key-to-store")
+                .with_about("Add an onion service key to the key store")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -268,7 +265,7 @@ pub fn key<C: Context>() -> ParentHandler<C> {
                     }
                     Ok(())
                 })
-                .with_about("about.list-onion-services-with-keys-in-store")
+                .with_about("List onion services with keys in the key store")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -289,7 +286,6 @@ pub async fn generate_key(ctx: RpcContext) -> Result<OnionAddress, Error> {
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct AddKeyParams {
-    #[arg(help = "help.arg.onion-secret-key")]
     pub key: Base64<[u8; 64]>,
 }
 
@@ -324,12 +320,7 @@ pub async fn list_keys(ctx: RpcContext) -> Result<BTreeSet<OnionAddress>, Error>
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ResetParams {
-    #[arg(
-        name = "wipe-state",
-        short = 'w',
-        long = "wipe-state",
-        help = "help.arg.wipe-tor-state"
-    )]
+    #[arg(name = "wipe-state", short = 'w', long = "wipe-state")]
     wipe_state: bool,
 }
 
@@ -456,13 +447,9 @@ impl TorController {
                                     if prev_inst.elapsed() > BOOTSTRAP_PROGRESS_TIMEOUT {
                                         return Err(Error::new(
                                             eyre!(
-                                                "{}",
-                                                t!(
-                                                    "net.tor.bootstrap-no-progress",
-                                                    duration = crate::util::serde::Duration::from(
-                                                        BOOTSTRAP_PROGRESS_TIMEOUT
-                                                    )
-                                                    .to_string()
+                                                "Bootstrap has not made progress for {}",
+                                                crate::util::serde::Duration::from(
+                                                    BOOTSTRAP_PROGRESS_TIMEOUT
                                                 )
                                             ),
                                             ErrorKind::Tor,
@@ -479,10 +466,7 @@ impl TorController {
                             res = bootstrap_fut => res,
                             res = failure_fut => res,
                         } {
-                            tracing::error!(
-                                "{}",
-                                t!("net.tor.bootstrap-error", error = e.to_string())
-                            );
+                            tracing::error!("Tor Bootstrap Error: {e}");
                             tracing::debug!("{e:?}");
                         } else {
                             bootstrapper_client.send_modify(|_| ());
@@ -532,13 +516,7 @@ impl TorController {
                                                     }
                                                     .await
                                                     {
-                                                        tracing::error!(
-                                                            "{}",
-                                                            t!(
-                                                                "net.tor.health-error",
-                                                                error = e.to_string()
-                                                            )
-                                                        );
+                                                        tracing::error!("Tor Health Error: {e}");
                                                         tracing::debug!("{e:?}");
                                                     }
                                                 });
@@ -551,10 +529,7 @@ impl TorController {
                                                         }
                                                     }
                                                     Err(Error::new(
-                                                        eyre!(
-                                                            "{}",
-                                                            t!("net.tor.status-stream-ended")
-                                                        ),
+                                                        eyre!("status event stream ended"),
                                                         ErrorKind::Tor,
                                                     ))
                                                 })
@@ -585,19 +560,13 @@ impl TorController {
                                 }
                                 .await
                                 {
-                                    tracing::error!(
-                                        "{}",
-                                        t!("net.tor.client-health-error", error = e.to_string())
-                                    );
+                                    tracing::error!("Tor Client Health Error: {e}");
                                     tracing::debug!("{e:?}");
                                 }
                             }
                             tracing::error!(
-                                "{}",
-                                t!(
-                                    "net.tor.health-check-failed-recycling",
-                                    count = HEALTH_CHECK_FAILURE_ALLOWANCE
-                                )
+                                "Client failed health check {} times, recycling",
+                                HEALTH_CHECK_FAILURE_ALLOWANCE
                             );
                         }
 
@@ -605,10 +574,7 @@ impl TorController {
                     })
                     .await
                 {
-                    tracing::error!(
-                        "{}",
-                        t!("net.tor.bootstrapper-error", error = e.to_string())
-                    );
+                    tracing::error!("Tor Bootstrapper Error: {e}");
                     tracing::debug!("{e:?}");
                 }
                 if let Err::<(), Error>(e) = async {
@@ -626,10 +592,7 @@ impl TorController {
                 }
                 .await
                 {
-                    tracing::error!(
-                        "{}",
-                        t!("net.tor.client-creation-error", error = e.to_string())
-                    );
+                    tracing::error!("Tor Client Creation Error: {e}");
                     tracing::debug!("{e:?}");
                 }
             }
@@ -721,10 +684,7 @@ impl TorController {
                 .await
                 .with_kind(ErrorKind::Network)?;
             if let Err(e) = socket2::SockRef::from(&tcp_stream).set_keepalive(true) {
-                tracing::error!(
-                    "{}",
-                    t!("net.tor.failed-to-set-tcp-keepalive", error = e.to_string())
-                );
+                tracing::error!("Failed to set tcp keepalive: {e}");
                 tracing::debug!("{e:?}");
             }
             Ok(Box::new(tcp_stream))
@@ -852,7 +812,7 @@ impl OnionService {
                                                                 .await
                                                                 .with_kind(ErrorKind::Network)?;
                                                         if let Err(e) = socket2::SockRef::from(&outgoing).set_keepalive(true) {
-                                                            tracing::error!("{}", t!("net.tor.failed-to-set-tcp-keepalive", error = e.to_string()));
+                                                            tracing::error!("Failed to set tcp keepalive: {e}");
                                                             tracing::debug!("{e:?}");
                                                         }
                                                         let mut incoming = req
@@ -892,7 +852,7 @@ impl OnionService {
                             }
                             .await
                             {
-                                tracing::error!("{}", t!("net.tor.client-error", error = e.to_string()));
+                                tracing::error!("Tor Client Error: {e}");
                                 tracing::debug!("{e:?}");
                             }
                         }

core/src/net/tor/ctor.rs

@@ -249,26 +249,26 @@ pub fn tor_api<C: Context>() -> ParentHandler<C> {
             from_fn_async(list_services)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| display_services(handle.params, result))
-                .with_about("about.display-tor-v3-onion-addresses")
+                .with_about("Display Tor V3 Onion Addresses")
                 .with_call_remote::<CliContext>(),
         )
-        .subcommand("logs", logs().with_about("about.display-tor-logs"))
+        .subcommand("logs", logs().with_about("Display Tor logs"))
         .subcommand(
             "logs",
             from_fn_async(crate::logs::cli_logs::<RpcContext, Empty>)
                 .no_display()
-                .with_about("about.display-tor-logs"),
+                .with_about("Display Tor logs"),
         )
         .subcommand(
             "reset",
             from_fn_async(reset)
                 .no_display()
-                .with_about("about.reset-tor-daemon")
+                .with_about("Reset Tor daemon")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "key",
-            key::<C>().with_about("about.manage-onion-service-key-store"),
+            key::<C>().with_about("Manage the onion service key store"),
         )
 }
 
@@ -277,13 +277,13 @@ pub fn key<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "generate",
             from_fn_async(generate_key)
-                .with_about("about.generate-onion-service-key-add-to-store")
+                .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("about.add-onion-service-key-to-store")
+                .with_about("Add an onion service key to the key store")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -295,7 +295,7 @@ pub fn key<C: Context>() -> ParentHandler<C> {
                     }
                     Ok(())
                 })
-                .with_about("about.list-onion-services-with-keys-in-store")
+                .with_about("List onion services with keys in the key store")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -316,7 +316,6 @@ pub async fn generate_key(ctx: RpcContext) -> Result<OnionAddress, Error> {
 
 #[derive(Deserialize, Serialize, Parser)]
 pub struct AddKeyParams {
-    #[arg(help = "help.arg.onion-secret-key")]
     pub key: Base64<[u8; 64]>,
 }
 
@@ -351,14 +350,8 @@ pub async fn list_keys(ctx: RpcContext) -> Result<BTreeSet<OnionAddress>, Error>
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ResetParams {
-    #[arg(
-        name = "wipe-state",
-        short = 'w',
-        long = "wipe-state",
-        help = "help.arg.wipe-tor-state"
-    )]
+    #[arg(name = "wipe-state", short = 'w', long = "wipe-state")]
     wipe_state: bool,
-    #[arg(help = "help.arg.reset-reason")]
     reason: String,
 }
 

core/src/net/tunnel.rs

@@ -19,14 +19,14 @@ pub fn tunnel_api<C: Context>() -> ParentHandler<C> {
         .subcommand(
             "add",
             from_fn_async(add_tunnel)
-                .with_about("about.add-new-tunnel")
+                .with_about("Add a new tunnel")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove_tunnel)
                 .no_display()
-                .with_about("about.remove-tunnel")
+                .with_about("Remove a tunnel")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -34,11 +34,8 @@ pub fn tunnel_api<C: Context>() -> ParentHandler<C> {
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 #[ts(export)]
 pub struct AddTunnelParams {
-    #[arg(help = "help.arg.tunnel-name")]
     name: InternedString,
-    #[arg(help = "help.arg.wireguard-config")]
     config: String,
-    #[arg(help = "help.arg.is-public")]
     public: bool,
 }
 
@@ -126,7 +123,6 @@ pub async fn add_tunnel(
 #[derive(Debug, Clone, Deserialize, Serialize, Parser, TS)]
 #[ts(export)]
 pub struct RemoveTunnelParams {
-    #[arg(help = "help.arg.gateway-id")]
     id: GatewayId,
 }
 pub async fn remove_tunnel(

core/src/net/wifi.rs

@@ -30,7 +30,7 @@ type WifiManager = Arc<RwLock<Option<WpaCli>>>;
 //         Ok(wifi_manager)
 //     } else {
 //         Err(Error::new(
-//             color_eyre::eyre::eyre!("{}", t!("net.wifi.no-interface-available")),
+//             color_eyre::eyre::eyre!("No WiFi interface available"),
 //             ErrorKind::Wifi,
 //         ))
 //     }
@@ -42,28 +42,28 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
             "set-enabled",
             from_fn_async(set_enabled)
                 .no_display()
-                .with_about("about.enable-disable-wifi")
+                .with_about("Enable or disable wifi")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "add",
             from_fn_async(add)
                 .no_display()
-                .with_about("about.add-wifi-ssid-password")
+                .with_about("Add wifi ssid and password")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "connect",
             from_fn_async(connect)
                 .no_display()
-                .with_about("about.connect-wifi-network")
+                .with_about("Connect to wifi network")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
-                .with_about("about.remove-wifi-network")
+                .with_about("Remove a wifi network")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -71,16 +71,16 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
             from_fn_async(get)
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| display_wifi_info(handle.params, result))
-                .with_about("about.list-wifi-info")
+                .with_about("List wifi info")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "country",
-            country::<C>().with_about("about.command-set-country"),
+            country::<C>().with_about("Command to set country"),
         )
         .subcommand(
             "available",
-            available::<C>().with_about("about.command-list-available-wifi"),
+            available::<C>().with_about("Command to list available wifi networks"),
         )
 }
 
@@ -88,7 +88,6 @@ pub fn wifi<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SetWifiEnabledParams {
-    #[arg(help = "help.arg.wifi-enabled")]
     pub enabled: bool,
 }
 
@@ -134,7 +133,7 @@ pub fn available<C: Context>() -> ParentHandler<C> {
         from_fn_async(get_available)
             .with_display_serializable()
             .with_custom_display_fn(|handle, result| display_wifi_list(handle.params, result))
-            .with_about("about.list-available-wifi-networks")
+            .with_about("List available wifi networks")
             .with_call_remote::<CliContext>(),
     )
 }
@@ -144,7 +143,7 @@ pub fn country<C: Context>() -> ParentHandler<C> {
         "set",
         from_fn_async(set_country)
             .no_display()
-            .with_about("about.set-country")
+            .with_about("Set Country")
             .with_call_remote::<CliContext>(),
     )
 }
@@ -153,9 +152,7 @@ pub fn country<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct AddParams {
-    #[arg(help = "help.arg.wifi-ssid")]
     ssid: String,
-    #[arg(help = "help.arg.wifi-password")]
     password: String,
 }
 #[instrument(skip_all)]
@@ -163,13 +160,13 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
     let wifi_manager = ctx.wifi_manager.clone();
     if !ssid.is_ascii() {
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.ssid-no-special-characters")),
+            color_eyre::eyre::eyre!("SSID may not have special characters"),
             ErrorKind::Wifi,
         ));
     }
     if !password.is_ascii() {
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.password-no-special-characters")),
+            color_eyre::eyre::eyre!("WiFi Password may not have special characters"),
             ErrorKind::Wifi,
         ));
     }
@@ -179,11 +176,11 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
         ssid: &Ssid,
         password: &Psk,
     ) -> Result<(), Error> {
-        tracing::info!("{}", t!("net.wifi.adding-network", ssid = &ssid.0));
+        tracing::info!("Adding new WiFi network: '{}'", ssid.0);
         let mut wpa_supplicant = wifi_manager.write_owned().await;
         let wpa_supplicant = wpa_supplicant.as_mut().ok_or_else(|| {
             Error::new(
-                color_eyre::eyre::eyre!("{}", t!("net.wifi.no-interface-available")),
+                color_eyre::eyre::eyre!("No WiFi interface available"),
                 ErrorKind::Wifi,
             )
         })?;
@@ -198,17 +195,10 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
     )
     .await
     {
-        tracing::error!(
-            "{}",
-            t!(
-                "net.wifi.failed-to-add-network",
-                ssid = &ssid,
-                error = err.to_string()
-            )
-        );
+        tracing::error!("Failed to add new WiFi network '{}': {}", ssid, err);
         tracing::debug!("{:?}", err);
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.failed-adding", ssid = &ssid)),
+            color_eyre::eyre::eyre!("Failed adding {}", ssid),
             ErrorKind::Wifi,
         ));
     }
@@ -232,7 +222,6 @@ pub async fn add(ctx: RpcContext, AddParams { ssid, password }: AddParams) -> Re
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SsidParams {
-    #[arg(help = "help.arg.wifi-ssid")]
     ssid: String,
 }
 
@@ -241,7 +230,7 @@ pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result
     let wifi_manager = ctx.wifi_manager.clone();
     if !ssid.is_ascii() {
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.ssid-no-special-characters")),
+            color_eyre::eyre::eyre!("SSID may not have special characters"),
             ErrorKind::Wifi,
         ));
     }
@@ -253,19 +242,19 @@ pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result
         let mut wpa_supplicant = wifi_manager.write_owned().await;
         let wpa_supplicant = wpa_supplicant.as_mut().ok_or_else(|| {
             Error::new(
-                color_eyre::eyre::eyre!("{}", t!("net.wifi.no-interface-available")),
+                color_eyre::eyre::eyre!("No WiFi interface available"),
                 ErrorKind::Wifi,
             )
         })?;
         let current = wpa_supplicant.get_current_network().await?;
         let connected = wpa_supplicant.select_network(db.clone(), ssid).await?;
         if connected {
-            tracing::info!("{}", t!("net.wifi.connected-successfully", ssid = &ssid.0));
+            tracing::info!("Successfully connected to WiFi: '{}'", ssid.0);
         } else {
-            tracing::info!("{}", t!("net.wifi.connection-failed", ssid = &ssid.0));
+            tracing::info!("Failed to connect to WiFi: '{}'", ssid.0);
             match current {
                 None => {
-                    tracing::info!("{}", t!("net.wifi.no-wifi-to-revert"));
+                    tracing::info!("No WiFi to revert to!");
                 }
                 Some(current) => {
                     wpa_supplicant.select_network(db, &current).await?;
@@ -278,16 +267,9 @@ pub async fn connect(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result
     if let Err(err) =
         connect_procedure(ctx.db.clone(), wifi_manager.clone(), &Ssid(ssid.clone())).await
     {
-        tracing::error!(
-            "{}",
-            t!(
-                "net.wifi.failed-to-connect",
-                ssid = &ssid,
-                error = err.to_string()
-            )
-        );
+        tracing::error!("Failed to connect to WiFi network '{}': {}", &ssid, err);
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.cant-connect", ssid = &ssid)),
+            color_eyre::eyre::eyre!("Can't connect to {}", ssid),
             ErrorKind::Wifi,
         ));
     }
@@ -315,7 +297,7 @@ pub async fn remove(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<
     let wifi_manager = ctx.wifi_manager.clone();
     if !ssid.is_ascii() {
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.ssid-no-special-characters")),
+            color_eyre::eyre::eyre!("SSID may not have special characters"),
             ErrorKind::Wifi,
         ));
     }
@@ -323,7 +305,7 @@ pub async fn remove(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<
     let mut wpa_supplicant = wifi_manager.write_owned().await;
     let wpa_supplicant = wpa_supplicant.as_mut().ok_or_else(|| {
         Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.no-interface-available")),
+            color_eyre::eyre::eyre!("No WiFi interface available"),
             ErrorKind::Wifi,
         )
     })?;
@@ -334,7 +316,9 @@ pub async fn remove(ctx: RpcContext, SsidParams { ssid }: SsidParams) -> Result<
         is_current_being_removed && !interface_connected(&ctx.ethernet_interface).await?;
     if is_current_removed_and_no_hardwire {
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.forbidden-delete-would-disconnect")),
+            color_eyre::eyre::eyre!(
+                "Forbidden: Deleting this network would make your server unreachable. Either connect to ethernet or connect to a different WiFi network to remedy this."
+            ),
             ErrorKind::Wifi,
         ));
     }
@@ -479,7 +463,7 @@ pub async fn get(ctx: RpcContext, _: Empty) -> Result<WifiListInfo, Error> {
     let wpa_supplicant = wifi_manager.read_owned().await;
     let wpa_supplicant = wpa_supplicant.as_ref().ok_or_else(|| {
         Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.no-interface-available")),
+            color_eyre::eyre::eyre!("No WiFi interface available"),
             ErrorKind::Wifi,
         )
     })?;
@@ -533,7 +517,7 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>
     let wpa_supplicant = wifi_manager.read_owned().await;
     let wpa_supplicant = wpa_supplicant.as_ref().ok_or_else(|| {
         Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.no-interface-available")),
+            color_eyre::eyre::eyre!("No WiFi interface available"),
             ErrorKind::Wifi,
         )
     })?;
@@ -563,7 +547,7 @@ pub async fn get_available(ctx: RpcContext, _: Empty) -> Result<Vec<WifiListOut>
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct SetCountryParams {
-    #[arg(value_parser = CountryCodeParser, help = "help.arg.wifi-country-code")]
+    #[arg(value_parser = CountryCodeParser)]
     #[ts(type = "string")]
     country: CountryCode,
 }
@@ -574,14 +558,14 @@ pub async fn set_country(
     let wifi_manager = ctx.wifi_manager.clone();
     if !interface_connected(&ctx.ethernet_interface).await? {
         return Err(Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.wont-change-country-without-ethernet")),
+            color_eyre::eyre::eyre!("Won't change country without hardwire connection"),
             crate::ErrorKind::Wifi,
         ));
     }
     let mut wpa_supplicant = wifi_manager.write_owned().await;
     let wpa_supplicant = wpa_supplicant.as_mut().ok_or_else(|| {
         Error::new(
-            color_eyre::eyre::eyre!("{}", t!("net.wifi.no-interface-available")),
+            color_eyre::eyre::eyre!("No WiFi interface available"),
             ErrorKind::Wifi,
         )
     })?;
@@ -700,14 +684,7 @@ impl WpaCli {
             .await
             .map(|_| ())
             .unwrap_or_else(|e| {
-                tracing::warn!(
-                    "{}",
-                    t!(
-                        "net.wifi.failed-to-set-interface",
-                        interface = &self.interface,
-                        ssid = &ssid.0
-                    )
-                );
+                tracing::warn!("Failed to set interface {} for {}", self.interface, ssid.0);
                 tracing::debug!("{:?}", e);
             });
         Command::new("nmcli")
@@ -742,13 +719,13 @@ impl WpaCli {
         }
         let first_country = r.lines().find(|s| s.contains("country")).ok_or_else(|| {
             Error::new(
-                color_eyre::eyre::eyre!("{}", t!("net.wifi.could-not-find-country-config")),
+                color_eyre::eyre::eyre!("Could not find a country config lines"),
                 ErrorKind::Wifi,
             )
         })?;
         let country = &RE.captures(first_country).ok_or_else(|| {
             Error::new(
-                color_eyre::eyre::eyre!("{}", t!("net.wifi.could-not-parse-country-config")),
+                color_eyre::eyre::eyre!("Could not find a country config with regex"),
                 ErrorKind::Wifi,
             )
         })?[1];
@@ -757,10 +734,7 @@ impl WpaCli {
         } else {
             Ok(Some(CountryCode::for_alpha2(country).map_err(|_| {
                 Error::new(
-                    color_eyre::eyre::eyre!(
-                        "{}",
-                        t!("net.wifi.invalid-country-code", country = country)
-                    ),
+                    color_eyre::eyre::eyre!("Invalid Country Code: {}", country),
                     ErrorKind::Wifi,
                 )
             })?))
@@ -903,7 +877,7 @@ impl WpaCli {
         let m_id = self.check_active_network(ssid).await?;
         match m_id {
             None => Err(Error::new(
-                color_eyre::eyre::eyre!("{}", t!("net.wifi.ssid-not-found")),
+                color_eyre::eyre::eyre!("SSID Not Found"),
                 ErrorKind::Wifi,
             )),
             Some(x) => {
@@ -1084,7 +1058,7 @@ pub async fn synchronize_network_manager<P: AsRef<Path>>(
         .invoke(ErrorKind::Wifi)
         .await?;
     if let Some(last_country_code) = wifi.last_region {
-        tracing::info!("{}", t!("net.wifi.setting-region"));
+        tracing::info!("Setting the region");
         let _ = Command::new("iw")
             .arg("reg")
             .arg("set")
@@ -1092,7 +1066,7 @@ pub async fn synchronize_network_manager<P: AsRef<Path>>(
             .invoke(ErrorKind::Wifi)
             .await?;
     } else {
-        tracing::info!("{}", t!("net.wifi.setting-region-fallback"));
+        tracing::info!("Setting the region fallback");
         let _ = Command::new("iw")
             .arg("reg")
             .arg("set")

core/src/notifications.rs

@@ -27,49 +27,49 @@ pub fn notification<C: Context>() -> ParentHandler<C> {
             "list",
             from_fn_async(list)
                 .with_display_serializable()
-                .with_about("about.list-notifications")
+                .with_about("List notifications")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove",
             from_fn_async(remove)
                 .no_display()
-                .with_about("about.remove-notification-for-ids")
+                .with_about("Remove notification for given ids")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "remove-before",
             from_fn_async(remove_before)
                 .no_display()
-                .with_about("about.remove-notifications-before-id")
+                .with_about("Remove notifications preceding a given id")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "mark-seen",
             from_fn_async(mark_seen)
                 .no_display()
-                .with_about("about.mark-notifications-seen")
+                .with_about("Mark given notifications as seen")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "mark-seen-before",
             from_fn_async(mark_seen_before)
                 .no_display()
-                .with_about("about.mark-notifications-seen-before-id")
+                .with_about("Mark notifications preceding a given id as seen")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "mark-unseen",
             from_fn_async(mark_unseen)
                 .no_display()
-                .with_about("about.mark-notifications-unseen")
+                .with_about("Mark given notifications as unseen")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
             "create",
             from_fn_async(create)
                 .no_display()
-                .with_about("about.persist-new-notification")
+                .with_about("Persist a newly created notification")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -78,10 +78,8 @@ pub fn notification<C: Context>() -> ParentHandler<C> {
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ListNotificationParams {
-    #[arg(help = "help.arg.notification-before-id")]
     #[ts(type = "number | null")]
     before: Option<u32>,
-    #[arg(help = "help.arg.notification-limit")]
     #[ts(type = "number | null")]
     limit: Option<usize>,
 }
@@ -143,7 +141,6 @@ pub async fn list(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ModifyNotificationParams {
-    #[arg(help = "help.arg.notification-ids")]
     #[ts(type = "number[]")]
     ids: Vec<u32>,
 }
@@ -178,7 +175,6 @@ pub async fn remove(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct ModifyNotificationBeforeParams {
-    #[arg(help = "help.arg.notification-before-id")]
     #[ts(type = "number")]
     before: u32,
 }
@@ -300,13 +296,9 @@ pub async fn mark_unseen(
 #[serde(rename_all = "camelCase")]
 #[command(rename_all = "kebab-case")]
 pub struct CreateParams {
-    #[arg(help = "help.arg.package-id")]
     package: Option<PackageId>,
-    #[arg(help = "help.arg.notification-level")]
     level: NotificationLevel,
-    #[arg(help = "help.arg.notification-title")]
     title: String,
-    #[arg(help = "help.arg.notification-message")]
     message: String,
 }
 
@@ -354,7 +346,7 @@ pub struct InvalidNotificationLevel(String);
 impl From<InvalidNotificationLevel> for crate::Error {
     fn from(val: InvalidNotificationLevel) -> Self {
         Error::new(
-            eyre!("{}", t!("notifications.invalid-level", level = val.0)),
+            eyre!("Invalid Notification Level: {}", val.0),
             ErrorKind::ParseDbField,
         )
     }

core/src/os_install/gpt.rs

@@ -1,207 +1,138 @@
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use gpt::GptConfig;
 use gpt::disk::LogicalBlockSize;
-use tokio::process::Command;
 
 use crate::disk::OsPartitionInfo;
+use crate::disk::util::DiskInfo;
 use crate::os_install::partition_for;
 use crate::prelude::*;
-use crate::util::Invoke;
 
-pub async fn partition(
-    disk_path: &Path,
-    capacity: u64,
-    protect: Option<&Path>,
-    use_efi: bool,
-) -> Result<OsPartitionInfo, Error> {
-    // Guard: cannot protect the whole disk
-    if let Some(p) = protect {
-        if p == disk_path {
-            return Err(Error::new(
-                eyre!(
-                    "Cannot protect the entire disk {}; must specify a partition",
-                    disk_path.display()
-                ),
-                crate::ErrorKind::InvalidRequest,
-            ));
-        }
-    }
-
-    let disk_path = disk_path.to_owned();
-    let disk_path_clone = disk_path.clone();
-    let protect = protect.map(|p| p.to_owned());
-    let (efi, data_part) = tokio::task::spawn_blocking(move || {
-        let disk_path = disk_path_clone;
-
-        let protected_partition_info: Option<(u64, u64, PathBuf)> =
-            if let Some(ref protect_path) = protect {
-                let existing_gpt = GptConfig::new()
-                    .writable(false)
-                    .logical_block_size(LogicalBlockSize::Lb512)
-                    .open_from_device(Box::new(
-                        std::fs::File::options().read(true).open(&disk_path)?,
-                    ))?;
-                let info = existing_gpt
-                    .partitions()
-                    .iter()
-                    .find(|(num, _)| partition_for(&disk_path, **num) == *protect_path)
-                    .map(|(_, p)| (p.first_lba, p.last_lba, protect_path.clone()));
-                if info.is_none() {
-                    return Err(Error::new(
-                        eyre!(
-                            "Protected partition {} not found in GPT on {}",
-                            protect_path.display(),
-                            disk_path.display()
-                        ),
-                        crate::ErrorKind::NotFound,
-                    ));
-                }
-                info
+pub async fn partition(disk: &DiskInfo, overwrite: bool) -> Result<OsPartitionInfo, Error> {
+    let efi = {
+        let disk = disk.clone();
+        tokio::task::spawn_blocking(move || {
+            let use_efi = Path::new("/sys/firmware/efi").exists();
+            let mut device = Box::new(
+                std::fs::File::options()
+                    .read(true)
+                    .write(true)
+                    .open(&disk.logicalname)?,
+            );
+            let (mut gpt, guid_part) = if overwrite {
+                let mbr = gpt::mbr::ProtectiveMBR::with_lb_size(
+                    u32::try_from((disk.capacity / 512) - 1).unwrap_or(0xFF_FF_FF_FF),
+                );
+                mbr.overwrite_lba0(&mut device)?;
+                (
+                    GptConfig::new()
+                        .writable(true)
+                        .logical_block_size(LogicalBlockSize::Lb512)
+                        .create_from_device(device, None)?,
+                    None,
+                )
             } else {
-                None
+                let gpt = GptConfig::new()
+                    .writable(true)
+                    .logical_block_size(LogicalBlockSize::Lb512)
+                    .open_from_device(device)?;
+                let mut guid_part = None;
+                for (idx, part_info) in disk
+                    .partitions
+                    .iter()
+                    .enumerate()
+                    .map(|(idx, x)| (idx + 1, x))
+                {
+                    if let Some(entry) = gpt.partitions().get(&(idx as u32)) {
+                        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 StartOS data"),
+                                    crate::ErrorKind::InvalidRequest,
+                                ));
+                            }
+                            guid_part = Some(entry.clone());
+                            break;
+                        }
+                    }
+                }
+                (gpt, guid_part)
             };
 
-        let mut device = Box::new(
-            std::fs::File::options()
-                .read(true)
-                .write(true)
-                .open(&disk_path)?,
-        );
+            gpt.update_partitions(Default::default())?;
 
-        let mbr = gpt::mbr::ProtectiveMBR::with_lb_size(
-            u32::try_from((capacity / 512) - 1).unwrap_or(0xFF_FF_FF_FF),
-        );
-        mbr.overwrite_lba0(&mut device)?;
-        let mut gpt = GptConfig::new()
-            .writable(true)
-            .logical_block_size(LogicalBlockSize::Lb512)
-            .create_from_device(device, None)?;
-
-        gpt.update_partitions(Default::default())?;
-
-        let efi = if use_efi {
-            gpt.add_partition("efi", 100 * 1024 * 1024, gpt::partition_types::EFI, 0, None)?;
-            true
-        } else {
+            let efi = if use_efi {
+                gpt.add_partition("efi", 100 * 1024 * 1024, gpt::partition_types::EFI, 0, None)?;
+                true
+            } else {
+                gpt.add_partition(
+                    "bios-grub",
+                    8 * 1024 * 1024,
+                    gpt::partition_types::BIOS,
+                    0,
+                    None,
+                )?;
+                false
+            };
             gpt.add_partition(
-                "bios-grub",
-                8 * 1024 * 1024,
-                gpt::partition_types::BIOS,
+                "boot",
+                1024 * 1024 * 1024,
+                gpt::partition_types::LINUX_FS,
                 0,
                 None,
             )?;
-            false
-        };
-        gpt.add_partition(
-            "boot",
-            2 * 1024 * 1024 * 1024,
-            gpt::partition_types::LINUX_FS,
-            0,
-            None,
-        )?;
-        gpt.add_partition(
-            "root",
-            14 * 1024 * 1024 * 1024,
-            match crate::ARCH {
-                "x86_64" => gpt::partition_types::LINUX_ROOT_X64,
-                "aarch64" => gpt::partition_types::LINUX_ROOT_ARM_64,
-                _ => gpt::partition_types::LINUX_FS,
-            },
-            0,
-            None,
-        )?;
-
-        // Check if protected partition would be overwritten by OS partitions
-        if let Some((first_lba, _, ref path)) = protected_partition_info {
-            // Get the actual end sector of the last OS partition (root = partition 3)
-            let os_partitions_end_sector =
-                gpt.partitions().get(&3).map(|p| p.last_lba).unwrap_or(0);
-            if first_lba <= os_partitions_end_sector {
-                return Err(Error::new(
-                    eyre!(
-                        concat!(
-                            "Protected partition {} starts at sector {}",
-                            " which would be overwritten by OS partitions ending at sector {}"
-                        ),
-                        path.display(),
-                        first_lba,
-                        os_partitions_end_sector
-                    ),
-                    crate::ErrorKind::DiskManagement,
-                ));
-            }
-        }
-
-        let data_part = if let Some((first_lba, last_lba, path)) = protected_partition_info {
-            // Re-create the data partition entry at the same location
-            let length_lba = last_lba - first_lba + 1;
-            let next_id = gpt.partitions().keys().max().map(|k| k + 1).unwrap_or(1);
-            gpt.add_partition_at(
-                "data",
-                next_id,
-                first_lba,
-                length_lba,
-                gpt::partition_types::LINUX_LVM,
-                0,
-            )?;
-            Some(path)
-        } else {
             gpt.add_partition(
-                "data",
-                gpt.find_free_sectors()
-                    .iter()
-                    .map(|(_, size)| *size * u64::from(*gpt.logical_block_size()))
-                    .max()
-                    .ok_or_else(|| {
-                        Error::new(
-                            eyre!("No free space left on device"),
-                            crate::ErrorKind::BlockDevice,
-                        )
+                "root",
+                15 * 1024 * 1024 * 1024,
+                match crate::ARCH {
+                    "x86_64" => gpt::partition_types::LINUX_ROOT_X64,
+                    "aarch64" => gpt::partition_types::LINUX_ROOT_ARM_64,
+                    _ => gpt::partition_types::LINUX_FS,
+                },
+                0,
+                None,
+            )?;
+
+            if overwrite {
+                gpt.add_partition(
+                    "data",
+                    gpt.find_free_sectors()
+                        .iter()
+                        .map(|(_, size)| *size * u64::from(*gpt.logical_block_size()))
+                        .max()
+                        .ok_or_else(|| {
+                            Error::new(
+                                eyre!("No free space left on device"),
+                                crate::ErrorKind::BlockDevice,
+                            )
+                        })?,
+                    gpt::partition_types::LINUX_LVM,
+                    0,
+                    None,
+                )?;
+            } else if let Some(guid_part) = guid_part {
+                let mut parts = gpt.partitions().clone();
+                parts.insert(
+                    gpt.find_next_partition_id().ok_or_else(|| {
+                        Error::new(eyre!("Partition table is full"), ErrorKind::DiskManagement)
                     })?,
-                gpt::partition_types::LINUX_LVM,
-                0,
-                None,
-            )?;
-            gpt.partitions()
-                .last_key_value()
-                .map(|(num, _)| partition_for(&disk_path, *num))
-        };
+                    guid_part,
+                );
+                gpt.update_partitions(parts)?;
+            }
 
-        gpt.write()?;
+            gpt.write()?;
 
-        Ok::<_, Error>((efi, data_part))
-    })
-    .await
-    .unwrap()?;
-
-    // Re-read partition table and wait for udev to create device nodes
-    Command::new("vgchange")
-        .arg("-an")
-        .invoke(crate::ErrorKind::DiskManagement)
+            Ok(efi)
+        })
         .await
-        .ok();
-    Command::new("dmsetup")
-        .arg("remove_all")
-        .arg("--force")
-        .invoke(crate::ErrorKind::DiskManagement)
-        .await
-        .ok();
-    Command::new("blockdev")
-        .arg("--rereadpt")
-        .arg(&disk_path)
-        .invoke(crate::ErrorKind::DiskManagement)
-        .await?;
-    Command::new("udevadm")
-        .arg("settle")
-        .invoke(crate::ErrorKind::DiskManagement)
-        .await?;
+        .unwrap()?
+    };
 
     Ok(OsPartitionInfo {
-        efi: efi.then(|| partition_for(&disk_path, 1)),
-        bios: (!efi).then(|| partition_for(&disk_path, 1)),
-        boot: partition_for(&disk_path, 2),
-        root: partition_for(&disk_path, 3),
-        data: data_part,
+        efi: efi.then(|| partition_for(&disk.logicalname, 1)),
+        bios: (!efi).then(|| partition_for(&disk.logicalname, 1)),
+        boot: partition_for(&disk.logicalname, 2),
+        root: partition_for(&disk.logicalname, 3),
     })
 }

core/src/os_install/mbr.rs

@@ -1,173 +1,88 @@
-use std::path::{Path, PathBuf};
-
 use color_eyre::eyre::eyre;
 use mbrman::{CHS, MBR, MBRPartitionEntry};
-use tokio::process::Command;
 
+use crate::Error;
 use crate::disk::OsPartitionInfo;
+use crate::disk::util::DiskInfo;
 use crate::os_install::partition_for;
-use crate::prelude::*;
-use crate::util::Invoke;
 
-pub async fn partition(
-    disk_path: &Path,
-    capacity: u64,
-    protect: Option<&Path>,
-) -> Result<OsPartitionInfo, Error> {
-    // Guard: cannot protect the whole disk
-    if let Some(p) = protect {
-        if p == disk_path {
-            return Err(Error::new(
-                eyre!(
-                    "Cannot protect the entire disk {}; must specify a partition",
-                    disk_path.display()
-                ),
-                crate::ErrorKind::InvalidRequest,
-            ));
-        }
-    }
-
-    let disk_path = disk_path.to_owned();
-    let disk_path_clone = disk_path.clone();
-    let protect = protect.map(|p| p.to_owned());
-    let sectors = (capacity / 512) as u32;
-    let data_part = tokio::task::spawn_blocking(move || {
-        let disk_path = disk_path_clone;
-
-        // If protecting a partition, read its location from the existing MBR
-        let protected_partition_info: Option<(u32, u32, PathBuf)> =
-            if let Some(ref protect_path) = protect {
-                let mut file = std::fs::File::options().read(true).open(&disk_path)?;
-                let existing_mbr = MBR::read_from(&mut file, 512)?;
-                // Find the partition matching the protected path (check partitions 1-4)
-                let info = (1..=4u32)
-                    .find(|&idx| partition_for(&disk_path, idx) == *protect_path)
-                    .and_then(|idx| {
-                        let entry = &existing_mbr[idx as usize];
-                        if entry.sectors > 0 {
-                            Some((entry.starting_lba, entry.sectors, protect_path.clone()))
-                        } else {
-                            None
-                        }
-                    });
-                if info.is_none() {
-                    return Err(Error::new(
-                        eyre!(
-                            "Protected partition {} not found in MBR on {}",
-                            protect_path.display(),
-                            disk_path.display()
-                        ),
-                        crate::ErrorKind::NotFound,
-                    ));
-                }
-                info
+pub async fn partition(disk: &DiskInfo, overwrite: bool) -> Result<OsPartitionInfo, Error> {
+    {
+        let sectors = (disk.capacity / 512) as u32;
+        let disk = disk.clone();
+        tokio::task::spawn_blocking(move || {
+            let mut file = std::fs::File::options()
+                .read(true)
+                .write(true)
+                .open(&disk.logicalname)?;
+            let (mut mbr, guid_part) = if overwrite {
+                (MBR::new_from(&mut file, 512, rand::random())?, None)
             } else {
-                None
+                let mut mbr = MBR::read_from(&mut file, 512)?;
+                let mut guid_part = None;
+                for (idx, part_info) in disk
+                    .partitions
+                    .iter()
+                    .enumerate()
+                    .map(|(idx, x)| (idx + 1, x))
+                {
+                    if let Some(entry) = mbr.get_mut(idx) {
+                        if part_info.guid.is_some() {
+                            if entry.starting_lba < 33556480 {
+                                return Err(Error::new(
+                                    eyre!("Not enough space before embassy data"),
+                                    crate::ErrorKind::InvalidRequest,
+                                ));
+                            }
+                            guid_part = Some(std::mem::replace(entry, MBRPartitionEntry::empty()));
+                        }
+                        *entry = MBRPartitionEntry::empty();
+                    }
+                }
+                (mbr, guid_part)
             };
 
-        // MBR partition layout:
-        // Partition 1 (boot): starts at 2048, ends at 4196352 (sectors: 4194304 = 2GB)
-        // Partition 2 (root): starts at 4196352, ends at 33556480 (sectors: 29360128 = 14GB)
-        // OS partitions end at sector 33556480
-        let os_partitions_end_sector: u32 = 33556480;
+            mbr[1] = MBRPartitionEntry {
+                boot: 0x80,
+                first_chs: CHS::empty(),
+                sys: 0x0b,
+                last_chs: CHS::empty(),
+                starting_lba: 2048,
+                sectors: 2099200 - 2048,
+            };
+            mbr[2] = MBRPartitionEntry {
+                boot: 0,
+                first_chs: CHS::empty(),
+                sys: 0x83,
+                last_chs: CHS::empty(),
+                starting_lba: 2099200,
+                sectors: 33556480 - 2099200,
+            };
 
-        // Check if protected partition would be overwritten
-        if let Some((starting_lba, _, ref path)) = protected_partition_info {
-            if starting_lba < os_partitions_end_sector {
-                return Err(Error::new(
-                    eyre!(
-                        concat!(
-                            "Protected partition {} starts at sector {}",
-                            " which would be overwritten by OS partitions ending at sector {}"
-                        ),
-                        path.display(),
-                        starting_lba,
-                        os_partitions_end_sector
-                    ),
-                    crate::ErrorKind::DiskManagement,
-                ));
+            if overwrite {
+                mbr[3] = MBRPartitionEntry {
+                    boot: 0,
+                    first_chs: CHS::empty(),
+                    sys: 0x8e,
+                    last_chs: CHS::empty(),
+                    starting_lba: 33556480,
+                    sectors: sectors - 33556480,
+                }
+            } else if let Some(guid_part) = guid_part {
+                mbr[3] = guid_part;
             }
-        }
+            mbr.write_into(&mut file)?;
 
-        let mut file = std::fs::File::options()
-            .read(true)
-            .write(true)
-            .open(&disk_path)?;
-        let mut mbr = MBR::new_from(&mut file, 512, rand::random())?;
-
-        mbr[1] = MBRPartitionEntry {
-            boot: 0x80,
-            first_chs: CHS::empty(),
-            sys: 0x0b,
-            last_chs: CHS::empty(),
-            starting_lba: 2048,
-            sectors: 4196352 - 2048,
-        };
-        mbr[2] = MBRPartitionEntry {
-            boot: 0,
-            first_chs: CHS::empty(),
-            sys: 0x83,
-            last_chs: CHS::empty(),
-            starting_lba: 4196352,
-            sectors: 33556480 - 4196352,
-        };
-
-        let data_part = if let Some((starting_lba, part_sectors, path)) = protected_partition_info {
-            // Re-create the data partition entry at the same location
-            mbr[3] = MBRPartitionEntry {
-                boot: 0,
-                first_chs: CHS::empty(),
-                sys: 0x8e,
-                last_chs: CHS::empty(),
-                starting_lba,
-                sectors: part_sectors,
-            };
-            Some(path)
-        } else {
-            mbr[3] = MBRPartitionEntry {
-                boot: 0,
-                first_chs: CHS::empty(),
-                sys: 0x8e,
-                last_chs: CHS::empty(),
-                starting_lba: 33556480,
-                sectors: sectors - 33556480,
-            };
-            Some(partition_for(&disk_path, 3))
-        };
-        mbr.write_into(&mut file)?;
-
-        Ok::<_, Error>(data_part)
-    })
-    .await
-    .unwrap()?;
-
-    // Re-read partition table and wait for udev to create device nodes
-    Command::new("vgchange")
-        .arg("-an")
-        .invoke(crate::ErrorKind::DiskManagement)
+            Ok(())
+        })
         .await
-        .ok();
-    Command::new("dmsetup")
-        .arg("remove_all")
-        .arg("--force")
-        .invoke(crate::ErrorKind::DiskManagement)
-        .await
-        .ok();
-    Command::new("blockdev")
-        .arg("--rereadpt")
-        .arg(&disk_path)
-        .invoke(crate::ErrorKind::DiskManagement)
-        .await?;
-    Command::new("udevadm")
-        .arg("settle")
-        .invoke(crate::ErrorKind::DiskManagement)
-        .await?;
+        .unwrap()?;
+    }
 
     Ok(OsPartitionInfo {
         efi: None,
         bios: None,
-        boot: partition_for(&disk_path, 1),
-        root: partition_for(&disk_path, 2),
-        data: data_part,
+        boot: partition_for(&disk.logicalname, 1),
+        root: partition_for(&disk.logicalname, 2),
     })
 }

core/src/os_install/mod.rs

@@ -2,13 +2,13 @@ use std::path::{Path, PathBuf};
 
 use clap::Parser;
 use color_eyre::eyre::eyre;
+use rpc_toolkit::{Context, HandlerExt, ParentHandler, from_fn_async};
 use serde::{Deserialize, Serialize};
 use tokio::process::Command;
 use ts_rs::TS;
 
-use crate::Error;
 use crate::context::config::ServerConfig;
-use crate::context::{CliContext, SetupContext};
+use crate::context::{CliContext, InstallContext};
 use crate::disk::OsPartitionInfo;
 use crate::disk::mount::filesystem::bind::Bind;
 use crate::disk::mount::filesystem::block_dev::BlockDev;
@@ -16,31 +16,81 @@ 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::PartitionTable;
+use crate::disk::util::{DiskInfo, PartitionTable};
+use crate::net::utils::find_eth_iface;
 use crate::prelude::*;
 use crate::s9pk::merkle_archive::source::multi_cursor_file::MultiCursorFile;
-use crate::setup::SetupInfo;
 use crate::util::Invoke;
-use crate::util::io::{TmpDir, delete_file, open_file, write_file_atomic};
+use crate::util::io::{TmpDir, delete_file, open_file};
 use crate::util::serde::IoFormat;
+use crate::{ARCH, Error};
 
 mod gpt;
 mod mbr;
 
-/// Probe a squashfs image to determine its target architecture
-async fn probe_squashfs_arch(squashfs_path: &Path) -> Result<InternedString, Error> {
-    let output = String::from_utf8(
-        Command::new("unsquashfs")
-            .arg("-cat")
-            .arg(squashfs_path)
-            .arg("usr/lib/startos/PLATFORM.txt")
-            .invoke(ErrorKind::ParseSysInfo)
-            .await?,
-    )?;
-    Ok(crate::platform_to_arch(&output.trim()).into())
+pub fn install<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new()
+        .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>(),
+        )
 }
 
-pub fn partition_for(disk: impl AsRef<Path>, idx: u32) -> PathBuf {
+pub fn disk<C: Context>() -> ParentHandler<C> {
+    ParentHandler::new().subcommand(
+        "list",
+        from_fn_async(list)
+            .no_display()
+            .with_about("List disk info")
+            .with_call_remote::<CliContext>(),
+    )
+}
+
+pub async fn list(_: InstallContext) -> Result<Vec<DiskInfo>, Error> {
+    let skip = match async {
+        Ok::<_, Error>(
+            Path::new(
+                &String::from_utf8(
+                    Command::new("grub-probe-default")
+                        .arg("-t")
+                        .arg("disk")
+                        .arg("/run/live/medium")
+                        .invoke(crate::ErrorKind::Grub)
+                        .await?,
+                )?
+                .trim(),
+            )
+            .to_owned(),
+        )
+    }
+    .await
+    {
+        Ok(a) => Some(a),
+        Err(e) => {
+            tracing::error!("Could not determine live usb device: {}", e);
+            tracing::debug!("{:?}", e);
+            None
+        }
+    };
+    Ok(crate::disk::util::list(&Default::default())
+        .await?
+        .into_iter()
+        .filter(|i| Some(&*i.logicalname) != skip.as_deref())
+        .collect())
+}
+
+pub fn partition_for(disk: impl AsRef<Path>, idx: usize) -> PathBuf {
     let disk_path = disk.as_ref();
     let (root, leaf) = if let (Some(root), Some(leaf)) = (
         disk_path.parent(),
@@ -57,90 +107,49 @@ pub fn partition_for(disk: impl AsRef<Path>, idx: u32) -> PathBuf {
     }
 }
 
-async fn partition(
-    disk_path: &Path,
-    capacity: u64,
-    partition_table: Option<PartitionTable>,
-    protect: Option<&Path>,
-    use_efi: bool,
-) -> Result<OsPartitionInfo, Error> {
-    let partition_type = match (protect.is_none(), partition_table) {
+async fn partition(disk: &mut DiskInfo, overwrite: bool) -> Result<OsPartitionInfo, Error> {
+    let partition_type = match (overwrite, disk.partition_table) {
         (true, _) | (_, None) => PartitionTable::Gpt,
         (_, Some(t)) => t,
     };
+    disk.partition_table = Some(partition_type);
     match partition_type {
-        PartitionTable::Gpt => gpt::partition(disk_path, capacity, protect, use_efi).await,
-        PartitionTable::Mbr => mbr::partition(disk_path, capacity, protect).await,
+        PartitionTable::Gpt => gpt::partition(disk, overwrite).await,
+        PartitionTable::Mbr => mbr::partition(disk, overwrite).await,
     }
 }
 
-async fn get_block_device_size(path: impl AsRef<Path>) -> Result<u64, Error> {
-    let path = path.as_ref();
-    let device_name = path.file_name().and_then(|s| s.to_str()).ok_or_else(|| {
-        Error::new(
-            eyre!("Invalid block device path: {}", path.display()),
-            ErrorKind::BlockDevice,
-        )
-    })?;
-    let size_path = Path::new("/sys/block").join(device_name).join("size");
-    let sectors: u64 = tokio::fs::read_to_string(&size_path)
-        .await
-        .with_ctx(|_| {
-            (
-                ErrorKind::BlockDevice,
-                format!("reading {}", size_path.display()),
-            )
-        })?
-        .trim()
-        .parse()
-        .map_err(|e| {
+#[derive(Deserialize, Serialize, Parser, TS)]
+#[serde(rename_all = "camelCase")]
+#[command(rename_all = "kebab-case")]
+pub struct ExecuteParams {
+    logicalname: PathBuf,
+    #[arg(short = 'o')]
+    overwrite: bool,
+}
+
+pub async fn execute<C: Context>(
+    _: C,
+    ExecuteParams {
+        logicalname,
+        mut overwrite,
+    }: ExecuteParams,
+) -> Result<(), Error> {
+    let mut disk = crate::disk::util::list(&Default::default())
+        .await?
+        .into_iter()
+        .find(|d| &d.logicalname == &logicalname)
+        .ok_or_else(|| {
             Error::new(
-                eyre!("Failed to parse block device size: {}", e),
-                ErrorKind::BlockDevice,
+                eyre!("Unknown disk {}", logicalname.display()),
+                crate::ErrorKind::DiskManagement,
             )
         })?;
-    Ok(sectors * 512)
-}
+    let eth_iface = find_eth_iface().await?;
 
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct InstallOsParams {
-    #[arg(help = "help.arg.os-drive-path")]
-    os_drive: PathBuf,
-    #[command(flatten)]
-    data_drive: Option<DataDrive>,
-}
+    overwrite |= disk.guid.is_none() && disk.partitions.iter().all(|p| p.guid.is_none());
 
-#[derive(Deserialize, Serialize, Parser, TS)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-struct DataDrive {
-    #[arg(long = "data-drive", help = "help.arg.data-drive-path")]
-    logicalname: PathBuf,
-    #[arg(long, help = "help.arg.wipe-drive")]
-    wipe: bool,
-}
-
-pub struct InstallOsResult {
-    pub part_info: OsPartitionInfo,
-    pub rootfs: TmpMountGuard,
-}
-
-pub async fn install_os_to(
-    squashfs_path: impl AsRef<Path>,
-    disk_path: impl AsRef<Path>,
-    capacity: u64,
-    partition_table: Option<PartitionTable>,
-    protect: Option<impl AsRef<Path>>,
-    arch: &str,
-    use_efi: bool,
-) -> Result<InstallOsResult, Error> {
-    let squashfs_path = squashfs_path.as_ref();
-    let disk_path = disk_path.as_ref();
-    let protect = protect.as_ref().map(|p| p.as_ref());
-
-    let part_info = partition(disk_path, capacity, partition_table, protect, use_efi).await?;
+    let part_info = partition(&mut disk, overwrite).await?;
 
     if let Some(efi) = &part_info.efi {
         Command::new("mkfs.vfat")
@@ -164,7 +173,7 @@ pub async fn install_os_to(
         .invoke(crate::ErrorKind::DiskManagement)
         .await?;
 
-    if protect.is_some() {
+    if !overwrite {
         if let Ok(guard) =
             TmpMountGuard::mount(&BlockDev::new(part_info.root.clone()), MountType::ReadWrite).await
         {
@@ -225,13 +234,13 @@ pub async fn install_os_to(
     tokio::fs::create_dir_all(&images_path).await?;
     let image_path = images_path
         .join(hex::encode(
-            &MultiCursorFile::from(open_file(squashfs_path).await?)
+            &MultiCursorFile::from(open_file("/run/live/medium/live/filesystem.squashfs").await?)
                 .blake3_mmap()
                 .await?
                 .as_bytes()[..16],
         ))
         .with_extension("rootfs");
-    tokio::fs::copy(squashfs_path, &image_path).await?;
+    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(
@@ -245,7 +254,7 @@ pub async fn install_os_to(
         .arg("-f")
         .arg("-d")
         .arg(&*unsquash_target)
-        .arg(squashfs_path)
+        .arg("/run/live/medium/live/filesystem.squashfs")
         .arg("boot")
         .invoke(crate::ErrorKind::Filesystem)
         .await?;
@@ -262,6 +271,7 @@ pub async fn install_os_to(
         rootfs.path().join("config/config.yaml"),
         IoFormat::Yaml.to_vec(&ServerConfig {
             os_partitions: Some(part_info.clone()),
+            ethernet_interface: Some(eth_iface),
             ..Default::default()
         })?,
     )
@@ -347,13 +357,13 @@ pub async fn install_os_to(
 
     let mut install = Command::new("chroot");
     install.arg(overlay.path()).arg("grub-install");
-    if !use_efi {
-        match arch {
+    if tokio::fs::metadata("/sys/firmware/efi").await.is_err() {
+        match ARCH {
             "x86_64" => install.arg("--target=i386-pc"),
             _ => &mut install,
         };
     } else {
-        match arch {
+        match ARCH {
             "x86_64" => install.arg("--target=x86_64-efi"),
             "aarch64" => install.arg("--target=arm64-efi"),
             "riscv64" => install.arg("--target=riscv64-efi"),
@@ -361,7 +371,7 @@ pub async fn install_os_to(
         };
     }
     install
-        .arg(disk_path)
+        .arg(&disk.logicalname)
         .invoke(crate::ErrorKind::Grub)
         .await?;
 
@@ -386,158 +396,15 @@ pub async fn install_os_to(
     tokio::fs::remove_dir_all(&work).await?;
     lower.unmount().await?;
 
-    Ok(InstallOsResult { part_info, rootfs })
-}
-
-pub async fn install_os(
-    ctx: SetupContext,
-    InstallOsParams {
-        os_drive,
-        data_drive,
-    }: InstallOsParams,
-) -> Result<SetupInfo, Error> {
-    let mut disks = crate::disk::util::list(&Default::default()).await?;
-    let disk = disks
-        .iter_mut()
-        .find(|d| &d.logicalname == &os_drive)
-        .ok_or_else(|| {
-            Error::new(
-                eyre!("Unknown disk {}", os_drive.display()),
-                crate::ErrorKind::DiskManagement,
-            )
-        })?;
-
-    let protect: Option<PathBuf> = data_drive.as_ref().and_then(|dd| {
-        if dd.wipe {
-            return None;
-        }
-        if disk.guid.as_ref().map_or(false, |g| {
-            g.starts_with("EMBASSY_") || g.starts_with("STARTOS_")
-        }) && disk.logicalname == dd.logicalname
-        {
-            return Some(disk.logicalname.clone());
-        }
-        disk.partitions
-            .iter()
-            .find(|p| {
-                p.guid.as_ref().map_or(false, |g| {
-                    g.starts_with("EMBASSY_") || g.starts_with("STARTOS_")
-                })
-            })
-            .map(|p| p.logicalname.clone())
-    });
-
-    let use_efi = tokio::fs::metadata("/sys/firmware/efi").await.is_ok();
-    let InstallOsResult { part_info, rootfs } = install_os_to(
-        "/run/live/medium/live/filesystem.squashfs",
-        &disk.logicalname,
-        disk.capacity,
-        disk.partition_table,
-        protect.as_ref(),
-        crate::ARCH,
-        use_efi,
-    )
-    .await?;
-
-    ctx.config
-        .mutate(|c| c.os_partitions = Some(part_info.clone()));
-
-    let mut setup_info = SetupInfo::default();
-
-    if let Some(data_drive) = data_drive {
-        let mut logicalname = &*data_drive.logicalname;
-        if logicalname == &os_drive {
-            logicalname = part_info.data.as_deref().ok_or_else(|| {
-                Error::new(
-                    eyre!("not enough room on OS drive for data"),
-                    ErrorKind::InvalidRequest,
-                )
-            })?;
-        }
-        if let Some(guid) = (!data_drive.wipe)
-            .then(|| disks.iter())
-            .into_iter()
-            .flatten()
-            .find_map(|d| {
-                d.guid
-                    .as_ref()
-                    .filter(|_| &d.logicalname == logicalname)
-                    .cloned()
-                    .or_else(|| {
-                        d.partitions.iter().find_map(|p| {
-                            p.guid
-                                .as_ref()
-                                .filter(|_| &p.logicalname == logicalname)
-                                .cloned()
-                        })
-                    })
-            })
-        {
-            setup_info.guid = Some(guid);
-            setup_info.attach = true;
-        } else {
-            let guid = crate::setup::setup_data_drive(&ctx, logicalname).await?;
-            setup_info.guid = Some(guid);
-        }
-    }
-
-    let config = MountGuard::mount(
-        &Bind::new(rootfs.path().join("config")),
-        "/media/startos/config",
-        ReadWrite,
-    )
-    .await?;
-
-    write_file_atomic(
-        "/media/startos/config/setup.json",
-        IoFormat::JsonPretty.to_vec(&setup_info)?,
-    )
-    .await?;
-
-    ctx.install_rootfs.replace(Some((rootfs, config)));
-
-    Ok(setup_info)
-}
-
-#[derive(Deserialize, Serialize, Parser)]
-#[serde(rename_all = "camelCase")]
-#[command(rename_all = "kebab-case")]
-pub struct CliInstallOsParams {
-    #[arg(help = "help.arg.squashfs-image-path")]
-    squashfs: PathBuf,
-    #[arg(help = "help.arg.target-disk")]
-    disk: PathBuf,
-    #[arg(long, help = "help.arg.use-efi-boot")]
-    efi: Option<bool>,
-}
-
-pub async fn cli_install_os(
-    _ctx: CliContext,
-    CliInstallOsParams {
-        squashfs,
-        disk,
-        efi,
-    }: CliInstallOsParams,
-) -> Result<OsPartitionInfo, Error> {
-    let capacity = get_block_device_size(&disk).await?;
-    let partition_table = crate::disk::util::get_partition_table(&disk).await?;
-
-    let arch = probe_squashfs_arch(&squashfs).await?;
-
-    let use_efi = efi.unwrap_or_else(|| !matches!(partition_table, Some(PartitionTable::Mbr)));
-
-    let InstallOsResult { part_info, rootfs } = install_os_to(
-        &squashfs,
-        &disk,
-        capacity,
-        partition_table,
-        None::<&str>,
-        &*arch,
-        use_efi,
-    )
-    .await?;
-
     rootfs.unmount().await?;
 
-    Ok(part_info)
+    Ok(())
+}
+
+pub async fn reboot(ctx: InstallContext) -> Result<(), Error> {
+    Command::new("sync")
+        .invoke(crate::ErrorKind::Filesystem)
+        .await?;
+    ctx.shutdown.send(()).unwrap();
+    Ok(())
 }

core/src/prelude.rs

@@ -1,7 +1,6 @@
 pub use color_eyre::eyre::eyre;
 pub use imbl_value::InternedString;
 pub use lazy_format::lazy_format;
-pub use rust_i18n::t;
 pub use tracing::instrument;
 
 pub use crate::db::prelude::*;

core/src/registry/admin.rs

@@ -21,7 +21,7 @@ pub fn admin_api<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "signer",
-            signers_api::<C>().with_about("about.commands-add-list-signers"),
+            signers_api::<C>().with_about("Commands to add or list signers"),
         )
         .subcommand(
             "add",
@@ -33,14 +33,14 @@ pub fn admin_api<C: Context>() -> ParentHandler<C> {
             "add",
             from_fn_async(cli_add_admin)
                 .no_display()
-                .with_about("about.add-admin-signer"),
+                .with_about("Add admin signer"),
         )
         .subcommand(
             "remove",
             from_fn_async(remove_admin)
                 .with_metadata("admin", Value::Bool(true))
                 .no_display()
-                .with_about("about.remove-admin-signer")
+                .with_about("Remove an admin signer")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -49,7 +49,7 @@ pub fn admin_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| display_signers(handle.params, result))
-                .with_about("about.list-admin-signers")
+                .with_about("List admin signers")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -62,7 +62,7 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
                 .with_metadata("admin", Value::Bool(true))
                 .with_display_serializable()
                 .with_custom_display_fn(|handle, result| display_signers(handle.params, result))
-                .with_about("about.list-signers")
+                .with_about("List signers")
                 .with_call_remote::<CliContext>(),
         )
         .subcommand(
@@ -73,14 +73,13 @@ fn signers_api<C: Context>() -> ParentHandler<C> {
         )
         .subcommand(
             "add",
-            from_fn_async(cli_add_signer).with_about("about.add-signer"),
+            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_about("about.edit-signer")
                 .with_call_remote::<CliContext>(),
         )
 }
@@ -94,12 +93,7 @@ impl Model<BTreeMap<Guid, SignerInfo>> {
             .next()
             .transpose()?
             .map(|(a, _)| a)
-            .ok_or_else(|| {
-                Error::new(
-                    eyre!("{}", t!("registry.admin.unknown-signer")),
-                    ErrorKind::Authorization,
-                )
-            })
+            .ok_or_else(|| Error::new(eyre!("unknown signer"), ErrorKind::Authorization))
     }
 
     pub fn get_signer_info(&self, key: &AnyVerifyingKey) -> Result<(Guid, SignerInfo), Error> {
@@ -109,12 +103,7 @@ impl Model<BTreeMap<Guid, SignerInfo>> {
             .filter_ok(|(_, s)| s.keys.contains(key))
             .next()
             .transpose()?
-            .ok_or_else(|| {
-                Error::new(
-                    eyre!("{}", t!("registry.admin.unknown-signer")),
-                    ErrorKind::Authorization,
-                )
-            })
+            .ok_or_else(|| Error::new(eyre!("unknown signer"), ErrorKind::Authorization))
     }
 
     pub fn add_signer(&mut self, signer: &SignerInfo) -> Result<Guid, Error> {
@@ -128,12 +117,9 @@ impl Model<BTreeMap<Guid, SignerInfo>> {
         {
             return Err(Error::new(
                 eyre!(
-                    "{}",
-                    t!(
-                        "registry.admin.signer-already-exists",
-                        guid = guid,
-                        name = s.name
-                    )
+                    "A signer {} ({}) already exists with a matching key",
+                    guid,
+                    s.name
                 ),
                 ErrorKind::InvalidRequest,
             ));
@@ -220,17 +206,16 @@ pub async fn add_signer(ctx: RegistryContext, signer: SignerInfo) -> Result<Guid
 #[command(rename_all = "kebab-case")]
 #[ts(export)]
 pub struct EditSignerParams {
-    #[arg(help = "help.arg.signer-id")]
     pub id: Guid,
-    #[arg(short = 'n', long, help = "help.arg.set-signer-name")]
+    #[arg(short = 'n', long)]
     pub set_name: Option<String>,
-    #[arg(short = 'c', long, help = "help.arg.add-signer-contact")]
+    #[arg(short = 'c', long)]
     pub add_contact: Vec<ContactInfo>,
-    #[arg(short = 'k', long, help = "help.arg.add-signer-key")]
+    #[arg(short = 'k', long)]
     pub add_key: Vec<AnyVerifyingKey>,
-    #[arg(short = 'C', long, help = "help.arg.remove-signer-contact")]
+    #[arg(short = 'C', long)]
     pub remove_contact: Vec<ContactInfo>,
-    #[arg(short = 'K', long, help = "help.arg.remove-signer-key")]
+    #[arg(short = 'K', long)]
     pub remove_key: Vec<AnyVerifyingKey>,
 }
 
@@ -279,13 +264,12 @@ pub async fn edit_signer(
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddSignerParams {
-    #[arg(long = "name", short = 'n', help = "help.arg.signer-name")]
+    #[arg(long = "name", short = 'n')]
     pub name: String,
-    #[arg(long = "contact", short = 'c', help = "help.arg.signer-contact")]
+    #[arg(long = "contact", short = 'c')]
     pub contact: Vec<ContactInfo>,
-    #[arg(long = "key", help = "help.arg.signer-key")]
+    #[arg(long = "key")]
     pub keys: Vec<AnyVerifyingKey>,
-    #[arg(help = "help.arg.database-path")]
     pub database: Option<PathBuf>,
 }
 
@@ -355,7 +339,6 @@ pub async fn add_admin(
 #[serde(rename_all = "camelCase")]
 #[ts(export)]
 pub struct RemoveAdminParams {
-    #[arg(help = "help.arg.signer-id")]
     pub signer: Guid,
 }
 
@@ -377,9 +360,7 @@ pub async fn remove_admin(
 #[command(rename_all = "kebab-case")]
 #[serde(rename_all = "camelCase")]
 pub struct CliAddAdminParams {
-    #[arg(help = "help.arg.signer-id")]
     pub signer: Guid,
-    #[arg(help = "help.arg.database-path")]
     pub database: Option<PathBuf>,
 }
 

core/src/registry/asset.rs

@@ -49,7 +49,7 @@ impl<Commitment> RegistryAsset<Commitment> {
             }
         }
         Err(Error::new(
-            eyre!("{}", t!("registry.asset.failed-to-load-http-url")),
+            eyre!("Failed to load any http url"),
             ErrorKind::Network,
         ))
     }
@@ -64,7 +64,7 @@ impl<Commitment> RegistryAsset<Commitment> {
             }
         }
         Err(Error::new(
-            eyre!("{}", t!("registry.asset.failed-to-load-http-url")),
+            eyre!("Failed to load any http url"),
             ErrorKind::Network,
         ))
     }
@@ -80,7 +80,7 @@ impl<Commitment> RegistryAsset<Commitment> {
             }
         }
         Err(Error::new(
-            eyre!("{}", t!("registry.asset.failed-to-load-http-url")),
+            eyre!("Failed to load any http url"),
             ErrorKind::Network,
         ))
     }