285 changed files with 1941 additions and 20197 deletions
--- a/.ci/build-release.sh
+++ b/.ci/build-release.sh
@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-ARCH="$1"
-SCRATCH_PATH=".build/$ARCH"
-OUTPUT_PATH=".build/prebuilt/$ARCH"
-
-swift build \
-  --build-system swiftbuild \
-  --scratch-path "$SCRATCH_PATH" \
-  --arch "$ARCH" \
-  --configuration release \
-  --product tart
-
-BIN_PATH=$(swift build \
-  --build-system swiftbuild \
-  --scratch-path "$SCRATCH_PATH" \
-  --arch "$ARCH" \
-  --configuration release \
-  --show-bin-path)
-
-mkdir -p "$OUTPUT_PATH"
-cp "$BIN_PATH/tart" "$OUTPUT_PATH/tart"
--- a/.ci/create-pkg.sh
+++ b/.ci/create-pkg.sh
@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-export VERSION="${VERSION:-0}"
-
-mkdir -p .ci/pkg/
-cp .build/arm64-apple-macosx/release/tart .ci/pkg/tart
-cp Resources/embedded.provisionprofile .ci/pkg/embedded.provisionprofile
-cp Resources/AppIcon.png .ci/pkg/AppIcon.png
-cp Resources/Info.plist .ci/pkg/Info.plist
-pkgbuild --root .ci/pkg/ --identifier com.github.cirruslabs.tart --version $VERSION \
-  --scripts .ci/pkg/scripts \
-  --install-location "/Library/Application Support/Tart" \
-  --sign "Developer ID Installer: Cirrus Labs, Inc. (9M2P8L4D89)" \
-  "./.ci/Tart-$VERSION.pkg"
-xcrun notarytool submit "./.ci/Tart-$VERSION.pkg" --keychain-profile "notarytool" --wait
-xcrun stapler staple "./.ci/Tart-$VERSION.pkg"
--- a/.ci/pkg/scripts/postinstall
+++ b/.ci/pkg/scripts/postinstall
@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# fix structure
-mkdir -p "$2/tart.app/Contents/MacOS" "$2/tart.app/Resources"
-mv "$2/tart" "$2/tart.app/Contents/MacOS/tart"
-mv "$2/embedded.provisionprofile" "$2/tart.app/Contents/embedded.provisionprofile"
-mv "$2/AppIcon.png" "$2/tart.app/Resources/AppIcon.png"
-mv "$2/Info.plist" "$2/tart.app/Contents/Info.plist"
-
-echo "#!/bin/sh" > /usr/local/bin/tart
-echo "exec '$2/tart.app/Contents/MacOS/tart' \"\$@\"" >> /usr/local/bin/tart
-
-chmod +x /usr/local/bin/tart
--- a/.ci/set-version.sh
+++ b/.ci/set-version.sh
@ -1,11 +1,5 @@
 #!/bin/sh

-set -e
-
-: "${VERSION:?VERSION must be set}"
-
 TMPFILE=$(mktemp)
-perl -pe 's/\$\{VERSION\}/$ENV{VERSION}/g' Sources/tart/CI/CI.swift > "$TMPFILE"
-mv "$TMPFILE" Sources/tart/CI/CI.swift
-
-/usr/libexec/PlistBuddy -c "Add :CFBundleShortVersionString string ${VERSION}" Resources/Info.plist
+envsubst < Sources/tart/CI/CI.swift > $TMPFILE
+mv $TMPFILE Sources/tart/CI/CI.swift
--- a/.ci/sign-release.sh
+++ b/.ci/sign-release.sh
@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-APP_PATH="dist/tart_darwin_all/tart.app"
-
-if [ "${TART_RELEASE_SNAPSHOT:-false}" = "true" ]; then
-  codesign \
-    --force \
-    --deep \
-    --sign - \
-    --entitlements Resources/tart-dev.entitlements \
-    "$APP_PATH"
-else
-  codesign \
-    --force \
-    --verbose \
-    --sign "Developer ID Application: Cirrus Labs, Inc. (9M2P8L4D89)" \
-    --timestamp \
-    --options runtime \
-    --keychain "$RUNNER_TEMP/build.keychain" \
-    --entitlements Resources/tart-prod.entitlements \
-    "$APP_PATH"
-fi
-
-codesign --verify --strict --verbose=2 "$APP_PATH"
-"$APP_PATH/Contents/MacOS/tart" --version
-
-if [ "${TART_RELEASE_SNAPSHOT:-false}" != "true" ]; then
-  NOTARIZATION_ARCHIVE="$RUNNER_TEMP/tart-notarization.zip"
-
-  ditto -c -k --keepParent "$APP_PATH" "$NOTARIZATION_ARCHIVE"
-  xcrun notarytool submit "$NOTARIZATION_ARCHIVE" \
-    --keychain-profile "notarytool" \
-    --keychain "$RUNNER_TEMP/build.keychain" \
-    --wait \
-    --timeout 20m
-  xcrun stapler staple "$APP_PATH"
-  xcrun stapler validate "$APP_PATH"
-  spctl --assess --type execute --verbose=4 "$APP_PATH"
-fi
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -1,78 +1,23 @@
-use_compute_credits: true
+persistent_worker:
+  labels:
+    name: Mac-Mini-M1

 task:
  name: Test
-  alias: test
-  persistent_worker:
-    labels:
-      name: dev-mini
-    resources:
-      tart-vms: 1
-  build_script:
-    - swift build
-  test_script:
-    # Add /usr/sbin to PATH, otherwise testDiskutilInfo() fails to locate "diskutil"
-    - export PATH=$PATH:/usr/sbin
-    - swift test
-  integration_test_script:
-    - codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/debug/tart
-    - export PATH=$(pwd)/.build/arm64-apple-macosx/debug:$PATH
-    # Run integration tests
-    - cd integration-tests
-    - python3 -m venv --symlinks venv
-    - source venv/bin/activate
-    - pip install -r requirements.txt
-    - pytest --verbose --junit-xml=pytest-junit.xml
-    - go test -v ./...
-  pytest_junit_result_artifacts:
-    path: "integration-tests/pytest-junit.xml"
-    format: junit
-
-task:
-  name: Markdown Lint
-  only_if: $CIRRUS_BRANCH != 'gh-pages' && changesInclude('**.md')
-  container:
-    image: node:latest
-  install_script: npm install -g markdownlint-cli
-  lint_script: markdownlint --config=docs/.markdownlint.yml docs/
-
-task:
-  name: Lint
-  alias: lint
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-runner:tahoe
-  lint_script:
-    - swift package plugin --allow-writing-to-package-directory swiftformat --cache ignore --lint --report swiftformat.json .
-  always:
-    swiftformat_report_artifacts:
-      path: swiftformat.json
-      format: swiftformat
+  test_script: swift test

 task:
+  name: Build
  only_if: $CIRRUS_TAG == ''
-  env:
-    matrix:
-      BUILD_ARCH: arm64
-      BUILD_ARCH: x86_64
-  name: Build ($BUILD_ARCH)
-  alias: build
-  macos_instance:
-    image: ghcr.io/cirruslabs/macos-runner:tahoe
-  build_script: swift build --arch $BUILD_ARCH --product tart
-  sign_script: codesign --sign - --entitlements Resources/tart-dev.entitlements --force .build/$BUILD_ARCH-apple-macosx/debug/tart
+  build_script: swift build --product tart
+  sign_script: codesign --sign - --entitlements Resources/tart.entitlements --force .build/debug/tart
  binary_artifacts:
-    path: .build/$BUILD_ARCH-apple-macosx/debug/tart
+    path: .build/debug/tart

 task:
-  name: Deploy Documentation
-  only_if: $CIRRUS_BRANCH == 'main'
-  container:
-    image: ghcr.io/squidfunk/mkdocs-material:latest
-    registry_config: ENCRYPTED[!cf1a0f25325aa75bad3ce6ebc890bc53eb0044c02efa70d8cefb83ba9766275a994b4831706c52630a0692b2fa9cfb9e!]
+  name: Release
+  only_if: $CIRRUS_TAG != ''
  env:
-    DEPLOY_TOKEN: ENCRYPTED[!45ed45666558902ed1c2400add734ec063103bec31841847e8c8764802fca229bfa6d85c690e16ad159e047574b48793!]
-  deploy_script:
-    - git config --global user.name "Cirrus CI"
-    - git config --global user.name "hello@cirruslabs.org"
-    - git remote set-url origin https://$DEPLOY_TOKEN@github.com/cirruslabs/tart/
-    - mkdocs --verbose gh-deploy --force --remote-branch gh-pages
+    GITHUB_TOKEN: ENCRYPTED[!98ace8259c6024da912c14d5a3c5c6aac186890a8d4819fad78f3e0c41a4e0cd3a2537dd6e91493952fb056fa434be7c!]
+    GORELEASER_KEY: ENCRYPTED[!9b80b6ef684ceaf40edd4c7af93014ee156c8aba7e6e5795f41c482729887b5c31f36b651491d790f1f668670888d9fd!]
+  release_script: goreleaser
--- a/.editorconfig
+++ b/.editorconfig
@ -4,8 +4,3 @@ root = true
 indent_style = space
 indent_size = 2
 insert_final_newline = true
-
-[integration-tests/**]
-indent_style = unset
-indent_size = unset
-insert_final_newline = unset
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,2 @@
+*.png filter=lfs diff=lfs merge=lfs -text
+*.gif filter=lfs diff=lfs merge=lfs -text
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1 +0,0 @@
-* @edigaryev @fkorotkov
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1 +0,0 @@
-github: [cirruslabs]
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,37 +0,0 @@
-name: Build
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build_cached:
-    name: Build tart (cached)
-    runs-on: xcode-27
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v5
-      - name: Build
-        run: |
-          export COMPILATION_CACHE_ENABLE_CACHING=YES
-          export COMPILATION_CACHE_REMOTE_SERVICE_PATH="$HOME/.cirruslabs/omni-cache.sock"
-          export COMPILATION_CACHE_ENABLE_PLUGIN=YES
-          export COMPILATION_CACHE_ENABLE_INTEGRATED_QUERIES=YES
-          export COMPILATION_CACHE_ENABLE_DETACHED_KEY_QUERIES=YES
-          export SWIFT_ENABLE_COMPILE_CACHE=YES
-          export SWIFT_ENABLE_EXPLICIT_MODULES=YES
-          export SWIFT_USE_INTEGRATED_DRIVER=YES
-          export CLANG_ENABLE_COMPILE_CACHE=YES
-          export CLANG_ENABLE_MODULES=YES
-          swift build --build-system swiftbuild --product tart
-
-  build_no_cache:
-    name: Build tart (no cache)
-    runs-on: xcode-27
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v5
-      - name: Build
-        run: swift build --build-system swiftbuild --product tart
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -1,37 +0,0 @@
-name: CI
-
-on:
-  merge_group:
-  pull_request:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    name: Test
-    runs-on: xcode-27
-    timeout-minutes: 60
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version-file: integration-tests/go.mod
-          cache-dependency-path: integration-tests/go.sum
-      - name: Build
-        run: swift build --build-system swiftbuild
-      - name: Run unit tests
-        run: |
-          export PATH="$PATH:/usr/sbin"
-          swift test --build-system swiftbuild
-      # The Python suite boots Tart VMs, but hosted ARM macOS runners do not support nested virtualization.
-      - name: Run OpenTelemetry integration tests
-        run: |
-          bin_path="$(swift build --build-system swiftbuild --show-bin-path)"
-          codesign --sign - --entitlements Resources/tart-dev.entitlements --force "$bin_path/tart"
-          cd integration-tests
-          PATH="$bin_path:$PATH" go test -v ./...
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,111 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - "*"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  release:
-    if: github.event_name == 'push' && github.repository == 'openai/tart'
-    name: Release
-    runs-on: xcode-27
-    environment: publish
-    timeout-minutes: 90
-    permissions:
-      contents: read
-    env:
-      VERSION: ${{ github.ref_name }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Import signing certificate
-        env:
-          AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
-          KEYCHAIN_PASSWORD: temporary-password
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-          P12_PASSWORD: password101
-        run: |
-          echo "$MACOS_CERTIFICATE" | base64 --decode > "$RUNNER_TEMP/certificate.p12"
-          security create-keychain -p "$KEYCHAIN_PASSWORD" "$RUNNER_TEMP/build.keychain"
-          security set-keychain-settings -lut 21600 "$RUNNER_TEMP/build.keychain"
-          security default-keychain -s "$RUNNER_TEMP/build.keychain"
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" "$RUNNER_TEMP/build.keychain"
-          security import "$RUNNER_TEMP/certificate.p12" \
-            -k "$RUNNER_TEMP/build.keychain" \
-            -P "$P12_PASSWORD" \
-            -T /usr/bin/codesign \
-            -T /usr/bin/pkgbuild
-          security set-key-partition-list \
-            -S apple-tool:,apple:,codesign: \
-            -s \
-            -k "$KEYCHAIN_PASSWORD" \
-            "$RUNNER_TEMP/build.keychain"
-          security list-keychain -d user -s "$RUNNER_TEMP/build.keychain"
-          xcrun notarytool store-credentials "notarytool" \
-            --apple-id "hello@cirruslabs.org" \
-            --team-id "9M2P8L4D89" \
-            --password "$AC_PASSWORD" \
-            --keychain "$RUNNER_TEMP/build.keychain"
-      - name: Create release app token for this repo
-        id: app-token
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
-        with:
-          app-id: ${{ secrets.RELEASE_APP_ID }}
-          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-          permission-contents: write
-      - name: Create release app token for homebrew-tools
-        id: tap-token
-        uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
-        with:
-          app-id: ${{ secrets.RELEASE_APP_ID }}
-          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
-          owner: openai
-          repositories: homebrew-tools
-          permission-contents: write
-          permission-pull-requests: write
-      - name: Release
-        uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7
-        with:
-          distribution: goreleaser-pro
-          version: "~> v2"
-          args: release --clean
-        env:
-          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
-          HOMEBREW_TAP_GITHUB_TOKEN: ${{ steps.tap-token.outputs.token }}
-
-  snapshot:
-    if: github.event_name == 'workflow_dispatch'
-    name: Release (Dry Run)
-    runs-on: xcode-27
-    timeout-minutes: 90
-    permissions:
-      contents: read
-    env:
-      TART_RELEASE_SNAPSHOT: "true"
-      VERSION: snapshot
-    steps:
-      - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Build snapshot
-        uses: goreleaser/goreleaser-action@f06c13b6b1a9625abc9e6e439d9c05a8f2190e94 # v7
-        with:
-          distribution: goreleaser-pro
-          version: "~> v2"
-          args: release --skip=publish --snapshot --clean
-      - name: Upload snapshot artifacts
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: tart-snapshot
-          path: dist/*
--- a/.gitignore
+++ b/.gitignore
@ -8,17 +8,8 @@ tart.xcodeproj/
 # AppCode
 .idea/

-# VS Code
-.vscode/
-
 # Swift
 .build/

 # GoReleaser
 dist/
-
-# mkdocs
-.cache
-
-# mkdocs-material
-site
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@ -1,86 +1,40 @@
-version: 2
-
 project_name: tart

-before:
-  hooks:
-    - .ci/set-version.sh
-    - sh .ci/build-release.sh arm64
-    - sh .ci/build-release.sh x86_64
-
 builds:
-  - id: tart
-    builder: prebuilt
-    goamd64: [v1]
+  - builder: prebuilt
    goos:
      - darwin
    goarch:
      - arm64
-      - amd64
-    binary: tart.app/Contents/MacOS/tart
    prebuilt:
-      path: '.build/prebuilt/{{- if eq .Arch "arm64" }}arm64{{- else }}x86_64{{ end }}/tart'
+      path: .build/{{ .Arch }}-apple-macosx/release/tart

-universal_binaries:
-  - name_template: tart.app/Contents/MacOS/tart
-    replace: true
-    hooks:
-      post:
-        - mkdir -p dist/tart_darwin_all/tart.app/Contents/Resources
-        - cp Resources/embedded.provisionprofile dist/tart_darwin_all/tart.app/Contents/
-        - cp Resources/Info.plist dist/tart_darwin_all/tart.app/Contents/
-        - cp "Resources/actool/UPW Tart.icns" "Resources/actool/Assets.car" dist/tart_darwin_all/tart.app/Contents/Resources/
-        - cmd: .ci/sign-release.sh
-          output: true
+before:
+  hooks:
+    - .ci/set-version.sh
+    - swift build -c release --product tart
+    - codesign --sign - --entitlements Resources/tart.entitlements --force .build/arm64-apple-macosx/release/tart

 archives:
-  - name_template: "{{ .ProjectName }}"
-    files:
-      - src: dist/tart_darwin_all/tart.app/Contents/Info.plist
-        dst: tart.app/Contents/Info.plist
-      - src: dist/tart_darwin_all/tart.app/Contents/embedded.provisionprofile
-        dst: tart.app/Contents/embedded.provisionprofile
-      - src: dist/tart_darwin_all/tart.app/Contents/Resources/UPW Tart.icns
-        dst: tart.app/Contents/Resources/UPW Tart.icns
-      - src: dist/tart_darwin_all/tart.app/Contents/Resources/Assets.car
-        dst: tart.app/Contents/Resources/Assets.car
-      - src: dist/tart_darwin_all/tart.app/Contents/_CodeSignature/CodeResources
-        dst: tart.app/Contents/_CodeSignature/CodeResources
-      - LICENSE
+  - id: binary
+    format: binary
+    name_template: "{{ .ProjectName }}"
+  - id: regular
+    name_template: "{{ .ProjectName }}"

 release:
  prerelease: auto

 brews:
  - name: tart
-    directory: Formula
-    repository:
-      owner: openai
-      name: homebrew-tools
-      token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
-      branch: "tart-{{ .Version }}"
-      pull_request:
-        enabled: true
-    caveats: |
-      Tart has been installed. You might want to reduce the default DHCP lease time
-      from 86,400 to 600 seconds to avoid DHCP shortage when running lots of VMs daily:
-
-        sudo defaults write /Library/Preferences/SystemConfiguration/com.apple.InternetSharing.default.plist bootpd -dict DHCPLeaseTimeSecs -int 600
-
-      See https://tart.run/faq/#changing-the-default-dhcp-lease-time for more details.
-    homepage: https://github.com/openai/tart
-    license: FSL-1.1-ALv2
-    description: Run macOS and Linux VMs on Apple Hardware
+    ids:
+      - regular
+    tap:
+      owner: cirruslabs
+      name: homebrew-cli
+    caveats: See the Github repository for more information
+    homepage: https://github.com/cirruslabs/tart
+    description: Run macOS VMs on Apple Silicon
    skip_upload: auto
-    dependencies:
-      - "openai/tools/softnet"
-    install: |
-      libexec.install Dir["*"]
-      bin.write_exec_script "#{libexec}/tart.app/Contents/MacOS/tart"
    custom_block: |
-      on_macos do
-        depends_on :macos => :ventura
-      end
-      def post_install
-        generate_completions_from_executable(libexec/"tart.app/Contents/MacOS/tart", "--generate-completion-script")
-      end
+      depends_on :macos => :monterey
--- a/debug.run.xml
+++ b/debug.run.xml
@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="sign debug" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="codesign --sign - --entitlements Resources/tart.entitlements --force .build/debug/tart" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/scripts/sign.sh" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
--- a/create.run.xml
+++ b/create.run.xml
@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tart create" type="SwiftPackageManagerRunConfiguration" factoryName="Swift Package Run" PROGRAM_PARAMS="create latest --from-ipsw=latest" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="tart" TARGET_NAME="tart" CONFIG_NAME="tart" RUN_TARGET_PROJECT_NAME="tart" RUN_TARGET_NAME="tart" WAS_MODIFIED="">
+    <method v="2">
+      <option name="SPM.BUILD_TASK_PROVIDER" enabled="true" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="sign debug" run_configuration_type="ShConfigurationType" />
+    </method>
+  </configuration>
+</component>
--- a/run.run.xml
+++ b/run.run.xml
@ -0,0 +1,8 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tart run" type="SwiftPackageManagerRunConfiguration" factoryName="Swift Package Run" PROGRAM_PARAMS="run latest" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="tart" TARGET_NAME="tart" CONFIG_NAME="tart" RUN_TARGET_PROJECT_NAME="tart" RUN_TARGET_NAME="tart" WAS_MODIFIED="">
+    <method v="2">
+      <option name="SPM.BUILD_TASK_PROVIDER" enabled="true" />
+      <option name="RunConfigurationTask" enabled="true" run_configuration_name="sign debug" run_configuration_type="ShConfigurationType" />
+    </method>
+  </configuration>
+</component>
--- a/.swiftformat
+++ b/.swiftformat
@ -1,5 +0,0 @@
--disable all
--enable indent
--indent 2
--exclude Sources/tart/OCI/Reference/Generated
--swiftversion 5.7
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,41 +0,0 @@
-# Contributing to Tart
-
-Table of Contents
-----------------
-
- [How to Build](#how-to-build)
- [How to Create an Issue/Enhancement](#how-to-create-an-issueenhancement)
- [Style Guidelines](#style-guidelines)
- [Pull Requests](#Pull-Requests)
-
-## How to Build
-
-1. Fork the repository to your own GitHub account
-2. Clone the forked repository to your local machine
-3. If using Xcode, use from Xcode 15 or newer
-4. Run ./scripts/run-signed.sh from the root of your repository
-
-```bash
-./scripts/run-signed.sh list
-```
-## How to Create an Issue/Enhancement
-
-1. Go to the [Issue page](https://github.com/openai/tart/issues) of the repository
-2. Click on the "New Issue" button
-3. Provide a descriptive title and detailed description of the issue or enhancement you're suggesting
-4. Submit the issue
-
-## Style Guidelines
-
-1. Code should follow camel case
-2. Code should follow [SwiftFormat](https://github.com/nicklockwood/SwiftFormat#swift-package-manager-plugin) guidelines. You can auto-format the code by running the following command:
-
-```bash
-swift package plugin --allow-writing-to-package-directory swiftformat --cache ignore .
-```
-
-## Pull Requests
-
-1. Provide a detailed description of the changes you made in the pull request
-2. Wait for pull request to be reviewed 
-3. Make adjustments if necessary
--- a/692
+++ b/692
@ -1,105 +1,661 @@
-# Functional Source License, Version 1.1, ALv2 Future License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007

-## Abbreviation
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-FSL-1.1-ALv2
+                            Preamble

-## Notice
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.

-Copyright 2022-2026 OpenAI
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.

-## Terms and Conditions
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.

-### Licensor ("We")
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.

-The party offering the Software under these Terms and Conditions.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.

-### The Software
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.

-The "Software" is each version of the software that we make available under
-these Terms and Conditions, as indicated by our inclusion of these Terms and
-Conditions with the Software.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.

-### License Grant
+  The precise terms and conditions for copying, distribution and
+modification follow.

-Subject to your compliance with this License Grant and the Patents,
-Redistribution and Trademark clauses below, we hereby grant you the right to
-use, copy, modify, create derivative works, publicly perform, publicly display
-and redistribute the Software for any Permitted Purpose identified below.
+                       TERMS AND CONDITIONS

-### Permitted Purpose
+  0. Definitions.

-A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
-means making the Software available to others in a commercial product or
-service that:
+  "This License" refers to version 3 of the GNU Affero General Public License.

-1. substitutes for the Software;
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.

-2. substitutes for any other product or service we offer using the Software
-   that exists as of the date we make the Software available; or
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.

-3. offers the same or substantially similar functionality as the Software.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.

-Permitted Purposes specifically include using the Software:
+  A "covered work" means either the unmodified Program or a work based
+on the Program.

-1. for your internal use and access;
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.

-2. for non-commercial education;
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.

-3. for non-commercial research; and
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.

-4. in connection with professional services that you provide to a licensee
-   using the Software in accordance with these Terms and Conditions.
+  1. Source Code.

-### Patents
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.

-To the extent your use for a Permitted Purpose would necessarily infringe our
-patents, the license grant above includes a license under our patents. If you
-make a claim against any party that the Software infringes or contributes to
-the infringement of any patent, then your patent license to the Software ends
-immediately.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.

-### Redistribution
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.

-The Terms and Conditions apply to all copies, modifications and derivatives of
-the Software.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.

-If you redistribute any copies, modifications or derivatives of the Software,
-you must include a copy of or a link to these Terms and Conditions and not
-remove any copyright notices provided in or with the Software.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.

-### Disclaimer
+  The Corresponding Source for a work in source code form is that
+same work.

-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
-PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+  2. Basic Permissions.

-IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
-SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.

-### Trademarks
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.

-Except for displaying the License Details and identifying us as the origin of
-the Software, you have no right under these Terms and Conditions to use our
-trademarks, trade names, service marks or product names.
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.

-## Grant of Future License
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.

-We hereby irrevocably grant you an additional license to use the Software under
-the Apache License, Version 2.0 that is effective on the second anniversary of
-the date we make the Software available. On or after that date, you may use the
-Software under the Apache License, Version 2.0, in which case the following
-will apply:
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.

-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.

-You may obtain a copy of the License at
+  4. Conveying Verbatim Copies.

-http://www.apache.org/licenses/LICENSE-2.0
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.

-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
--- a/PROFILING.md
+++ b/PROFILING.md
@ -1,64 +0,0 @@
-# Profiling Tart
-
-## Using `time(1)`
-
-Perhaps, the easiest, but not the most comprehensive way to tell what's going on with Tart is to use the [`time(1)`](https://ss64.com/mac/time.html) command.
-
-In the example below, you will run `tart pull` via `time(1)` to gather generalized CPU, I/O and memory usage metrics:
-
-```shell
-/usr/bin/time -l tart pull ghcr.io/cirruslabs/macos-tahoe-base:latest
-```
-
-**Note:** you need to specify a full path to `time(1)` binary, otherwise the shell's built-in `time` command will be invoked, which doesn't have the `-l` command-line argument.
-
-**Note:** The `-l` command-line argument makes `time(1)` return much more useful information, for example, maximum memory usage.
-
-When running the command above, you'll see the `tart pull` output first as it pulls the image, and then the `time(1)` output, which will be printed once the Tart process finishes:
-
-```
-      172.17 real        10.29 user         8.36 sys
-           353796096  maximum resident set size
-                   0  average shared memory size
-                   0  average unshared data size
-                   0  average unshared stack size
-               23838  page reclaims
-                  35  page faults
-                   0  swaps
-                   0  block input operations
-                   0  block output operations
-                   8  messages sent
-                   8  messages received
-                   0  signals received
-                 146  voluntary context switches
-              222950  involuntary context switches
-         39683070975  instructions retired
-         27562035252  cycles elapsed
-           170920448  peak memory footprint
-```
-
-From the output above, you can tell that `tart pull` spent nearly 90% of time off-CPU (`real` > `user` + `sys`), which means that Tart was mostly waiting for the I/O (be it a network or disk), instead of decompressing disk layers or doing other useful computations.
-
-## Using `xctrace(1)`
-
-[`xctrace(1)`](https://keith.github.io/xcode-man-pages/xctrace.1.html) is a `.trace` format recorder for the [Instruments](https://en.wikipedia.org/wiki/Instruments_(software)) app, which yields much more powerful insights compared to `time(1)`. For example, it can tell which Tart functions spent the most time on the CPU, thus allowing the Tart developers to further optimize these functions.
-
-To use it, make sure that [Xcode](https://developer.apple.com/xcode/resources/) is installed. If you're installing Xcode for the first time on the machine, you'll need to launch it once and click the blue "Install" button. There's no need to choose any platforms except for the macOS.
-
-Once done, you can create a CPU profile of `tart pull`:
-
-```shell
-xctrace record --template "CPU Profiler" --target-stdout - --launch -- /opt/homebrew/bin/tart pull ghcr.io/cirruslabs/macos-tahoe-base:latest
-```
-
-Now that `xctrace(1)` is running, you'll see the `tart pull`-related output first, and once finished, the following line will appear:
-
-```
-Output file saved as: Launch_[...].trace
-```
-
-To view this trace in the Instruments app, simply find this directory in Finder and double-click it. Instruments app will appear:
-
-![](Resources/Instruments.png)
-
-To send this trace, right-click its directory in Finder and choose "Compress [...]". This will result in a similarly named file with a `.zip` at the end, which can now be conveniently sent via email or uploaded.
--- a/Package.resolved
+++ b/Package.resolved
@ -1,31 +1,12 @@
 {
-  "originHash" : "061dfe6cdf4e6dbf32b51c5e7023c4ae69726dcafb42a35b34e5489b0338c17f",
  "pins" : [
    {
-      "identity" : "antlr4",
+      "identity" : "async-http-client",
      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/antlr/antlr4",
+      "location" : "https://github.com/swift-server/async-http-client",
      "state" : {
-        "revision" : "cc82115a4e7f53d71d9d905caa2c2dfa4da58899",
-        "version" : "4.13.2"
-      }
-    },
-    {
-      "identity" : "cirruslabs_tart-guest-agent_apple_swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://buf.build/gen/swift/git/1.33.3-20260114140118-bd09c26a260f.1/cirruslabs_tart-guest-agent_apple_swift.git",
-      "state" : {
-        "revision" : "5c49a653f4b003161077d194bc708b7373628c99",
-        "version" : "1.33.3-20260114140118-bd09c26a260f.1"
-      }
-    },
-    {
-      "identity" : "cirruslabs_tart-guest-agent_grpc_swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://buf.build/gen/swift/git/1.27.1-20260114140118-bd09c26a260f.1/cirruslabs_tart-guest-agent_grpc_swift.git",
-      "state" : {
-        "branch" : "main",
-        "revision" : "4935078c2fe2508360843596d71a1f844ce639a6"
+        "revision" : "24425989dadab6d6e4167174791a23d4e2a6d0c3",
+        "version" : "1.10.0"
      }
    },
    {
@ -37,103 +18,22 @@
        "revision" : "772883073d044bc754d401cabb6574624eb3778f"
      }
    },
-    {
-      "identity" : "grpc-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/grpc/grpc-swift.git",
-      "state" : {
-        "revision" : "8f57f68b9d247fe3759fa9f18e1fe919911e6031",
-        "version" : "1.27.1"
-      }
-    },
-    {
-      "identity" : "opentelemetry-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/open-telemetry/opentelemetry-swift",
-      "state" : {
-        "branch" : "main",
-        "revision" : "ed37be9525081509ab62410d38b705c2b3f0d5a4"
-      }
-    },
-    {
-      "identity" : "opentelemetry-swift-core",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/open-telemetry/opentelemetry-swift-core.git",
-      "state" : {
-        "revision" : "240c8d5e36c3c7b774ed961325369f0b1f2c965f",
-        "version" : "2.3.0"
-      }
-    },
-    {
-      "identity" : "opentracing-objc",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/undefinedlabs/opentracing-objc",
-      "state" : {
-        "revision" : "18c1a35ca966236cee0c5a714a51a73ff33384c1",
-        "version" : "0.5.2"
-      }
-    },
-    {
-      "identity" : "semaphore",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/groue/Semaphore",
-      "state" : {
-        "revision" : "2543679282aa6f6c8ecf2138acd613ed20790bc2",
-        "version" : "0.1.0"
-      }
-    },
-    {
-      "identity" : "swift-algorithms",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-algorithms",
-      "state" : {
-        "revision" : "f6919dfc309e7f1b56224378b11e28bab5bccc42",
-        "version" : "1.2.0"
-      }
-    },
    {
      "identity" : "swift-argument-parser",
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-argument-parser",
      "state" : {
-        "revision" : "309a47b2b1d9b5e991f36961c983ecec72275be3",
-        "version" : "1.6.1"
+        "revision" : "f3c9084a71ef4376f2fabbdf1d3d90a49f1fabdb",
+        "version" : "1.1.2"
      }
    },
    {
-      "identity" : "swift-atomics",
+      "identity" : "swift-case-paths",
      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-atomics.git",
+      "location" : "https://github.com/pointfreeco/swift-case-paths",
      "state" : {
-        "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7",
-        "version" : "1.3.0"
-      }
-    },
-    {
-      "identity" : "swift-collections",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-collections.git",
-      "state" : {
-        "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7",
-        "version" : "1.1.4"
-      }
-    },
-    {
-      "identity" : "swift-http-structured-headers",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-http-structured-headers.git",
-      "state" : {
-        "revision" : "db6eea3692638a65e2124990155cd220c2915903",
-        "version" : "1.3.0"
-      }
-    },
-    {
-      "identity" : "swift-http-types",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-http-types.git",
-      "state" : {
-        "revision" : "a0a57e949a8903563aba4615869310c0ebf14c03",
-        "version" : "1.4.0"
+        "revision" : "ce9c0d897db8a840c39de64caaa9b60119cf4be8",
+        "version" : "0.8.1"
      }
    },
    {
@ -141,17 +41,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-log.git",
      "state" : {
-        "revision" : "2778fd4e5a12a8aaa30a3ee8285f4ce54c5f3181",
-        "version" : "1.9.1"
-      }
-    },
-    {
-      "identity" : "swift-metrics",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-metrics.git",
-      "state" : {
-        "revision" : "0743a9364382629da3bf5677b46a2c4b1ce5d2a6",
-        "version" : "2.7.1"
+        "revision" : "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
+        "version" : "1.4.2"
      }
    },
    {
@ -159,8 +50,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-nio.git",
      "state" : {
-        "revision" : "233f61bc2cfbb22d0edeb2594da27a20d2ce514e",
-        "version" : "2.93.0"
+        "revision" : "124119f0bb12384cef35aa041d7c3a686108722d",
+        "version" : "2.40.0"
      }
    },
    {
@ -168,8 +59,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-nio-extras.git",
      "state" : {
-        "revision" : "f1f6f772198bee35d99dd145f1513d8581a54f2c",
-        "version" : "1.26.0"
+        "revision" : "8eea84ec6144167354387ef9244b0939f5852dc8",
+        "version" : "1.11.0"
      }
    },
    {
@ -177,8 +68,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-nio-http2.git",
      "state" : {
-        "revision" : "4281466512f63d1bd530e33f4aa6993ee7864be0",
-        "version" : "1.36.0"
+        "revision" : "72bcaf607b40d7c51044f65b0f5ed8581a911832",
+        "version" : "1.21.0"
      }
    },
    {
@ -186,8 +77,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-nio-ssl.git",
      "state" : {
-        "revision" : "4b38f35946d00d8f6176fe58f96d83aba64b36c7",
-        "version" : "2.31.0"
+        "revision" : "1750873bce84b4129b5303655cce2c3d35b9ed3a",
+        "version" : "2.19.0"
      }
    },
    {
@ -195,109 +86,28 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apple/swift-nio-transport-services.git",
      "state" : {
-        "revision" : "cd1e89816d345d2523b11c55654570acd5cd4c56",
-        "version" : "1.24.0"
+        "revision" : "1a4692acb88156e3da1b0c6732a8a38b2a744166",
+        "version" : "1.12.0"
      }
    },
    {
-      "identity" : "swift-numerics",
+      "identity" : "swift-parsing",
      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-numerics",
+      "location" : "https://github.com/pointfreeco/swift-parsing",
      "state" : {
-        "revision" : "0a5bc04095a675662cf24757cc0640aa2204253b",
-        "version" : "1.0.2"
+        "revision" : "28d32e9ace1c4c43f5e5a177be837a202494c2d5",
+        "version" : "0.9.2"
      }
    },
    {
-      "identity" : "swift-protobuf",
+      "identity" : "xctest-dynamic-overlay",
      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-protobuf.git",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
      "state" : {
-        "revision" : "c169a5744230951031770e27e475ff6eefe51f9d",
-        "version" : "1.33.3"
-      }
-    },
-    {
-      "identity" : "swift-retry",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/fumoboy007/swift-retry",
-      "state" : {
-        "revision" : "df9d7b185d2e433147ec0083a73c257e665eea0d",
-        "version" : "0.2.4"
-      }
-    },
-    {
-      "identity" : "swift-sysctl",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/sersoft-gmbh/swift-sysctl.git",
-      "state" : {
-        "revision" : "a91be36de6803ebe48f678699dfd0694c2200d2f",
-        "version" : "1.8.0"
-      }
-    },
-    {
-      "identity" : "swift-system",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-system.git",
-      "state" : {
-        "revision" : "a34201439c74b53f0fd71ef11741af7e7caf01e1",
-        "version" : "1.4.2"
-      }
-    },
-    {
-      "identity" : "swift-xattr",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/jozefizso/swift-xattr",
-      "state" : {
-        "revision" : "f8605af7b3290dbb235fb182ec6e9035d0c8c3ac",
-        "version" : "3.0.0"
-      }
-    },
-    {
-      "identity" : "swiftdate",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/malcommac/SwiftDate",
-      "state" : {
-        "revision" : "5d943224c3bb173e6ecf27295611615eba90c80e",
-        "version" : "7.0.0"
-      }
-    },
-    {
-      "identity" : "swiftformat",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/nicklockwood/SwiftFormat",
-      "state" : {
-        "revision" : "ab6844edb79a7b88dc6320e6cee0a0db7674dac3",
-        "version" : "0.54.5"
-      }
-    },
-    {
-      "identity" : "swiftradix",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/orchetect/SwiftRadix",
-      "state" : {
-        "revision" : "a52c37a4c213403f7377ae77b4c68451bcab8330",
-        "version" : "1.3.1"
-      }
-    },
-    {
-      "identity" : "texttable",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/cfilipov/TextTable",
-      "state" : {
-        "branch" : "master",
-        "revision" : "e03289289155b4e7aa565e32862f9cb42140596a"
-      }
-    },
-    {
-      "identity" : "thrift-swift",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/undefinedlabs/Thrift-Swift",
-      "state" : {
-        "revision" : "18ff09e6b30e589ed38f90a1af23e193b8ecef8e",
-        "version" : "1.1.2"
+        "revision" : "50a70a9d3583fe228ce672e8923010c8df2deddd",
+        "version" : "0.2.1"
      }
    }
  ],
-  "version" : 3
+  "version" : 2
 }
--- a/Package.swift
+++ b/Package.swift
@ -1,62 +1,28 @@
-// swift-tools-version:5.10
+// swift-tools-version:5.6

 import PackageDescription
 let package = Package(
  name: "Tart",
  platforms: [
-    .macOS(.v13)
+    .macOS(.v12)
  ],
  products: [
    .executable(name: "tart", targets: ["tart"])
  ],
  dependencies: [
-    .package(url: "https://github.com/apple/swift-argument-parser", from: "1.6.1"),
+    .package(url: "https://github.com/apple/swift-argument-parser", from: "1.1.2"),
    .package(url: "https://github.com/mhdhejazi/Dynamic", branch: "master"),
-    .package(url: "https://github.com/apple/swift-algorithms", from: "1.2.0"),
-    .package(url: "https://github.com/malcommac/SwiftDate", from: "7.0.0"),
-    .package(url: "https://github.com/antlr/antlr4", exact: "4.13.2"),
-    .package(url: "https://github.com/apple/swift-atomics.git", .upToNextMajor(from: "1.2.0")),
-    .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.53.6"),
-    .package(url: "https://github.com/cfilipov/TextTable", branch: "master"),
-    .package(url: "https://github.com/sersoft-gmbh/swift-sysctl.git", from: "1.8.0"),
-    .package(url: "https://github.com/orchetect/SwiftRadix", from: "1.3.1"),
-    .package(url: "https://github.com/groue/Semaphore", from: "0.0.8"),
-    .package(url: "https://github.com/fumoboy007/swift-retry", from: "0.2.3"),
-    .package(url: "https://github.com/jozefizso/swift-xattr", from: "3.0.0"),
-    .package(url: "https://github.com/grpc/grpc-swift.git", .upToNextMajor(from: "1.27.0")),
-    .package(url: "https://buf.build/gen/swift/git/1.27.1-20260114140118-bd09c26a260f.1/cirruslabs_tart-guest-agent_grpc_swift.git", branch: "main"),
-    .package(url: "https://github.com/open-telemetry/opentelemetry-swift", branch: "main"),
-    .package(url: "https://github.com/open-telemetry/opentelemetry-swift-core", from: "2.3.0"),
-
+    .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.9.2"),
+    .package(url: "https://github.com/swift-server/async-http-client", from: "1.10.0"),
  ],
  targets: [
    .executableTarget(name: "tart", dependencies: [
-      .product(name: "Algorithms", package: "swift-algorithms"),
      .product(name: "ArgumentParser", package: "swift-argument-parser"),
+      .product(name: "AsyncHTTPClient", package: "async-http-client"),
      .product(name: "Dynamic", package: "Dynamic"),
-      .product(name: "SwiftDate", package: "SwiftDate"),
-      .product(name: "Antlr4Static", package: "Antlr4"),
-      .product(name: "Atomics", package: "swift-atomics"),
-      .product(name: "TextTable", package: "TextTable"),
-      .product(name: "Sysctl", package: "swift-sysctl"),
-      .product(name: "SwiftRadix", package: "SwiftRadix"),
-      .product(name: "Semaphore", package: "Semaphore"),
-      .product(name: "DMRetry", package: "swift-retry"),
-      .product(name: "XAttr", package: "swift-xattr"),
-      .product(name: "GRPC", package: "grpc-swift"),
-      .product(name: "Cirruslabs_TartGuestAgent_Grpc_Swift", package: "cirruslabs_tart-guest-agent_grpc_swift"),
-      .product(name: "OpenTelemetryApi", package: "opentelemetry-swift-core"),
-      .product(name: "OpenTelemetrySdk", package: "opentelemetry-swift-core"),
-      .product(name: "OpenTelemetryProtocolExporterHTTP", package: "opentelemetry-swift"),
-      .product(name: "ResourceExtension", package: "opentelemetry-swift"),
-    ], exclude: [
-      "OCI/Reference/Makefile",
-      "OCI/Reference/Reference.g4",
-      "OCI/Reference/Generated/Reference.interp",
-      "OCI/Reference/Generated/Reference.tokens",
-      "OCI/Reference/Generated/ReferenceLexer.interp",
-      "OCI/Reference/Generated/ReferenceLexer.tokens",
+      .product(name: "Parsing", package: "swift-parsing"),
    ]),
    .testTarget(name: "TartTests", dependencies: ["tart"])
  ]
 )
+
--- a/README.md
+++ b/README.md
@ -1,59 +1,193 @@
-<img src="https://github.com/openai/tart/raw/main/Resources/TartSocial.png"/>
+![Tart – open source virtualization for your automation needs](Resources/TartSocial.png)

-*Tart* is a virtualization toolset to build, run and manage macOS and Linux virtual machines (VMs) on Apple Silicon.
+*Tart* is a virtualization toolset to build, run and manage virtual machines on Apple Silicon.
 Built by CI engineers for your automation needs. Here are some highlights of Tart:

-* Tart uses Apple's own `Virtualization.Framework` for [near-native performance](https://browser.geekbench.com/v5/cpu/compare/20382844?baseline=20382722).
+* Tart uses Apple's own `Virtualization.Framework` for [near-native performance](https://browser.geekbench.com/v5/cpu/compare/14966395?baseline=14966339).
 * Push/Pull virtual machines from any OCI-compatible container registry.
 * Use Tart Packer Plugin to automate VM creation.
-* Easily integrates with any CI system.
+* Built-in CI integration.

-Many companies are using Tart in their internal setups. Here are just a few of them:
+Try running a Tart VM on your Apple Silicon device running macOS Monterey or later (will download a 25 GB image):

-<p align="center">
-  <a href="https://atlassian.com/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/Atlassian.png" height="65"/>
-  </a>
-  <a href="https://www.figma.com/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/Figma.png" height="65"/>
-  </a>
-  <a href="https://mullvad.net/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/Mullvad.png" height="65"/>
-  </a>
-  <a href="https://krisp.ai/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/Krisp.png" height="65"/>
-  </a>
-  <a href="https://testingbot.com/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/TestingBot.png" height="65"/>
-  </a>
-  <a href="https://symflower.com/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/Symflower.png" height="65"/>
-  </a>
-  <a href="https://transloadit.com/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/Transloadit.png" height="65"/>
-  </a>
-  <a href="https://cirrus-ci.org/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/CirrusCI.png" height="65"/>
-  </a>
-  <a href="https://www.pitsdatarecovery.net/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/PITSGlobalDataRecoveryServices.png" height="65"/>
-  </a>
-  <a href="https://expo.dev/" target=_blank>
-    <img src="https://github.com/openai/tart/raw/main/Resources/Users/Expo.png" height="65"/>
-  </a>
-</p>
-
-**Note:** If your company or project is using Tart please consider [sharing with the community](https://github.com/openai/tart/discussions/857).
-
-## Usage
-
-Try running a Tart VM on your Apple Silicon device running macOS 13.0 (Ventura) or later (will download a 25 GB image):
-
-```bash
-brew install openai/tools/tart
-tart clone ghcr.io/cirruslabs/macos-tahoe-base:latest tahoe-base
-tart run tahoe-base
+```shell
+brew install cirruslabs/cli/tart
+tart clone ghcr.io/cirruslabs/macos-monterey-base:latest monterey-base
+tart run monterey-base
 ```

-Please check the [official documentation](https://tart.run) for more information and/or feel free to use [discussions](https://github.com/openai/tart/discussions)
-for remaining questions.
+![tart VM view app](Resources/TartScreenshot.png)
+
+## CI Integration
+
+Tart itself is only responsible for managing virtual machines, but we've built Tart support into a tool called Cirrus CLI
+also developed by Cirrus Labs. [Cirrus CLI](https://github.com/cirruslabs/cirrus-cli) is a command line tool with
+one configuration format to execute common CI steps (run a script, cache a folder, etc.) locally or in any CI system.
+We built Cirrus CLI to solve "But it works on my machine!" problem.
+
+Here is an example of a `.cirrus.yml` configuration file which will start a Tart VM, will copy over working directory and
+will run scripts and [other instructions](https://cirrus-ci.org/guide/writing-tasks/#supported-instructions) inside the virtual machine:
+
+```yaml
+task:
+  name: hello
+  macos_instance:
+    # can be a remote or a local virtual machine
+    image: ghcr.io/cirruslabs/macos-monterey-base:latest
+  hello_script:
+    - echo "Hello from within a Tart VM!"
+    - echo "Here is my CPU info:"
+    - sysctl -n machdep.cpu.brand_string
+    - sleep 15
+```
+
+Put the above `.cirrus.yml` file in the root of your repository and run it with the following command:
+
+```shell
+brew install cirruslabs/cli/cirrus
+cirrus run
+```
+
+![Cirrus CLI Run](Resources/TartCirrusCLI.gif)
+
+[Cirrus CI](https://cirrus-ci.org/) already leverages Tart to power its macOS cloud infrastructure. The `.cirrus.yml`
+config from above will just work in Cirrus CI and your tasks will be executed inside Tart VMs in our cloud.
+
+**Note:** Cirrus CI only allows [images managed and regularly updated by us](https://github.com/orgs/cirruslabs/packages?tab=packages&q=macos).
+
+## Virtual Machine Management
+
+### Creating from scratch
+
+Tart can create VMs from `*.ipsw` files. You can download a specific `*.ipsw` file [here](https://ipsw.me/) or you can
+use `latest` instead of a path to `*.ipsw` to download the latest available version:
+
+```shell
+tart create --from-ipsw=latest monterey-vanilla
+tart run monterey-vanilla
+```
+
+After the initial booting of the VM you'll need to manually go through the macOS installation process. As a convention we recommend creating an `admin` user with an `admin` password. After the regular installation please do some additional modifications in the VM:
+
+1. Enable Auto-Login. Users & Groups -> Login Options -> Automatic login -> admin.
+2. Allow SSH. Sharing -> Remote Login
+3. Disable Lock Screen. Preferences -> Lock Screen -> disable "Require Password" after 5.
+4. Disable Screen Saver.
+5. Run `sudo visudo` in Terminal, find `%admin ALL=(ALL) ALL` add `admin ALL=(ALL) NOPASSWD: ALL` to allow sudo without a password.
+
+### Configuring a VM
+
+By default, a tart VM uses 2 CPUs and 4 GB of memory with a `1024x768` display. This can be changed with `tart set` command.
+Please refer to `tart set --help` for additional details.
+
+### Building with Packer
+
+Please refer to [Tart Packer Plugin repository](https://github.com/cirruslabs/packer-plugin-tart) for setup instructions.
+Here is an example of a template to build `monterey-base` local image based of a remote image:
+
+```json
+{
+  "builders": [
+    {
+      "name": "tart",
+      "type": "tart-cli",
+      "vm_base_name": "tartvm/vanilla:latest",
+      "vm_name": "monterey-base",
+      "cpu_count": 4,
+      "memory_gb": 8,
+      "disk_size_gb": 32,
+      "ssh_username": "admin",
+      "ssh_password": "admin",
+      "ssh_timeout": "120s"
+    }
+  ],
+  "provisioners": [
+    {
+      "inline": [
+        "echo 'Disabling spotlight indexing...'",
+        "sudo mdutil -a -i off"
+      ],
+      "type": "shell"
+    },
+    # more provisioners
+  ]
+}
+```
+
+Here is a [repository with Packer templates](https://github.com/cirruslabs/macos-image-templates) used to build [all the images managed by us](https://github.com/orgs/cirruslabs/packages?tab=packages&q=macos).
+
+### Working with a Remote OCI Container Registry
+
+For example, let's say you want to push/pull images to a registry hosted at https://acme.io/.
+
+#### Registry Authorization
+
+First, you need to log in and save credential for `acme.io` host via `tart login` command:
+
+```shell
+tart login acme.io
+```
+
+Credentials are securely stored in Keychain.
+
+#### Pushing a Local Image
+
+Once credentials are saved for `acme.io`, run the following command to push a local images remotely with two tags:
+
+```shell
+tart push my-local-vm-name acme.io/remoteorg/name:latest acme.io/remoteorg/name:v1.0.0
+```
+
+#### Pulling a Remote Image
+
+```shell
+tart pull acme.io/remoteorg/name:latest my-local-vm-name
+```
+
+## FAQ
+
+<details>
+  <summary>How Tart is different from Anka</summary>
+
+  Under the hood Tart is using the same technology as Anka 3.0 so there should be no real difference in performance
+  or features supported. If there is some feature missing please don't hesitate to [create a feature request](https://github.com/cirruslabs/tart/issues).
+
+  Instead of Anka Registry, Tart can work with any OCI-compatible container registry.
+
+  Tart doesn't yet have an analogue of Anka Controller for managing long living VMs. Please take a look at [CI integration](#ci-integration)
+  section for an option to run ephemeral VMs for your needs.
+</details>
+
+<details>
+  <summary>Why Tart is free and open sourced?</summary>
+
+  Tart is a relatively small project, and it didn't feel right to try to monetize it.
+  Apple did all the heavy lifting with their `Virtualization.Framework`.
+</details>
+
+<details>
+  <summary>How to change VM's disk size?</summary>
+
+  You can choose disk size upon creation of a virtual machine:
+
+  ```shell
+  tart create --from-ipsw=latest --disk-size=25 monterey-vanilla
+  ```
+
+  For an existing VM please use [Packer Plugin](https://github.com/cirruslabs/packer-plugin-tart) which can increase
+  disk size for new virtual machines. Here is an example of [how to change disk size in a Packer template](https://github.com/cirruslabs/macos-image-templates/blob/fb0bcf68e0b093129136875c050205a66729b596/templates/base.pkr.hcl#L15).
+</details>
+
+<details>
+  <summary>VM location on disk</summary>
+
+  Tart stores all it's files in `~/.tart/` directory. Local images that you can run are stored in `~/.tart/vms/`.
+  Remote images are pulled into `~/.tart/vms/cache/OCIs/`.
+</details>
+
+<details>
+  <summary>Nested virtualization support?</summary>
+
+  Tart is limited by functionality of Apple's `Virtualization.Framework`. At the moment `Virtualization.Framework`
+  doesn't support nested virtualization.
+</details>
--- a/Resources/AppIcon.png
+++ b/Resources/AppIcon.png
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fe96aed7a965b075300f092a3ca76e09053eb7cf2f3125c3a819098a8bc4b31
+size 123360
--- a/Resources/CirrusRunnersForGHA.png
+++ b/Resources/CirrusRunnersForGHA.png
--- a/Resources/Info.plist
+++ b/Resources/Info.plist
@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>Tart</string>
-	<key>CFBundleDisplayName</key>
-	<string>Tart</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.github.cirruslabs.tart</string>
-	<key>CFBundleExecutable</key>
-	<string>tart</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>LSApplicationCategoryType</key>
-	<string>public.app-category.developer-tools</string>
-	<key>CFBundleIconFile</key>
-	<string>UPW Tart</string>
-	<key>CFBundleIconName</key>
-	<string>UPW Tart</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
-  <key>NSLocalNetworkUsageDescription</key>
-  <string>Access to OCI registries on the local network</string>
-</dict>
-</plist>
--- a/Resources/Instruments.png
+++ b/Resources/Instruments.png
--- a/Resources/TartCirrusCLI.gif
+++ b/Resources/TartCirrusCLI.gif
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a3a324193c4bd7797102765ab16f44adf58e49ca615bac3963cefd0d3a10594
+size 339678
--- a/Resources/TartScreenshot.png
+++ b/Resources/TartScreenshot.png
--- a/Resources/TartSocial.png
+++ b/Resources/TartSocial.png
--- a/Tart.icon/Assets/1.1-–-layer.png
+++ b/Tart.icon/Assets/1.1-–-layer.png
--- a/Tart.icon/Assets/2.2-–-layer.png
+++ b/Tart.icon/Assets/2.2-–-layer.png
--- a/Tart.icon/Assets/3.3-–-layer.png
+++ b/Tart.icon/Assets/3.3-–-layer.png
--- a/Tart.icon/Assets/4.4-–-layer.png
+++ b/Tart.icon/Assets/4.4-–-layer.png
--- a/Tart.icon/Assets/UPW
+++ b/Tart.icon/Assets/UPW
--- a/Tart.icon/Assets/UPW
+++ b/Tart.icon/Assets/UPW
--- a/Tart.icon/Assets/UPW
+++ b/Tart.icon/Assets/UPW
--- a/Tart.icon/Assets/UPW
+++ b/Tart.icon/Assets/UPW
--- a/Tart.icon/icon.json
+++ b/Tart.icon/icon.json
@ -1,140 +0,0 @@
-{
-  "fill" : "automatic",
-  "groups" : [
-    {
-      "blend-mode" : "normal",
-      "blur-material" : 0.5,
-      "layers" : [
-        {
-          "hidden" : false,
-          "image-name-specializations" : [
-            {
-              "value" : "4.4-–-layer.png"
-            },
-            {
-              "idiom" : "square",
-              "value" : "UPW Tart L4.png"
-            }
-          ],
-          "name" : "UPW Tart L4"
-        }
-      ],
-      "opacity" : 1,
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 1
-      },
-      "specular" : true,
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.25
-      }
-    },
-    {
-      "layers" : [
-        {
-          "image-name-specializations" : [
-            {
-              "value" : "3.3-–-layer.png"
-            },
-            {
-              "idiom" : "square",
-              "value" : "UPW Tart L3.png"
-            }
-          ],
-          "name" : "UPW Tart L3",
-          "position-specializations" : [
-            {
-              "idiom" : "square",
-              "value" : {
-                "scale" : 1,
-                "translation-in-points" : [
-                  0,
-                  0
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "shadow" : {
-        "kind" : "none",
-        "opacity" : 1
-      },
-      "specular" : false,
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.25
-      }
-    },
-    {
-      "blur-material" : null,
-      "layers" : [
-        {
-          "image-name-specializations" : [
-            {
-              "value" : "2.2-–-layer.png"
-            },
-            {
-              "idiom" : "square",
-              "value" : "UPW Tart L2.png"
-            }
-          ],
-          "name" : "UPW Tart L2"
-        }
-      ],
-      "position-specializations" : [
-        {
-          "idiom" : "square",
-          "value" : {
-            "scale" : 1,
-            "translation-in-points" : [
-              0,
-              0
-            ]
-          }
-        }
-      ],
-      "shadow" : {
-        "kind" : "none",
-        "opacity" : 1
-      },
-      "specular" : true,
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.25
-      }
-    },
-    {
-      "layers" : [
-        {
-          "image-name-specializations" : [
-            {
-              "value" : "1.1-–-layer.png"
-            },
-            {
-              "idiom" : "square",
-              "value" : "UPW Tart L1.png"
-            }
-          ],
-          "name" : "UPW Tart L1"
-        }
-      ],
-      "shadow" : {
-        "kind" : "layer-color",
-        "opacity" : 0.5
-      },
-      "specular" : true,
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.25
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}
--- a/Resources/Users/Atlassian.png
+++ b/Resources/Users/Atlassian.png
--- a/Resources/Users/Background.png
+++ b/Resources/Users/Background.png
--- a/Resources/Users/CirrusCI.png
+++ b/Resources/Users/CirrusCI.png
--- a/Resources/Users/Codemagic.png
+++ b/Resources/Users/Codemagic.png
--- a/Resources/Users/Expo.png
+++ b/Resources/Users/Expo.png
--- a/Resources/Users/Figma.png
+++ b/Resources/Users/Figma.png
--- a/Resources/Users/Krisp.png
+++ b/Resources/Users/Krisp.png
--- a/Resources/Users/Mullvad.png
+++ b/Resources/Users/Mullvad.png
--- a/Resources/Users/PITSGlobalDataRecoveryServices.png
+++ b/Resources/Users/PITSGlobalDataRecoveryServices.png
--- a/Resources/Users/Suran.png
+++ b/Resources/Users/Suran.png
--- a/Resources/Users/Symflower.png
+++ b/Resources/Users/Symflower.png
--- a/Resources/Users/TestingBot.png
+++ b/Resources/Users/TestingBot.png
--- a/Resources/Users/Transloadit.png
+++ b/Resources/Users/Transloadit.png
--- a/Resources/Users/Uphold.png
+++ b/Resources/Users/Uphold.png
--- a/Resources/Users/ahrefs.png
+++ b/Resources/Users/ahrefs.png
--- a/Resources/Users/shape.png
+++ b/Resources/Users/shape.png
--- a/Resources/actool/Assets.car
+++ b/Resources/actool/Assets.car
--- a/Resources/actool/Info.plist
+++ b/Resources/actool/Info.plist
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleIconFile</key>
-	<string>UPW Tart</string>
-	<key>CFBundleIconName</key>
-	<string>UPW Tart</string>
-</dict>
-</plist>
--- a/Resources/actool/UPW
+++ b/Resources/actool/UPW
--- a/Resources/embedded.provisionprofile
+++ b/Resources/embedded.provisionprofile
--- a/Resources/tart-dev.entitlements
+++ b/Resources/tart-dev.entitlements
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>com.apple.security.virtualization</key>
-	<true/>
-	<key>com.apple.security.get-task-allow</key>
-	<true/>
-</dict>
-</plist>
--- a/Resources/tart-prod.entitlements
+++ b/Resources/tart-prod.entitlements
@ -4,7 +4,5 @@
 <dict>
 	<key>com.apple.security.virtualization</key>
 	<true/>
-	<key>com.apple.vm.networking</key>
-	<true/>
 </dict>
-</plist>
+</plist>
--- a/Sources/tart/MACAddressResolver/ARPCache.swift
+++ b/Sources/tart/MACAddressResolver/ARPCache.swift
@ -39,9 +39,7 @@ struct ARPCacheInternalError: Error, CustomStringConvertible {
 }

 struct ARPCache {
-  let arpCommandOutput: Data
-
-  init() throws {
+  static func ResolveMACAddress(macAddress: MACAddress, bridgeOnly: Bool = true) throws -> IPv4Address? {
    let process = Process.init()
    process.executableURL = URL.init(fileURLWithPath: "/usr/sbin/arp")
    process.arguments = ["-an"]
@ -52,11 +50,6 @@ struct ARPCache {
    process.standardInput = FileHandle.nullDevice

    try process.run()
-
-    guard let arpCommandOutput = try pipe.fileHandleForReading.readToEnd() else {
-      throw ARPCommandYieldedInvalidOutputError(explanation: "empty output")
-    }
-
    process.waitUntilExit()

    if !(process.terminationReason == .exit && process.terminationStatus == 0) {
@ -65,13 +58,12 @@ struct ARPCache {
        terminationStatus: process.terminationStatus)
    }

-    self.arpCommandOutput = arpCommandOutput
-  }
-
-  func ResolveMACAddress(macAddress: MACAddress) throws -> IPv4Address? {
-    let lines = String(decoding: arpCommandOutput, as: UTF8.self)
-      .trimmingCharacters(in: .whitespacesAndNewlines)
-      .components(separatedBy: "\n")
+    guard let rawLines = try pipe.fileHandleForReading.readToEnd() else {
+      throw ARPCommandYieldedInvalidOutputError(explanation: "empty output")
+    }
+    let lines = String(decoding: rawLines, as: UTF8.self)
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .components(separatedBy: "\n")

    // Based on https://opensource.apple.com/source/network_cmds/network_cmds-606.40.2/arp.tproj/arp.c.auto.html
    let regex = try NSRegularExpression(pattern: #"^.* \((?<ip>.*)\) at (?<mac>.*) on (?<interface>.*) .*$"#)
@ -96,6 +88,11 @@ struct ARPCache {
        throw ARPCommandYieldedInvalidOutputError(explanation: "failed to parse MAC address \(rawMAC)")
      }

+      let interface = try match.getCaptureGroup(name: "interface", for: line)
+      if bridgeOnly && !interface.starts(with: "bridge") {
+        continue
+      }
+
      if macAddress == mac {
        return ip
      }
--- a/Sources/tart/MACAddressResolver/MACAddress.swift
+++ b/Sources/tart/MACAddressResolver/MACAddress.swift
@ -1,6 +1,6 @@
 import Foundation

-struct MACAddress: Equatable, Hashable, CustomStringConvertible {
+struct MACAddress: Equatable, CustomStringConvertible {
  var mac: [UInt8] = Array(repeating: 0, count: 6)

  init?(fromString: String) {
@ -16,6 +16,6 @@ struct MACAddress: Equatable, Hashable, CustomStringConvertible {
  }

  var description: String {
-    String(format: "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5])
+    return String(format: "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5])
  }
 }
--- a/Sources/tart/CI/CI.swift
+++ b/Sources/tart/CI/CI.swift
@ -1,13 +1,9 @@
 struct CI {
-  private static let rawVersion = "${VERSION}"
+  private static let rawVersion = "${CIRRUS_TAG}"

  static var version: String {
    rawVersion.expanded() ? rawVersion : "SNAPSHOT"
  }
-
-  static var release: String? {
-    rawVersion.expanded() ? "tart@\(rawVersion)" : nil
-  }
 }

 private extension String {
--- a/Sources/tart/Commands/Clone.swift
+++ b/Sources/tart/Commands/Clone.swift
@ -3,130 +3,59 @@ import Foundation
 import SystemConfiguration

 struct Clone: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(
-    abstract: "Clone a VM",
-    discussion: """
-    Creates a local virtual machine by cloning either a remote or another local virtual machine.
+  static var configuration = CommandConfiguration(abstract: "Clone a VM")

-    Due to copy-on-write magic in Apple File System, a cloned VM won't actually claim all the space right away.
-    Only changes to a cloned disk will be written and claim new space. This also speeds up clones enormously.
-
-    By default, Tart checks available capacity in Tart's home directory and tries to reclaim minimum possible storage for the cloned image
-    to fit. This behaviour is called "automatic pruning" and can be disabled by setting TART_NO_AUTO_PRUNE environment variable.
-    """
-  )
-
-  @Argument(help: "source VM name", completion: .custom(completeMachines))
+  @Argument(help: "source VM name")
  var sourceName: String

  @Argument(help: "new VM name")
  var newName: String

-  @Flag(help: "connect to the OCI registry via insecure HTTP protocol")
-  var insecure: Bool = false
-
-  @Option(help: "network concurrency to use when pulling a remote VM from the OCI-compatible registry")
-  var concurrency: UInt = 4
-
-  @Flag(help: .hidden)
-  var deduplicate: Bool = false
-
-  @Flag(help: "create a stacked disk that uses the source image as an immutable base")
-  var stacked: Bool = false
-
-  @Option(help: ArgumentHelp("limit automatic pruning to n gigabytes", valueName: "n"))
-  var pruneLimit: UInt = 100
-
  func validate() throws {
    if newName.contains("/") {
      throw ValidationError("<new-name> should be a local name")
    }
-
-    if concurrency < 1 {
-      throw ValidationError("network concurrency cannot be less than 1")
-    }
  }

  func run() async throws {
-    let ociStorage = try VMStorageOCI()
-    let localStorage = try VMStorageLocal()
-    let remoteName = try? RemoteName(sourceName)
+    do {
+      let ociStorage = VMStorageOCI()
+      let localStorage = VMStorageLocal()

-    if stacked {
-      guard remoteName != nil else {
-        throw ValidationError("--stacked requires a remote image")
+      if let remoteName = try? RemoteName(sourceName), !ociStorage.exists(remoteName) {
+        // Pull the VM in case it's OCI-based and doesn't exist locally yet
+        let registry = try Registry(host: remoteName.host, namespace: remoteName.namespace)
+        try await ociStorage.pull(remoteName, registry: registry)
      }
-    }

-    if let remoteName, try !ociStorage.hasUsableCachedImageForClone(remoteName, requireManifest: stacked) {
-      // Pull the VM in case it's OCI-based and doesn't exist locally yet
-      let registry = try Registry(host: remoteName.host, namespace: remoteName.namespace, insecure: insecure)
-      try await ociStorage.pull(remoteName, registry: registry, concurrency: concurrency, deduplicate: deduplicate)
-    }
-
-    let sourceVM = try VMStorageHelper.open(sourceName)
-    let tmpVMDir = try VMDirectory.temporary()
-
-    // Lock the temporary VM directory to prevent it's garbage collection
-    let tmpVMDirLock = try FileLock(lockURL: tmpVMDir.baseURL)
-    try tmpVMDirLock.lock()
-
-    try await withTaskCancellationHandler(operation: {
-      // Acquire a global lock
-      let lock = try FileLock(lockURL: Config().tartHomeDir)
-      try lock.lock()
-
-      let sourceState = try sourceVM.state()
+      let sourceVM = try VMStorageHelper.open(sourceName)
      let generateMAC = try localStorage.hasVMsWithMACAddress(macAddress: sourceVM.macAddress())
-        && sourceState != .Suspended

-      if stacked {
-        guard sourceVM.isStandalone else {
-          throw ValidationError("--stacked cannot use an image that already has a stacked disk")
-        }
-        guard try VMConfig(fromURL: sourceVM.configURL).os == .darwin else {
-          throw ValidationError("--stacked currently supports only macOS images")
-        }
-        try sourceVM.cloneAsStackedBase(to: tmpVMDir, generateMAC: generateMAC)
-      } else if sourceVM.isStackedCachedImage {
-        try sourceVM.cloneStacked(to: tmpVMDir, copyWritableOverlay: false, generateMAC: generateMAC)
-      } else if sourceVM.isStackedVM {
-        guard sourceState == .Stopped else {
-          throw RuntimeError.VMConfigurationError("VM \"\(sourceName)\" must be stopped before cloning")
-        }
-        try sourceVM.cloneStacked(to: tmpVMDir, copyWritableOverlay: true, generateMAC: generateMAC)
-      } else {
+      let tmpVMDir = try VMDirectory.temporary()
+      try await withTaskCancellationHandler(operation: {
        try sourceVM.clone(to: tmpVMDir, generateMAC: generateMAC)
-      }
+        try localStorage.move(newName, from: tmpVMDir)
+      }, onCancel: {
+        try? FileManager.default.removeItem(at: tmpVMDir.baseURL)
+      })

-      try localStorage.move(newName, from: tmpVMDir)
+      Foundation.exit(0)
+    } catch {
+      print(error)

-      try lock.unlock()
-
-      // APFS is doing copy-on-write, so the above cloning operation (just copying files on disk)
-      // is not actually claiming new space until the VM is started and it writes something to disk.
-      //
-      // So, once we clone the VM let's try to claim the rest of space for the VM to run without errors.
-      if sourceVM.isStandalone {
-        let unallocatedBytes = try sourceVM.sizeBytes() - sourceVM.allocatedSizeBytes()
-        // Avoid reclaiming an excessive amount of disk space.
-        let reclaimBytes = min(unallocatedBytes, Int(pruneLimit) * 1024 * 1024 * 1024)
-        if reclaimBytes > 0 {
-          try Prune.reclaimIfNeeded(UInt64(reclaimBytes), sourceVM)
-        }
-      } else if sourceVM.isStackedVM || sourceVM.isStackedCachedImage {
-        let clonedVM = try localStorage.open(newName)
-        // A stacked clone owns only its writable overlay locally, but that
-        // overlay may grow to the full guest-visible disk block layout at
-        // runtime. Reclaim against the clone so it is not pruned itself.
-        let unallocatedBytes = try clonedVM.diskSizeBytes() - clonedVM.allocatedSizeBytes()
-        let reclaimBytes = min(unallocatedBytes, Int(pruneLimit) * 1024 * 1024 * 1024)
-        if reclaimBytes > 0 {
-          try Prune.reclaimIfNeeded(UInt64(reclaimBytes), clonedVM)
-        }
-      }
-    }, onCancel: {
-      try? FileManager.default.removeItem(at: tmpVMDir.baseURL)
-    })
+      Foundation.exit(1)
+    }
+  }
+}
+
+fileprivate extension VMDirectory {
+  func macAddress() throws -> String {
+    try VMConfig(fromURL: configURL).macAddress.string
+  }
+}
+
+fileprivate extension VMStorageLocal {
+  func hasVMsWithMACAddress(macAddress: String) throws -> Bool {
+    try list().contains { try $1.macAddress() == macAddress }
  }
 }
--- a/Sources/tart/Commands/Create.swift
+++ b/Sources/tart/Commands/Create.swift
@ -1,8 +1,7 @@
 import ArgumentParser
 import Dispatch
-import Foundation
 import SwiftUI
-import Virtualization
+import Foundation

 struct Create: AsyncParsableCommand {
  static var configuration = CommandConfiguration(abstract: "Create a VM")
@ -10,73 +9,38 @@ struct Create: AsyncParsableCommand {
  @Argument(help: "VM name")
  var name: String

-  @Option(help: ArgumentHelp("create a macOS VM using path to the IPSW file or URL (or \"latest\", to fetch the latest supported IPSW automatically)", valueName: "path"), completion: .file())
+  @Option(help: ArgumentHelp("Path to the IPSW file (or \"latest\") to fetch the latest appropriate IPSW", valueName: "path")) 
  var fromIPSW: String?

-  @Flag(help: "create a Linux VM")
-  var linux: Bool = false
-
-  @Option(help: ArgumentHelp("Disk size in GB"))
-  var diskSize: UInt16 = 50
-
-  @Option(help: ArgumentHelp("Disk image format", discussion: "ASIF format provides better performance but requires macOS 26 Tahoe or later"))
-  var diskFormat: DiskImageFormat = .raw
+  @Option(help: ArgumentHelp("Disk size in Gb")) 
+  var diskSize: UInt8 = 50

  func validate() throws {
-    if fromIPSW == nil && !linux {
-      throw ValidationError("Please specify either a --from-ipsw or --linux option!")
-    }
-    #if arch(x86_64)
-      if fromIPSW != nil {
-        throw ValidationError("Only Linux VMs are supported on Intel!")
-      }
-    #endif
-
-    // Validate disk format support
-    if !diskFormat.isSupported {
-      throw ValidationError("Disk format '\(diskFormat.rawValue)' is not supported on this system.")
+    if fromIPSW == nil {
+      throw ValidationError("Please specify a --from-ipsw option!")
    }
  }

  func run() async throws {
-    let tmpVMDir = try VMDirectory.temporary()
-
-    // Lock the temporary VM directory to prevent it's garbage collection
-    let tmpVMDirLock = try FileLock(lockURL: tmpVMDir.baseURL)
-    try tmpVMDirLock.lock()
-
-    try await withTaskCancellationHandler(operation: {
-      #if arch(arm64)
-        if let fromIPSW = fromIPSW {
-          let ipswURL: URL
-
-          if fromIPSW == "latest" {
-            defaultLogger.appendNewLine("Looking up the latest supported IPSW...")
-
-            let image = try await withCheckedThrowingContinuation { continuation in
-              VZMacOSRestoreImage.fetchLatestSupported() { result in
-                continuation.resume(with: result)
-              }
-            }
-
-            ipswURL = image.url
-          } else if fromIPSW.starts(with: "http://") || fromIPSW.starts(with: "https://") {
-            ipswURL = URL(string: fromIPSW)!
-          } else {
-            ipswURL = URL(fileURLWithPath: NSString(string: fromIPSW).expandingTildeInPath)
-          }
-
-          _ = try await VM(vmDir: tmpVMDir, ipswURL: ipswURL, diskSizeGB: diskSize, diskFormat: diskFormat)
+    do {
+      let tmpVMDir = try VMDirectory.temporary()
+      try await withTaskCancellationHandler(operation: {
+        if fromIPSW! == "latest" {
+          _ = try await VM(vmDir: tmpVMDir, ipswURL: nil, diskSizeGB: diskSize)
+        } else {
+          _ = try await VM(vmDir: tmpVMDir, ipswURL: URL(fileURLWithPath: fromIPSW!), diskSizeGB: diskSize)
        }
-      #endif

-      if linux {
-        _ = try await VM.linux(vmDir: tmpVMDir, diskSizeGB: diskSize, diskFormat: diskFormat)
-      }
+        try VMStorageLocal().move(name, from: tmpVMDir)
+      }, onCancel: {
+        try? FileManager.default.removeItem(at: tmpVMDir.baseURL)
+      })

-      try VMStorageLocal().move(name, from: tmpVMDir)
-    }, onCancel: {
-      try? FileManager.default.removeItem(at: tmpVMDir.baseURL)
-    })
+      Foundation.exit(0)
+    } catch {
+      print(error)
+
+      Foundation.exit(1)
+    }
  }
 }
--- a/Sources/tart/Commands/Delete.swift
+++ b/Sources/tart/Commands/Delete.swift
@ -5,12 +5,18 @@ import SwiftUI
 struct Delete: AsyncParsableCommand {
  static var configuration = CommandConfiguration(abstract: "Delete a VM")

-  @Argument(help: "VM name", completion: .custom(completeMachines))
-  var name: [String]
+  @Argument(help: "VM name")
+  var name: String

  func run() async throws {
-    for it in name {
-      try VMStorageHelper.delete(it)
+    do {
+      try VMStorageHelper.delete(name)
+
+      Foundation.exit(0)
+    } catch {
+      print(error)
+
+      Foundation.exit(1)
    }
  }
 }
--- a/Sources/tart/Commands/Exec.swift
+++ b/Sources/tart/Commands/Exec.swift
@ -1,225 +0,0 @@
-import ArgumentParser
-import Foundation
-import GRPC
-import Cirruslabs_TartGuestAgent_Grpc_Swift
-
-struct ExecCustomExitCodeError: Error {
-  let exitCode: Int32
-}
-
-struct Exec: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(abstract: "Execute a command in a running VM", discussion: """
-  Requires Tart Guest Agent running in a guest VM.
-
-  Note that all non-vanilla Cirrus Labs VM images already have the Tart Guest Agent installed.
-  """)
-
-  @Flag(name: [.customShort("i")], help: "Attach host's standard input to a remote command")
-  var interactive: Bool = false
-
-  @Flag(name: [.customShort("t")], help: "Allocate a remote pseudo-terminal (PTY)")
-  var tty: Bool = false
-
-  @Argument(help: "VM name", completion: .custom(completeLocalMachines))
-  var name: String
-
-  @Argument(parsing: .captureForPassthrough, help: "Command to execute")
-  var command: [String]
-
-  func run() async throws {
-    // We only have withThrowingDiscardingTaskGroup available starting from macOS 14
-    if #unavailable(macOS 14) {
-      throw RuntimeError.Generic("\"tart exec\" is only available on macOS 14 (Sonoma) or newer")
-    }
-
-    // Open VM's directory
-    let vmDir = try VMStorageLocal().open(name)
-
-    // Ensure that the VM is running
-    if try !vmDir.running() {
-      throw RuntimeError.VMNotRunning(name)
-    }
-
-    // Change the current working directory to a VM's base directory
-    // to work around Unix domain socket 104 byte limitation [1]
-    //
-    // [1]: https://blog.8-p.info/en/2020/06/11/unix-domain-socket-length/
-    if let baseURL = vmDir.controlSocketURL.baseURL {
-      FileManager.default.changeCurrentDirectoryPath(baseURL.path())
-    }
-
-    // Switch controlling terminal into raw mode when remote pseudo-terminal is requested
-    var state: State? = nil
-
-    if tty && Term.IsTerminal() {
-      state = try Term.MakeRaw()
-    }
-    defer {
-      // Restore terminal to its initial state
-      if let state {
-        try! Term.Restore(state)
-      }
-    }
-
-    // Execute a command in a running VM
-    do {
-      let controlSocketPath = vmDir.controlSocketURL.relativePath
-      try await withGuestAgentChannel(unixDomainSocketPath: controlSocketPath) { channel in
-        try await execute(channel)
-      }
-    } catch let error as GRPCConnectionPoolError {
-      throw RuntimeError.Generic("Failed to connect to the VM using its control socket: \(error.localizedDescription), is the Tart Guest Agent running?")
-    }
-  }
-
-  private func execute(_ channel: GRPCChannel) async throws {
-    let agentAsyncClient = AgentAsyncClient(channel: channel)
-    let execCall = agentAsyncClient.makeExecCall()
-
-    try await execCall.requestStream.send(.with {
-      $0.type = .command(.with {
-        $0.name = command[0]
-        $0.args = Array(command.dropFirst(1))
-        $0.interactive = interactive
-        $0.tty = tty
-        if tty {
-          $0.terminalSize = .with {
-            let (width, height) = try! Term.GetSize()
-
-            $0.cols = UInt32(width)
-            $0.rows = UInt32(height)
-          }
-        }
-      })
-    })
-
-    // Process command events and optionally send our standard input and/or terminal dimensions
-    try await withThrowingTaskGroup { group in
-      // Stream host's standard input if interactive mode is enabled
-      if interactive {
-        let stdinStream = AsyncThrowingStream<Data, Error> { continuation in
-          let handle = FileHandle.standardInput
-
-          if isRegularFile(handle.fileDescriptor) {
-            // Standard input can be a regular file when input redirection (<) is used,
-            // in which case the handle won't receive any new readability events, so we
-            // just read the file normally here in chunks and consider done with it
-            //
-            // Ideally this is best handled by using non-blocking I/O, but Swift's
-            // standard library only offers inefficient bytes[1] property and SwiftNIO's
-            // NIOFileSystem doesn't seem to support opening raw file descriptors.
-            //
-            // [1]: https://developer.apple.com/documentation/foundation/filehandle/bytes
-            while true {
-              do {
-                let data = try handle.read(upToCount: 64 * 1024)
-                if let data = data {
-                  continuation.yield(data)
-                } else {
-                  continuation.finish()
-                  break
-                }
-              } catch (let error) {
-                continuation.finish(throwing: error)
-                break
-              }
-            }
-          } else {
-            handle.readabilityHandler = { handle in
-              let data = handle.availableData
-
-              if data.isEmpty {
-                // EOF: unregister the handler, otherwise the fd stays permanently
-                // "readable" and Foundation re-invokes us in a tight loop, burning
-                // 100% of a core for the rest of the command's lifetime
-                handle.readabilityHandler = nil
-
-                continuation.finish()
-              } else {
-                continuation.yield(data)
-              }
-            }
-          }
-        }
-
-        group.addTask {
-          for try await stdinData in stdinStream {
-            try await execCall.requestStream.send(.with {
-              $0.type = .standardInput(.with {
-                $0.data = stdinData
-              })
-            })
-          }
-
-          // Signal EOF as we're done reading standard input
-          try await execCall.requestStream.send(.with {
-            $0.type = .standardInput(.with {
-              $0.data = Data()
-            })
-          })
-        }
-      }
-
-      // Stream host's terminal dimensions if pseudo-terminal is requested
-      signal(SIGWINCH, SIG_IGN)
-      let sigwinchSrc = DispatchSource.makeSignalSource(signal: SIGWINCH)
-      sigwinchSrc.activate()
-
-      if tty {
-        let terminalDimensionsStream = AsyncStream { continuation in
-          sigwinchSrc.setEventHandler {
-            continuation.yield(try! Term.GetSize())
-          }
-        }
-
-        group.addTask {
-          for await (width, height) in terminalDimensionsStream {
-            try await execCall.requestStream.send(.with {
-              $0.type = .terminalResize(.with {
-                $0.cols = UInt32(width)
-                $0.rows = UInt32(height)
-              })
-            })
-          }
-        }
-      }
-
-      // Process command events
-      group.addTask {
-        for try await response in execCall.responseStream {
-          switch response.type {
-          case .standardOutput(let ioChunk):
-            try FileHandle.standardOutput.write(contentsOf: ioChunk.data)
-          case .standardError(let ioChunk):
-            try FileHandle.standardError.write(contentsOf: ioChunk.data)
-          case .exit(let exit):
-            throw ExecCustomExitCodeError(exitCode: exit.code)
-          default:
-            // Unknown event, do nothing
-            continue
-          }
-        }
-      }
-
-      while !group.isEmpty {
-        do {
-          try await group.next()
-        } catch {
-          group.cancelAll()
-
-          throw error
-        }
-      }
-    }
-  }
-}
-
-private func isRegularFile(_ fileDescriptor: Int32) -> Bool {
-  var stat = stat()
-
-  if fstat(fileDescriptor, &stat) != 0 {
-    return false
-  }
-
-  return (stat.st_mode & S_IFMT) == S_IFREG
-}
--- a/Sources/tart/Commands/Export.swift
+++ b/Sources/tart/Commands/Export.swift
@ -1,44 +0,0 @@
-import ArgumentParser
-import Foundation
-
-struct Export: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(abstract: "Export VM to a compressed .tvm file")
-
-  @Argument(help: "Source VM name.", completion: .custom(completeMachines))
-  var name: String
-
-  @Argument(help: "Path to the destination file.", completion: .file())
-  var path: String?
-
-  func run() async throws {
-    let correctedPath: String
-
-    if let path = path {
-      correctedPath = path
-    } else {
-      correctedPath = "\(name).tvm"
-
-      if FileManager.default.fileExists(atPath: correctedPath) {
-        while true {
-          if userWantsOverwrite(correctedPath) {
-            break
-          } else {
-            return
-          }
-        }
-      }
-    }
-
-    print("exporting...")
-
-    try VMStorageHelper.open(name).exportToArchive(path: correctedPath)
-  }
-
-  func userWantsOverwrite(_ filename: String) -> Bool {
-    print("file \(filename) already exists, are you sure you want to overwrite it? (yes, [no])? ", terminator: "")
-
-    let answer = readLine()!
-
-    return answer == "yes"
-  }
-}
--- a/Sources/tart/Commands/FQN.swift
+++ b/Sources/tart/Commands/FQN.swift
@ -1,22 +0,0 @@
-import ArgumentParser
-import Foundation
-import SystemConfiguration
-
-struct FQN: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(abstract: "Get a fully-qualified VM name", shouldDisplay: false)
-
-  @Argument(help: "VM name", completion: .custom(completeMachines))
-  var name: String
-
-  func run() async throws {
-    if var remoteName = try? RemoteName(name) {
-      let digest = try VMStorageOCI().digest(remoteName)
-
-      remoteName.reference = Reference(digest: digest)
-
-      print(remoteName)
-    } else {
-      print(name)
-    }
-  }
-}
--- a/Sources/tart/Commands/Get.swift
+++ b/Sources/tart/Commands/Get.swift
@ -1,45 +0,0 @@
-import ArgumentParser
-import Foundation
-
-fileprivate struct VMInfo: Encodable {
-  let OS: OS
-  let CPU: Int
-  let Memory: UInt64
-  let Disk: HumanReadableByteCount
-  let DiskFormat: String
-  let Size: HumanReadableByteCount
-  let Display: String
-  let Running: Bool
-  let State: String
-}
-
-struct Get: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(commandName: "get", abstract: "Get a VM's configuration")
-
-  @Argument(help: "VM name.", completion: .custom(completeLocalMachines))
-  var name: String
-
-  @Option(help: "Output format: text or json")
-  var format: Format = .text
-
-  func run() async throws {
-    let vmDir = try VMStorageLocal().open(name)
-    let vmConfig = try VMConfig(fromURL: vmDir.configURL)
-    let memorySizeInMb = vmConfig.memorySize / 1024 / 1024
-
-    let info = VMInfo(
-      OS: vmConfig.os,
-      CPU: vmConfig.cpuCount,
-      Memory: memorySizeInMb,
-      Disk: HumanReadableByteCount(try vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 },
-      DiskFormat: vmConfig.diskFormat.rawValue,
-      Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) {
-        String(format: "%.3f", Float($0) / 1000 / 1000 / 1000)
-      },
-      Display: vmConfig.display.description,
-      Running: try vmDir.running(),
-      State: try vmDir.state().rawValue
-    )
-    print(format.renderSingle(info))
-  }
-}
--- a/Sources/tart/Commands/IP.swift
+++ b/Sources/tart/Commands/IP.swift
@ -3,86 +3,46 @@ import Foundation
 import Network
 import SystemConfiguration

-enum IPResolutionStrategy: String, ExpressibleByArgument, CaseIterable {
-  case dhcp, arp, agent
-
-  private(set) static var allValueStrings: [String] = Self.allCases.map { "\($0)"}
-}
-
 struct IP: AsyncParsableCommand {
  static var configuration = CommandConfiguration(abstract: "Get VM's IP address")

-  @Argument(help: "VM name", completion: .custom(completeLocalMachines))
+  @Argument(help: "VM name")
  var name: String

  @Option(help: "Number of seconds to wait for a potential VM booting")
  var wait: UInt16 = 0

-  @Option(help: ArgumentHelp("Strategy for resolving IP address",
-                             discussion: """
-                             By default, Tart is using a "dhcp" resolver which parses the DHCP lease file on host and tries to find an entry containing the VM's MAC address. This method is fast and the most reliable, but only works for VMs are not using the bridged networking.\n
-                             Alternatively, Tart has an "arp" resolver which calls an external "arp" executable and parses it's output. This works for VMs using bridged networking and returns their IP, but when they generate enough network activity to populate the host's ARP table. Note that "arp" strategy won't work for VMs using the Softnet networking.\n
-                             A third strategy, "agent" works in all cases reliably, but requires Guest agent for Tart VMs (https://github.com/cirruslabs/tart-guest-agent) to be installed inside of a VM.
-                             """))
-  var resolver: IPResolutionStrategy = .dhcp
-
  func run() async throws {
-    let vmDir = try VMStorageLocal().open(name)
-    let vmConfig = try VMConfig.init(fromURL: vmDir.configURL)
-    let vmMACAddress = MACAddress(fromString: vmConfig.macAddress.string)!
+    do {
+      let vmDir = try VMStorageLocal().open(name)
+      let vmConfig = try VMConfig.init(fromURL: vmDir.configURL)

-    guard let ip = try await IP.resolveIP(vmMACAddress, resolutionStrategy: resolver, secondsToWait: wait, controlSocketURL: vmDir.controlSocketURL) else {
-      var message = "no IP address found"
+      guard let ip = try await IP.resolveIP(vmConfig, secondsToWait: wait) else {
+        print("no IP address found, is your VM running?")

-      if try !vmDir.running() {
-        message += ", is your VM running?"
+        Foundation.exit(1)
      }

-      if (resolver == .agent) {
-        message += " (also make sure that Guest agent for Tart is running inside of a VM)"
-      } else if (vmConfig.os == .linux && resolver == .arp) {
-        message += " (not all Linux distributions are compatible with the ARP resolver)"
-      }
+      print(ip)

-      throw RuntimeError.NoIPAddressFound(message)
+      Foundation.exit(0)
+    } catch {
+      print(error)
+
+      Foundation.exit(1)
    }
-
-    print(ip)
  }

-  static public func resolveIP(_ vmMACAddress: MACAddress, resolutionStrategy: IPResolutionStrategy = .dhcp, secondsToWait: UInt16 = 0, controlSocketURL: URL? = nil) async throws -> IPv4Address? {
+  static public func resolveIP(_ config: VMConfig, secondsToWait: UInt16) async throws -> IPv4Address? {
    let waitUntil = Calendar.current.date(byAdding: .second, value: Int(secondsToWait), to: Date.now)!
+    let vmMacAddress = MACAddress(fromString: config.macAddress.string)!

    repeat {
-      switch resolutionStrategy {
-      case .arp:
-        if let ip = try ARPCache().ResolveMACAddress(macAddress: vmMACAddress) {
-          return ip
-        }
-      case .dhcp:
-        if let leases = try Leases(), let ip = leases.ResolveMACAddress(macAddress: vmMACAddress) {
-          return ip
-        }
-      case .agent:
-        guard let controlSocketURL = controlSocketURL else {
-          throw RuntimeError.Generic("Cannot perform IP resolution via Tart Guest Agent when control socket URL is not set")
-        }
-
-        // Change the current working directory to a VM's base directory
-        // to work around Unix domain socket 104 byte limitation [1]
-        //
-        // [1]: https://blog.8-p.info/en/2020/06/11/unix-domain-socket-length/
-        if let baseURL = controlSocketURL.baseURL {
-          FileManager.default.changeCurrentDirectoryPath(baseURL.path())
-        }
-
-        if let ip = try await AgentResolver.ResolveIP(controlSocketURL.relativePath) {
-          return ip
-        }
+      if let ip = try ARPCache.ResolveMACAddress(macAddress: vmMacAddress) {
+        return ip
      }

-      // wait a second
-      try await Task.sleep(nanoseconds: 1_000_000_000)
+      try await Task.sleep(nanoseconds: 1_000_000)
    } while Date.now < waitUntil

    return nil
--- a/Sources/tart/Commands/Import.swift
+++ b/Sources/tart/Commands/Import.swift
@ -1,56 +0,0 @@
-import ArgumentParser
-import Foundation
-
-struct Import: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(abstract: "Import VM from a compressed .tvm file")
-
-  @Argument(help: "Path to a file created with \"tart export\".", completion: .file())
-  var path: String
-
-  @Argument(help: "Destination VM name.", completion: .custom(completeLocalMachines))
-  var name: String
-
-  func validate() throws {
-    if name.contains("/") {
-      throw ValidationError("<name> should be a local name")
-    }
-  }
-
-  func run() async throws {
-    let localStorage = try VMStorageLocal()
-
-    // Create a temporary VM directory to which we will load the export file
-    let tmpVMDir = try VMDirectory.temporary()
-
-    // Lock the temporary VM directory to prevent it's garbage collection
-    // while we're running
-    let tmpVMDirLock = try FileLock(lockURL: tmpVMDir.baseURL)
-    try tmpVMDirLock.lock()
-
-    // Populate the temporary VM directory with the export file contents
-    print("importing...")
-    try tmpVMDir.importFromArchive(path: path)
-
-    if tmpVMDir.isStackedVM || tmpVMDir.isStackedCachedImage {
-      try? FileManager.default.removeItem(at: tmpVMDir.baseURL)
-      throw RuntimeError.ImportFailed("importing stacked VMs is not supported yet")
-    }
-
-    try await withTaskCancellationHandler(operation: {
-      // Acquire a global lock
-      let lock = try FileLock(lockURL: Config().tartHomeDir)
-      try lock.lock()
-
-      // Re-generate the VM's MAC address importing it will result in address collision
-      if try localStorage.hasVMsWithMACAddress(macAddress: tmpVMDir.macAddress()) {
-        try tmpVMDir.regenerateMACAddress()
-      }
-
-      try localStorage.move(name, from: tmpVMDir)
-
-      try lock.unlock()
-    }, onCancel: {
-      try? FileManager.default.removeItem(at: tmpVMDir.baseURL)
-    })
-  }
-}
--- a/Sources/tart/Commands/List.swift
+++ b/Sources/tart/Commands/List.swift
@ -2,91 +2,27 @@ import ArgumentParser
 import Dispatch
 import SwiftUI

-fileprivate struct VMInfo: Encodable {
-  let Source: String
-  let Name: String
-  let Disk: HumanReadableByteCount
-  let Size: HumanReadableByteCount
-  let Accessed: String
-  let Running: Bool
-  let State: String
-}
-
 struct List: AsyncParsableCommand {
  static var configuration = CommandConfiguration(abstract: "List created VMs")

-  @Option(help: ArgumentHelp("Only display VMs from the specified source (e.g. --source local, --source oci)."))
-  var source: String?
-
-  @Option(help: "Output format: text or json", completion: .list(["text", "json"]))
-  var format: Format = .text
-
-  @Flag(name: [.short, .long], help: ArgumentHelp("Only display VM names."))
-  var quiet: Bool = false
-
-  func validate() throws {
-    guard let source = source else {
-      return
-    }
-
-    if !["local", "oci"].contains(source) {
-      throw ValidationError("'\(source)' is not a valid <source>")
-    }
-  }
-
  func run() async throws {
-    var infos: [VMInfo] = []
+    do {
+      print("Source\tName")

-    if source == nil || source == "local" {
-      infos += sortedInfos(try VMStorageLocal().list().map { (name, vmDir) in
-        try VMInfo(
-          Source: "local",
-          Name: name,
-          Disk: HumanReadableByteCount(try vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 },
-          Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) { $0 / 1000 / 1000 / 1000 },
-          Accessed: formatAccessDate(try vmDir.accessDate()),
-          Running: vmDir.running(),
-          State: vmDir.state().rawValue
-        )
-      })
-    }
+      displayTable("local", try VMStorageLocal().list())
+      displayTable("oci", try VMStorageOCI().list())

-    if source == nil || source == "oci" {
-      infos += sortedInfos(try VMStorageOCI().list().map { (name, vmDir, _) in
-        try VMInfo(
-          Source: "OCI",
-          Name: name,
-          Disk: HumanReadableByteCount(try vmDir.diskSizeBytes()) { $0 / 1000 / 1000 / 1000 },
-          Size: HumanReadableByteCount(try vmDir.allocatedSizeBytes()) { $0 / 1000 / 1000 / 1000 },
-          Accessed: formatAccessDate(try vmDir.accessDate()),
-          Running: vmDir.running(),
-          State: vmDir.state().rawValue
-        )
-      })
-    }
+      Foundation.exit(0)
+    } catch {
+      print(error)

-    if (quiet) {
-      for info in infos {
-        print(info.Name)
-      }
-    } else {
-      print(format.renderList(infos))
+      Foundation.exit(1)
    }
  }

-  private func sortedInfos(_ infos: [VMInfo]) -> [VMInfo] {
-    infos.sorted(by: { left, right in left.Name < right.Name })
-  }
-
-  private func formatAccessDate(_ accessDate: Date) -> String {
-    switch format {
-    case .text:
-      let formatter = RelativeDateTimeFormatter()
-      formatter.unitsStyle = .full
-      return formatter.localizedString(for: accessDate, relativeTo: Date())
-    case .json:
-      let formatter = ISO8601DateFormatter()
-      return formatter.string(from: accessDate)
+  private func displayTable(_ source: String, _ vms: [(String, VMDirectory)]) {
+    for (name, _) in vms.sorted(by: { left, right in left.0 < right.0 }) {
+      print("\(source)\t\(name)")
    }
  }
 }
--- a/Sources/tart/Commands/Login.swift
+++ b/Sources/tart/Commands/Login.swift
@ -8,64 +8,34 @@ struct Login: AsyncParsableCommand {
  @Argument(help: "host")
  var host: String

-  @Option(help: "username")
-  var username: String?
-
-  @Flag(help: "password-stdin")
-  var passwordStdin: Bool = false
-
-  @Flag(help: "connect to the OCI registry via insecure HTTP protocol")
-  var insecure: Bool = false
-
-  @Flag(help: "skip validation of the registry's credentials before logging-in")
-  var noValidate: Bool = false
-
-  func validate() throws {
-    let usernameProvided = username != nil
-    let passwordProvided = passwordStdin
-
-    if usernameProvided != passwordProvided {
-      throw ValidationError("both --username and --password-stdin are required")
-    }
-  }
-
  func run() async throws {
-    var user: String
-    var password: String
-
-    if let username = username {
-      user = username
-
-      let passwordData = FileHandle.standardInput.readDataToEndOfFile()
-      password = String(decoding: passwordData, as: UTF8.self)
-
-      // Support "echo $PASSWORD | tart login --username $USERNAME --password-stdin $REGISTRY"
-      password.trimSuffix { c in c.isNewline }
-    } else {
-      (user, password) = try StdinCredentials.retrieve()
-    }
-    let credentialsProvider = DictionaryCredentialsProvider([
-      host: (user, password)
-    ])
-
-    if !noValidate {
-      let registry = try Registry(host: host, namespace: "", insecure: insecure,
-                                  credentialsProviders: [credentialsProvider])
+    do {
+      let (user, password) = try StdinCredentials.retrieve()
+      let credentialsProvider = DictionaryCredentialsProvider([
+        host: (user, password)
+      ])

      do {
+        let registry = try Registry(host: host, namespace: "", credentialsProvider: credentialsProvider)
        try await registry.ping()
      } catch {
-        throw RuntimeError.InvalidCredentials("invalid credentials: \(error)")
-      }
-    }
+        print("invalid credentials: \(error)")

-    try KeychainCredentialsProvider().store(host: host, user: user, password: password)
+        Foundation.exit(1)
+      }
+
+      try KeychainCredentialsProvider().store(host: host, user: user, password: password)
+
+      Foundation.exit(0)
+    } catch {
+      print(error)
+
+      Foundation.exit(1)
+    }
  }
 }

 fileprivate class DictionaryCredentialsProvider: CredentialsProvider {
-  let userFriendlyName = "static dictionary credentials provider"
-
  var credentials: Dictionary<String, (String, String)>

  init(_ credentials: Dictionary<String, (String, String)>) {
--- a/Sources/tart/Commands/Logout.swift
+++ b/Sources/tart/Commands/Logout.swift
@ -1,14 +0,0 @@
-import ArgumentParser
-import Dispatch
-import SwiftUI
-
-struct Logout: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(abstract: "Logout from a registry")
-
-  @Argument(help: "host")
-  var host: String
-
-  func run() async throws {
-    try KeychainCredentialsProvider().remove(host: host)
-  }
-}
--- a/Sources/tart/Commands/Prune.swift
+++ b/Sources/tart/Commands/Prune.swift
@ -1,190 +0,0 @@
-import ArgumentParser
-import Dispatch
-import OpenTelemetryApi
-import SwiftUI
-import SwiftDate
-
-struct Prune: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(abstract: "Prune OCI and IPSW caches or local VMs")
-
-  @Option(help: ArgumentHelp("Entries to remove: \"caches\" targets OCI and IPSW caches and \"vms\" targets local VMs."), completion: .list(["caches", "vms"]))
-  var entries: String = "caches"
-
-  @Option(help: ArgumentHelp("Remove entries that were last accessed more than n days ago",
-                             discussion: "For example, --older-than=7 will remove entries that weren't accessed by Tart in the last 7 days.",
-                             valueName: "n"))
-  var olderThan: UInt?
-
-  @Option(help: .hidden)
-  var cacheBudget: UInt?
-
-  @Option(help: ArgumentHelp("Remove the least recently used entries that do not fit the specified space size budget n, expressed in gigabytes",
-                             discussion: "For example, --space-budget=50 will effectively shrink all entries to a total size of 50 gigabytes.",
-                             valueName: "n"))
-  var spaceBudget: UInt?
-
-  @Flag(help: .hidden)
-  var gc: Bool = false
-
-  mutating func validate() throws {
-    // --cache-budget deprecation logic
-    if let cacheBudget = cacheBudget {
-      fputs("--cache-budget is deprecated, please use --space-budget\n", stderr)
-
-      if spaceBudget != nil {
-        throw ValidationError("--cache-budget is deprecated, please use --space-budget")
-      }
-
-      spaceBudget = cacheBudget
-    }
-
-    if olderThan == nil && spaceBudget == nil && !gc {
-      throw ValidationError("at least one pruning criteria must be specified")
-    }
-  }
-
-  func run() async throws {
-    if gc {
-      try VMStorageOCI().gc()
-    }
-
-    // Build a list of prunable storages that we're going to prune based on user's request
-    let prunableStorages: [PrunableStorage]
-
-    switch entries {
-    case "caches":
-      prunableStorages = [try VMStorageOCI(), try IPSWCache()]
-    case "vms":
-      prunableStorages = [try VMStorageLocal()]
-    default:
-      throw ValidationError("unsupported --entries value, please specify either \"caches\" or \"vms\"")
-    }
-
-    // Clean up cache entries based on last accessed date
-    if let olderThan = olderThan {
-      let olderThanInterval = Int(exactly: olderThan)!.days.timeInterval
-      let olderThanDate = Date() - olderThanInterval
-
-      try Prune.pruneOlderThan(prunableStorages: prunableStorages, olderThanDate: olderThanDate)
-    }
-
-    // Clean up cache entries based on imposed cache size limit and entry's last accessed date
-    if let spaceBudget = spaceBudget {
-      try Prune.pruneSpaceBudget(prunableStorages: prunableStorages, spaceBudgetBytes: UInt64(spaceBudget) * 1024 * 1024 * 1024)
-    }
-  }
-
-  static func pruneOlderThan(prunableStorages: [PrunableStorage], olderThanDate: Date) throws {
-    let prunables: [Prunable] = try prunableStorages.flatMap { try $0.prunables() }
-
-    try prunables.filter { try $0.accessDate() <= olderThanDate }.forEach { try $0.delete() }
-  }
-
-  static func pruneSpaceBudget(prunableStorages: [PrunableStorage], spaceBudgetBytes: UInt64) throws {
-    let prunables: [Prunable] = try prunableStorages
-      .flatMap { try $0.prunables() }
-      .sorted { try $0.accessDate() > $1.accessDate() }
-
-    var spaceBudgetBytes = spaceBudgetBytes
-    var prunablesToDelete: [Prunable] = []
-
-    for prunable in prunables {
-      let prunableSizeBytes = UInt64(try prunable.allocatedSizeBytes())
-
-      if prunableSizeBytes <= spaceBudgetBytes {
-        // Don't mark for deletion as
-        // there's a budget available
-        spaceBudgetBytes -= prunableSizeBytes
-      } else {
-        // Mark for deletion
-        prunablesToDelete.append(prunable)
-      }
-    }
-
-    try prunablesToDelete.forEach { try $0.delete() }
-  }
-
-  static func reclaimIfNeeded(_ requiredBytes: UInt64, _ initiator: Prunable? = nil) throws {
-    if ProcessInfo.processInfo.environment.keys.contains("TART_NO_AUTO_PRUNE") {
-      return
-    }
-
-    OpenTelemetry.instance.contextProvider.activeSpan?.setAttribute(
-      key: "prune.required-bytes",
-      value: .int(Int(requiredBytes))
-    )
-
-    // Figure out how much disk space is available
-    let attrs = try Config().tartCacheDir.resourceValues(forKeys: [
-      .volumeAvailableCapacityKey,
-      .volumeAvailableCapacityForImportantUsageKey
-    ])
-    let volumeAvailableCapacityCalculated = max(
-      UInt64(attrs.volumeAvailableCapacity!),
-      UInt64(attrs.volumeAvailableCapacityForImportantUsage!)
-    )
-
-    OpenTelemetry.instance.contextProvider.activeSpan?.setAttributes([
-      "prune.volume-available-capacity-bytes": .int(Int(attrs.volumeAvailableCapacity!)),
-      "prune.volume-available-capacity-for-important-usage-bytes": .int(Int(attrs.volumeAvailableCapacityForImportantUsage!)),
-      "prune.volume-available-capacity-calculated": .int(Int(volumeAvailableCapacityCalculated)),
-    ])
-
-    if volumeAvailableCapacityCalculated <= 0 {
-      OpenTelemetry.instance.contextProvider.activeSpan?.addEvent(name: "Zero volume capacity reported")
-
-      return
-    }
-
-    // Now that we know how much free space is left,
-    // check if we even need to reclaim anything
-    if requiredBytes < volumeAvailableCapacityCalculated {
-      return
-    }
-
-    try Prune.reclaimIfPossible(requiredBytes - volumeAvailableCapacityCalculated, initiator)
-  }
-
-  private static func reclaimIfPossible(_ reclaimBytes: UInt64, _ initiator: Prunable? = nil) throws {
-    let span = OTel.shared.tracer.spanBuilder(spanName: "prune").startSpan()
-    defer { span.end() }
-
-    let prunableStorages: [PrunableStorage] = [try VMStorageOCI(), try IPSWCache()]
-    let prunables: [Prunable] = try prunableStorages
-      .flatMap { try $0.prunables() }
-      .sorted { try $0.accessDate() < $1.accessDate() }
-
-    // Does it even make sense to start?
-    let cacheUsedBytes = try prunables.map { try $0.allocatedSizeBytes() }.reduce(0, +)
-    if cacheUsedBytes < reclaimBytes {
-      return
-    }
-
-    var cacheReclaimedBytes: Int = 0
-
-    var it = prunables.makeIterator()
-
-    while cacheReclaimedBytes <= reclaimBytes {
-      guard let prunable = it.next() else {
-        break
-      }
-
-      if prunable.url == initiator?.url.resolvingSymlinksInPath() {
-        // do not prune the initiator
-        continue
-      }
-
-      let allocatedSizeBytes = try prunable.allocatedSizeBytes()
-
-      OpenTelemetry.instance.contextProvider.activeSpan?
-        .addEvent(name: "Pruned \(allocatedSizeBytes) bytes for \(prunable.url.path)")
-
-      cacheReclaimedBytes += allocatedSizeBytes
-
-      try prunable.delete()
-    }
-
-    OpenTelemetry.instance.contextProvider.activeSpan?
-      .addEvent(name: "Reclaimed \(cacheReclaimedBytes) bytes")
-  }
-}
--- a/Sources/tart/Commands/Pull.swift
+++ b/Sources/tart/Commands/Pull.swift
@ -3,49 +3,33 @@ import Dispatch
 import SwiftUI

 struct Pull: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(
-    abstract: "Pull a VM from a registry",
-    discussion: """
-    Pulls a virtual machine from a remote OCI-compatible registry. Supports authorization via Keychain (see "tart login --help"),
-    Docker credential helpers defined in ~/.docker/config.json or via TART_REGISTRY_USERNAME/TART_REGISTRY_PASSWORD environment variables.
-
-    By default, Tart checks available capacity in Tart's home directory and tries to reclaim minimum possible storage for the remote image
-    to fit. This behaviour is called "automatic pruning" and can be disabled by setting TART_NO_AUTO_PRUNE environment variable.
-    """
-  )
+  static var configuration = CommandConfiguration(abstract: "Pull a VM from a registry")

  @Argument(help: "remote VM name")
  var remoteName: String

-  @Flag(help: "connect to the OCI registry via insecure HTTP protocol")
-  var insecure: Bool = false
-
-  @Option(help: "network concurrency to use when pulling a remote VM from the OCI-compatible registry")
-  var concurrency: UInt = 4
-
-  @Flag(help: .hidden)
-  var deduplicate: Bool = false
-
-  func validate() throws {
-    if concurrency < 1 {
-      throw ValidationError("network concurrency cannot be less than 1")
-    }
-  }
-
  func run() async throws {
-    // Be more liberal when accepting local image as argument,
-    // see https://github.com/cirruslabs/tart/issues/36
-    if try VMStorageLocal().exists(remoteName) {
-      print("\"\(remoteName)\" is a local image, nothing to pull here!")
+    do {
+      // Be more liberal when accepting local image as argument,
+      // see https://github.com/cirruslabs/tart/issues/36
+      if VMStorageLocal().exists(remoteName) {
+        print("\"\(remoteName)\" is a local image, nothing to pull here!")

-      return
+        Foundation.exit(0)
+      }
+
+      let remoteName = try RemoteName(remoteName)
+      let registry = try Registry(host: remoteName.host, namespace: remoteName.namespace)
+
+      defaultLogger.appendNewLine("pulling \(remoteName)...")
+
+      try await VMStorageOCI().pull(remoteName, registry: registry)
+
+      Foundation.exit(0)
+    } catch {
+      print(error)
+
+      Foundation.exit(1)
    }
-
-    let remoteName = try RemoteName(remoteName)
-    let registry = try Registry(host: remoteName.host, namespace: remoteName.namespace, insecure: insecure)
-
-    defaultLogger.appendNewLine("pulling \(remoteName)...")
-
-    try await VMStorageOCI().pull(remoteName, registry: registry, concurrency: concurrency, deduplicate: deduplicate)
  }
 }
--- a/Sources/tart/Commands/Push.swift
+++ b/Sources/tart/Commands/Push.swift
@ -6,140 +6,62 @@ import Compression
 struct Push: AsyncParsableCommand {
  static var configuration = CommandConfiguration(abstract: "Push a VM to a registry")

-  @Argument(help: "local or remote VM name", completion: .custom(completeMachines))
+  @Argument(help: "local VM name")
  var localName: String

  @Argument(help: "remote VM name(s)")
  var remoteNames: [String]

-  @Flag(help: "connect to the OCI registry via insecure HTTP protocol")
-  var insecure: Bool = false
-
-  @Option(help: "network concurrency to use when pushing a local VM to the OCI-compatible registry")
-  var concurrency: UInt = 4
-
-  @Option(help: ArgumentHelp("chunk size in MB if registry supports chunked uploads",
-                             discussion: """
-                             By default monolithic method is used for uploading blobs to the registry but some registries support a more efficient chunked method.
-                             For example, AWS Elastic Container Registry supports only chunks larger than 5MB but GitHub Container Registry supports only chunks smaller than 4MB. Google Container Registry on the other hand doesn't support chunked uploads at all.
-                             Please refer to the documentation of your particular registry in order to see if this option is suitable for you and what's the recommended chunk size.
-                             """))
-  var chunkSize: Int = 0
-
-
-  @Option(name: [.customLong("label")], help: ArgumentHelp("additional metadata to attach to the OCI image configuration in key=value format",
-                                                           discussion: "Can be specified multiple times to attach multiple labels."))
-  var labels: [String] = []
-
  @Flag(help: ArgumentHelp("cache pushed images locally",
-                           discussion: "Increases disk usage, but saves time if you're going to pull the pushed images later."))
+          discussion: "Increases disk usage, but saves time if you're going to pull the pushed images later."))
  var populateCache: Bool = false

  func run() async throws {
-    let ociStorage = try VMStorageOCI()
-    let localVMDir = try VMStorageHelper.open(localName)
-    let lock = try localVMDir.lock()
-    if try !lock.trylock() {
-      throw RuntimeError.VMIsRunning(localName)
-    }
+    do {
+      let localVMDir = try VMStorageLocal().open(localName)

-    // Parse remote names supplied by the user
-    let remoteNames = try remoteNames.map{
-      try RemoteName($0)
-    }
+      // Parse remote names supplied by the user
+      let remoteNames = try remoteNames.map{
+        try RemoteName($0)
+      }

-    // Group remote names by registry
-    struct RegistryIdentifier: Hashable, Equatable {
-      var host: String
-      var namespace: String
-    }
+      // Group remote names by registry
+      struct RegistryIdentifier: Hashable, Equatable {
+        var host: String
+        var namespace: String
+      }

-    let registryGroups = Dictionary(grouping: remoteNames, by: {
-      RegistryIdentifier(host: $0.host, namespace: $0.namespace)
-    })
+      let registryGroups = Dictionary(grouping: remoteNames, by: {
+        RegistryIdentifier(host: $0.host, namespace: $0.namespace)
+      })

-    // Push VM
-    for (registryIdentifier, remoteNamesForRegistry) in registryGroups {
-      let registry = try Registry(host: registryIdentifier.host, namespace: registryIdentifier.namespace,
-                                  insecure: insecure)
+      // Push VM
+      for (registryIdentifier, remoteNamesForRegistry) in registryGroups {
+        let registry = try Registry(host: registryIdentifier.host, namespace: registryIdentifier.namespace)

-      defaultLogger.appendNewLine("pushing \(localName) to "
-        + "\(registryIdentifier.host)/\(registryIdentifier.namespace)\(remoteNamesForRegistry.referenceNames())...")
+        defaultLogger.appendNewLine("pushing \(localName) to "
+          + "\(registryIdentifier.host)/\(registryIdentifier.namespace)\(remoteNamesForRegistry.referenceNames())...")

-      let references = remoteNamesForRegistry.map{ $0.reference.value }
-
-      let pushedRemoteName: RemoteName
-      // If we're pushing a cached remote image, check if it points to an existing registry manifest
-      // and if so, only upload manifests (without config, disk and NVRAM) to the user-specified references
-      if let remoteName = try? RemoteName(localName) {
-        pushedRemoteName = try await lightweightPushToRegistry(
-          registry: registry, 
-          remoteName: remoteName,
-          references: references
-        )
-      } else {
-        let pushedImage = try await localVMDir.pushToRegistry(
-          registry: registry,
-          references: references,
-          chunkSizeMb: chunkSize,
-          concurrency: concurrency,
-          labels: parseLabels()
-        )
-        pushedRemoteName = pushedImage.name
+        let pushedRemoteName = try await localVMDir.pushToRegistry(registry: registry, references: remoteNamesForRegistry.map{ $0.reference.value })

        // Populate the local cache (if requested)
        if populateCache {
-          try ociStorage.populate(pushedImage.name, from: localVMDir, manifest: pushedImage.manifest)
+          let ociStorage = VMStorageOCI()
+          let expectedPushedVMDir = try ociStorage.create(pushedRemoteName)
+          try localVMDir.clone(to: expectedPushedVMDir, generateMAC: false)
+          for remoteName in remoteNamesForRegistry {
+            try ociStorage.link(from: remoteName, to: pushedRemoteName)
+          }
        }
      }

-      // link the rest remote names
-      if populateCache {
-        for remoteName in remoteNamesForRegistry {
-          try ociStorage.link(from: remoteName, to: pushedRemoteName)
-        }
-      }
+      Foundation.exit(0)
+    } catch {
+      print(error)
+
+      Foundation.exit(1)
    }
  }
-
-  func lightweightPushToRegistry(registry: Registry, remoteName: RemoteName, references: [String]) async throws -> RemoteName {
-    // Is the cached remote image already present in the registry?
-    let digest = try VMStorageOCI().digest(remoteName)
-
-    let (remoteManifest, _) = try await registry.pullManifest(reference: digest)
-
-    // Overwrite registry's references with the retrieved manifest
-    for reference in references {
-      defaultLogger.appendNewLine("pushing manifest for \(reference)...")
-
-      _ = try await registry.pushManifest(reference: reference, manifest: remoteManifest)
-    }
-
-    return RemoteName(host: registry.host!, namespace: registry.namespace,
-                      reference: Reference(digest: digest))
-  }
-
-  // Helper method to convert labels array to dictionary
-  func parseLabels() -> [String: String] {
-    var result = [String: String]()
-
-    for label in labels {
-      let parts = label.trimmingCharacters(in: .whitespaces).split(separator: "=", maxSplits: 1, omittingEmptySubsequences: false)
-
-      let key = parts.count > 0 ? String(parts[0]) : ""
-      let value = parts.count > 1 ? String(parts[1]) : ""
-
-      // It sometimes makes sense to provide an empty value,
-      // but not an empty key
-      if key.isEmpty {
-        continue
-      }
-
-      result[key] = value
-    }
-
-    return result
-  }  
 }

 extension Collection where Element == RemoteName {
--- a/Sources/tart/Commands/Rename.swift
+++ b/Sources/tart/Commands/Rename.swift
@ -1,32 +0,0 @@
-import ArgumentParser
-import Foundation
-
-struct Rename: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(abstract: "Rename a local VM")
-
-  @Argument(help: "VM name", completion: .custom(completeLocalMachines))
-  var name: String
-
-  @Argument(help: "new VM name")
-  var newName: String
-
-  func validate() throws {
-    if newName.contains("/") {
-      throw ValidationError("<new-name> should be a local name")
-    }
-  }
-
-  func run() async throws {
-    let localStorage = try VMStorageLocal()
-
-    if !localStorage.exists(name) {
-      throw ValidationError("failed to rename a non-existent local VM: \(name)")
-    }
-
-    if localStorage.exists(newName) {
-      throw ValidationError("failed to rename VM \(name), target VM \(newName) already exists, delete it first!")
-    }
-
-    try localStorage.rename(name, newName)
-  }
-}
--- a/Sources/tart/Commands/Run.swift
+++ b/Sources/tart/Commands/Run.swift
--- a/Sources/tart/Commands/Set.swift
+++ b/Sources/tart/Commands/Set.swift
@ -1,120 +1,69 @@
 import ArgumentParser
 import Foundation
-import Virtualization

 struct Set: AsyncParsableCommand {
  static var configuration = CommandConfiguration(commandName: "set", abstract: "Modify VM's configuration")

-  @Argument(help: "VM name", completion: .custom(completeLocalMachines))
+  @Argument(help: "VM name")
  var name: String

  @Option(help: "Number of VM CPUs")
  var cpu: UInt16?

  @Option(help: "VM memory size in megabytes")
-  var memory: UInt64?
+  var memory: UInt16?

-  @Option(help: "VM display resolution in a format of WIDTHxHEIGHT[pt|px]. For example, 1200x800, 1200x800pt or 1920x1080px. Units are treated as hints and default to \"pt\" (points) for macOS VMs and \"px\" (pixels) for Linux VMs when not specified.")
+  @Option(help: "VM display resolution in a format of <width>x<height>. For example, 1200x800")
  var display: VMDisplayConfig?

-  @Flag(inversion: .prefixedNo, help: ArgumentHelp("Whether to automatically reconfigure the VM's display to fit the window"))
-  var displayRefit: Bool? = nil
-
-  @Flag(help: ArgumentHelp("Generate a new random MAC address for the VM."))
-  var randomMAC: Bool = false
-
-  #if arch(arm64)
-    @Flag(help: ArgumentHelp("Generate a new random serial number for the macOS VM."))
-  #endif
-  var randomSerial: Bool = false
-
-  @Option(help: ArgumentHelp("Replace the VM's disk contents with the disk contents at path.", valueName: "path"))
-  var disk: String?
-
-  @Option(help: ArgumentHelp("Resize the VMs disk to the specified size in GB (note that the disk size can only be increased to avoid losing data)",
-                             discussion: """
-                             See https://tart.run/faq/#disk-resizing for more details.
-                             """))
-  var diskSize: UInt16?
+  @Option(help: .hidden)
+  var diskSize: UInt8?

  func run() async throws {
-    let vmDir = try VMStorageLocal().open(name)
+    do {
+      let vmDir = try VMStorageLocal().open(name)
+      var vmConfig = try VMConfig(fromURL: vmDir.configURL)

-    // Replacing disk.img would leave a stacked VM with both disk.img and
-    // overlay.asif, which is not a supported local layout. Reject before
-    // saving any other requested configuration changes.
-    if disk != nil, vmDir.isStackedVM {
-      throw ValidationError("--disk is not supported for VMs with a stacked disk")
-    }
-
-    var vmConfig = try VMConfig(fromURL: vmDir.configURL)
-
-    if let cpu = cpu {
-      try vmConfig.setCPU(cpuCount: Int(cpu))
-    }
-
-    if let memory = memory {
-      try vmConfig.setMemory(memorySize: memory * 1024 * 1024)
-    }
-
-    if let display = display {
-      if (display.width > 0) {
-        vmConfig.display.width = display.width
+      if let cpu = cpu {
+        try vmConfig.setCPU(cpuCount: Int(cpu))
      }
-      if (display.height > 0) {
-        vmConfig.display.height = display.height
+
+      if let memory = memory {
+        try vmConfig.setMemory(memorySize: UInt64(memory) * 1024 * 1024)
      }
-      vmConfig.display.unit = display.unit
-    }

-    vmConfig.displayRefit = displayRefit
-
-    if randomMAC {
-      vmConfig.macAddress = VZMACAddress.randomLocallyAdministered()
-    }
-
-    #if arch(arm64)
-      if randomSerial, let oldPlatform = vmConfig.platform as? Darwin {
-        vmConfig.platform = Darwin(ecid: VZMacMachineIdentifier(), hardwareModel: oldPlatform.hardwareModel)
+      if let display = display {
+        if (display.width > 0) {
+          vmConfig.display.width = display.width
+        }
+        if (display.height > 0) {
+          vmConfig.display.height = display.height
+        }
      }
-    #endif

-    try vmConfig.save(toURL: vmDir.configURL)
+      try vmConfig.save(toURL: vmDir.configURL)

-    if let disk = disk {
-      let temporaryDiskURL = try Config().tartTmpDir.appendingPathComponent("set-disk-\(UUID().uuidString)")
+      if diskSize != nil {
+        try vmDir.resizeDisk(diskSize!)
+      }

-      try FileManager.default.copyItem(atPath: disk, toPath: temporaryDiskURL.path())
+      Foundation.exit(0)
+    } catch {
+      print(error)

-      _ = try FileManager.default.replaceItemAt(vmDir.diskURL, withItemAt: temporaryDiskURL)
-    }
-
-    if diskSize != nil {
-      try vmDir.resizeDisk(diskSize!)
+      Foundation.exit(1)
    }
  }
 }

 extension VMDisplayConfig: ExpressibleByArgument {
  public init(argument: String) {
-    var argument = argument
-    var unit: Unit? = nil
-
-    if argument.hasSuffix(Unit.pixel.rawValue) {
-      argument = String(argument.dropLast(Unit.pixel.rawValue.count))
-      unit = Unit.pixel
-    } else if argument.hasSuffix(Unit.point.rawValue) {
-      argument = String(argument.dropLast(Unit.point.rawValue.count))
-      unit = Unit.point
-    }
-
    let parts = argument.components(separatedBy: "x").map {
      Int($0) ?? 0
    }
    self = VMDisplayConfig(
      width: parts[safe: 0] ?? 0,
-      height: parts[safe: 1] ?? 0,
-      unit: unit,
+      height: parts[safe: 1] ?? 0
    )
  }
 }
--- a/Sources/tart/Commands/Stop.swift
+++ b/Sources/tart/Commands/Stop.swift
@ -1,75 +0,0 @@
-import ArgumentParser
-import Foundation
-import System
-import SwiftDate
-
-struct Stop: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(commandName: "stop", abstract: "Stop a VM")
-
-  @Argument(help: "VM name", completion: .custom(completeRunningMachines))
-  var name: String
-
-  @Option(name: [.short, .long], help: "Seconds to wait for graceful termination before forcefully terminating the VM")
-  var timeout: UInt64 = 30
-
-  func run() async throws {
-    let vmDir = try VMStorageLocal().open(name)
-    switch try vmDir.state() {
-    case .Suspended:
-      try stopSuspended(vmDir)
-    case .Running:
-      try await stopRunning(vmDir)
-    case .Stopped:
-      throw RuntimeError.VMNotRunning(name)
-    }
-  }
-
-  func stopSuspended(_ vmDir: VMDirectory) throws {
-    try? FileManager.default.removeItem(at: vmDir.stateURL)
-  }
-
-  func stopRunning(_ vmDir: VMDirectory) async throws {
-    let lock = try vmDir.lock()
-
-    // Find the VM's PID
-    var pid = try lock.pid()
-    if pid == 0 {
-      throw RuntimeError.VMNotRunning(name)
-    }
-
-    // Try to gracefully terminate the VM
-    //
-    // Note that we don't check the return code here
-    // to provide a clean exit from "tart stop" in cases
-    // when the VM is already shutting down and we hit
-    // a race condition.
-    //
-    // We check the return code in the kill(2) below, though,
-    // because it's a less common scenario and it would be
-    // nice to know for the user that we've tried all methods
-    // and failed to shutdown the VM.
-    kill(pid, SIGINT)
-
-    // Ensure that the VM has terminated
-    var gracefulWaitDuration = Measurement(value: Double(timeout), unit: UnitDuration.seconds)
-    let gracefulTickDuration = Measurement(value: Double(100), unit: UnitDuration.milliseconds)
-
-    while gracefulWaitDuration.value > 0 {
-      pid = try lock.pid()
-      if pid == 0 {
-        return
-      }
-
-      try await Task.sleep(nanoseconds: UInt64(gracefulTickDuration.converted(to: .nanoseconds).value))
-      gracefulWaitDuration = gracefulWaitDuration - gracefulTickDuration
-    }
-
-    // Seems that VM is still running, proceed with forceful termination
-    let ret = kill(pid, SIGKILL)
-    if ret != 0 {
-      let details = Errno(rawValue: CInt(errno))
-
-      throw RuntimeError.VMTerminationFailed("failed to forcefully terminate the VM \"\(name)\": \(details)")
-    }
-  }
-}
--- a/Sources/tart/Commands/Suspend.swift
+++ b/Sources/tart/Commands/Suspend.swift
@ -1,28 +0,0 @@
-import ArgumentParser
-import Foundation
-import System
-import SwiftDate
-
-struct Suspend: AsyncParsableCommand {
-  static var configuration = CommandConfiguration(commandName: "suspend", abstract: "Suspend a VM")
-
-  @Argument(help: "VM name", completion: .custom(completeRunningMachines))
-  var name: String
-
-  func run() async throws {
-    let vmDir = try VMStorageLocal().open(name)
-    let lock = try vmDir.lock()
-
-    // Find the VM's PID
-    let pid = try lock.pid()
-    if pid == 0 {
-      throw RuntimeError.VMNotRunning("VM \"\(name)\" is not running")
-    }
-
-    // Tell the "tart run" process to suspend the VM
-    let ret = kill(pid, SIGUSR1)
-    if ret != 0 {
-      throw RuntimeError.SuspendFailed("failed to send SIGUSR1 signal to the \"tart run\" process running VM \"\(name)\"")
-    }
-  }
-}
--- a/Sources/tart/Config.swift
+++ b/Sources/tart/Config.swift
@ -1,73 +1,9 @@
 import Foundation

 struct Config {
-  let tartHomeDir: URL
-  let tartCacheDir: URL
-  let tartTmpDir: URL
+  public static let tartHomeDir: URL = FileManager.default
+          .homeDirectoryForCurrentUser
+          .appendingPathComponent(".tart", isDirectory: true)

-  init() throws {
-    var tartHomeDir: URL
-
-    if let customTartHome = ProcessInfo.processInfo.environment["TART_HOME"] {
-      tartHomeDir = URL(fileURLWithPath: customTartHome, isDirectory: true)
-      try Self.validateTartHome(url: tartHomeDir)
-    } else {
-      tartHomeDir = FileManager.default
-        .homeDirectoryForCurrentUser
-        .appendingPathComponent(".tart", isDirectory: true)
-    }
-    self.tartHomeDir = tartHomeDir
-
-    tartCacheDir = tartHomeDir.appendingPathComponent("cache", isDirectory: true)
-    try FileManager.default.createDirectory(at: tartCacheDir, withIntermediateDirectories: true)
-
-    tartTmpDir = tartHomeDir.appendingPathComponent("tmp", isDirectory: true)
-    try FileManager.default.createDirectory(at: tartTmpDir, withIntermediateDirectories: true)
-  }
-
-  func gc() throws {
-    for entry in try FileManager.default.contentsOfDirectory(at: tartTmpDir,
-                                                             includingPropertiesForKeys: [], options: []) {
-      let lock = try FileLock(lockURL: entry)
-      if try !lock.trylock() {
-        continue
-      }
-
-      try FileManager.default.removeItem(at: entry)
-
-      try lock.unlock()
-    }
-  }
-
-  static func jsonEncoder() -> JSONEncoder {
-    let encoder = JSONEncoder()
-
-    encoder.outputFormatting = [.sortedKeys]
-
-    return encoder
-  }
-
-  static func jsonDecoder() -> JSONDecoder {
-    JSONDecoder()
-  }
-
-  private static func validateTartHome(url: URL) throws {
-    let urlComponents = url.pathComponents
-
-    let descendingURLs = urlComponents.indices.map { i in
-      URL(fileURLWithPath: urlComponents[0...i].joined(separator: "/"))
-    }
-
-    for descendingURL in descendingURLs {
-      if FileManager.default.fileExists(atPath: descendingURL.path) {
-        continue
-      }
-
-      do {
-        try FileManager.default.createDirectory(at: descendingURL, withIntermediateDirectories: false)
-      } catch {
-        throw RuntimeError.Generic("TART_HOME is invalid: \(descendingURL.path) does not exist, yet we can't create it: \(error.localizedDescription)")
-      }
-    }
-  }
+  public static let tartCacheDir: URL = tartHomeDir.appendingPathComponent("cache", isDirectory: true)
 }
--- a/Sources/tart/ContentStore.swift
+++ b/Sources/tart/ContentStore.swift
@ -1,134 +0,0 @@
-import Foundation
-
-enum ContentStoreError: Error, Equatable {
-  case invalidContentDigest(String)
-  case contentDigestMismatch(expected: String, actual: String)
-}
-
-/// Opaque content-addressed storage for immutable reconstructed files.
-///
-/// Stacked disks currently use it for complete base disks and published ASIF
-/// overlays reconstructed from Tart disk chunks. OCI blob digests may differ
-/// across registries, so the key is the full reconstructed-file digest.
-struct ContentStore {
-  private static let digestAlgorithm = "sha256"
-  private static let digestPrefix = "\(digestAlgorithm):"
-
-  let baseURL: URL
-  private let digestDirectoryURL: URL
-
-  init() throws {
-    try self.init(baseURL: Config().tartCacheDir.appendingPathComponent("content", isDirectory: true))
-  }
-
-  init(baseURL: URL) throws {
-    self.baseURL = baseURL
-    self.digestDirectoryURL = baseURL.appendingPathComponent(Self.digestAlgorithm, isDirectory: true)
-    try FileManager.default.createDirectory(at: digestDirectoryURL, withIntermediateDirectories: true)
-  }
-
-  func contentURL(for contentDigest: String) throws -> URL {
-    let digestHex = try validatedDigestHex(contentDigest)
-
-    return digestDirectoryURL.appendingPathComponent(digestHex)
-  }
-
-  func temporaryContentURL(for contentDigest: String) throws -> URL {
-    let targetURL = try contentURL(for: contentDigest)
-
-    return targetURL.deletingLastPathComponent().appendingPathComponent(".\(UUID().uuidString).tmp")
-  }
-
-  /// Returns a stable staging path so an interrupted registry pull can resume
-  /// reconstructing this content entry on a later attempt.
-  func resumableContentURL(for contentDigest: String) throws -> URL {
-    let targetURL = try contentURL(for: contentDigest)
-
-    return targetURL.deletingLastPathComponent().appendingPathComponent(".\(targetURL.lastPathComponent).partial")
-  }
-
-  /// Returns a stable lock file for serializing reconstruction of one content
-  /// entry. The file is intentionally retained; flock state lives on the file
-  /// descriptor and disappears when the owning process exits.
-  func lockURL(for contentDigest: String) throws -> URL {
-    let targetURL = try contentURL(for: contentDigest)
-
-    let lockURL = targetURL.deletingLastPathComponent().appendingPathComponent(".\(targetURL.lastPathComponent).lock")
-    if !FileManager.default.fileExists(atPath: lockURL.path) {
-      _ = FileManager.default.createFile(atPath: lockURL.path, contents: nil)
-    }
-
-    return lockURL
-  }
-
-  /// Returns a digest-addressed entry without rereading it. Pull verifies
-  /// content hashes before accepting a cache hit; clone only needs a cheap
-  /// structural check, like Tart's existing disk.img path.
-  func contentURLIfPresent(for contentDigest: String) throws -> URL? {
-    let url = try contentURL(for: contentDigest)
-
-    guard FileManager.default.fileExists(atPath: url.path) else {
-      return nil
-    }
-
-    return url
-  }
-
-  /// Returns a validated cache hit. Corrupt files are treated as misses so a
-  /// later pull can safely rebuild them.
-  func existingContentURL(for contentDigest: String) throws -> URL? {
-    guard let url = try contentURLIfPresent(for: contentDigest) else {
-      return nil
-    }
-
-    guard try Digest.hash(url) == contentDigest else {
-      return nil
-    }
-
-    return url
-  }
-
-  /// Move a fully reconstructed temporary file into the cache after verifying
-  /// its semantic identity. The caller should create the temporary file with
-  /// temporaryContentURL(for:) or resumableContentURL(for:) so rename stays on
-  /// the same filesystem.
-  func install(_ temporaryURL: URL, contentDigest: String) throws -> URL {
-    let actualDigest = try Digest.hash(temporaryURL)
-    guard actualDigest == contentDigest else {
-      throw ContentStoreError.contentDigestMismatch(expected: contentDigest, actual: actualDigest)
-    }
-
-    let targetURL = try contentURL(for: contentDigest)
-    let lock = try FileLock(lockURL: baseURL)
-    try lock.lock()
-    defer { try? lock.unlock() }
-
-    if let existingURL = try existingContentURL(for: contentDigest) {
-      try? FileManager.default.removeItem(at: temporaryURL)
-      return existingURL
-    }
-
-    if FileManager.default.fileExists(atPath: targetURL.path) {
-      _ = try FileManager.default.replaceItemAt(targetURL, withItemAt: temporaryURL)
-    } else {
-      try FileManager.default.moveItem(at: temporaryURL, to: targetURL)
-    }
-
-    return targetURL
-  }
-
-  private func validatedDigestHex(_ contentDigest: String) throws -> String {
-    guard contentDigest.hasPrefix(Self.digestPrefix) else {
-      throw ContentStoreError.invalidContentDigest(contentDigest)
-    }
-
-    let digestHex = String(contentDigest.dropFirst(Self.digestPrefix.count))
-    let isHex = digestHex.allSatisfy { $0.isHexDigit && !$0.isUppercase }
-
-    guard digestHex.count == 64, isHex else {
-      throw ContentStoreError.invalidContentDigest(contentDigest)
-    }
-
-    return digestHex
-  }
-}
--- a/Sources/tart/ControlSocket.swift
+++ b/Sources/tart/ControlSocket.swift
@ -1,107 +0,0 @@
-import Foundation
-import Network
-import os.log
-import NIO
-import NIOPosix
-
-@available(macOS 14, *)
-class ControlSocket {
-  typealias ServerChannel = NIOAsyncChannel<NIOAsyncChannel<ByteBuffer, ByteBuffer>, Never>
-
-  let controlSocketURL: URL
-  let vmPort: UInt32
-  let eventLoopGroup: MultiThreadedEventLoopGroup
-  let serverChannel: ServerChannel
-  let logger: os.Logger = os.Logger(subsystem: "org.cirruslabs.tart.control-socket", category: "network")
-
-  init(_ controlSocketURL: URL, vmPort: UInt32 = 8080) async throws {
-    self.controlSocketURL = controlSocketURL
-    self.vmPort = vmPort
-    let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
-    self.eventLoopGroup = eventLoopGroup
-
-    // Remove control socket file from previous "tart run" invocations,
-    // if any, otherwise we may get the "address already in use" error
-    try? FileManager.default.removeItem(atPath: controlSocketURL.path())
-
-    // Change the current working directory to a VM's base directory
-    // to work around Unix domain socket 104 byte limitation [1]
-    //
-    // [1]: https://blog.8-p.info/en/2020/06/11/unix-domain-socket-length/
-    if let baseURL = controlSocketURL.baseURL {
-      FileManager.default.changeCurrentDirectoryPath(baseURL.path())
-    }
-
-    do {
-      self.serverChannel = try await ServerBootstrap(group: eventLoopGroup)
-        .bind(unixDomainSocketPath: controlSocketURL.relativePath) { childChannel in
-          childChannel.eventLoop.makeCompletedFuture {
-            return try NIOAsyncChannel<ByteBuffer, ByteBuffer>(
-              wrappingChannelSynchronously: childChannel
-            )
-          }
-        }
-    } catch {
-      try? await eventLoopGroup.shutdownGracefully()
-      throw error
-    }
-  }
-
-  func run() async throws {
-    try await withThrowingDiscardingTaskGroup { group in
-      try await serverChannel.executeThenClose { serverInbound in
-        for try await clientChannel in serverInbound {
-          group.addTask {
-            try await self.handleClient(clientChannel)
-          }
-        }
-      }
-    }
-  }
-
-  func handleClient(_ clientChannel: NIOAsyncChannel<ByteBuffer, ByteBuffer>) async throws {
-    self.logger.info("received new control socket connection from a client")
-
-    try await clientChannel.executeThenClose { clientInbound, clientOutbound in
-      self.logger.info("dialing to VM on port \(self.vmPort)...")
-
-      do {
-        guard let vmConnection = try await vm?.connect(toPort: self.vmPort) else {
-          throw RuntimeError.VMSocketFailed(self.vmPort, "VM is not running")
-        }
-
-        self.logger.info("running control socket proxy")
-
-        let vmChannel = try await ClientBootstrap(group: eventLoopGroup).withConnectedSocket(vmConnection.fileDescriptor) { childChannel in
-          childChannel.eventLoop.makeCompletedFuture {
-            try NIOAsyncChannel<ByteBuffer, ByteBuffer>(
-              wrappingChannelSynchronously: childChannel
-            )
-          }
-        }
-
-        try await vmChannel.executeThenClose { (vmInbound, vmOutbound) in
-          try await withThrowingDiscardingTaskGroup { group in
-            // Proxy data from a client (e.g. "tart exec") to a VM
-            group.addTask {
-              for try await message in clientInbound {
-                try await vmOutbound.write(message)
-              }
-            }
-
-            // Proxy data from a VM to a client (e.g. "tart exec")
-            group.addTask {
-              for try await message in vmInbound {
-                try await clientOutbound.write(message)
-              }
-            }
-          }
-        }
-
-        self.logger.info("control socket client disconnected")
-      } catch (let error) {
-        self.logger.error("control socket connection failed: \(error)")
-      }
-    }
-  }
-}
--- a/Sources/tart/Credentials/CredentialsProvider.swift
+++ b/Sources/tart/Credentials/CredentialsProvider.swift
@ -1,11 +1,10 @@
 import Foundation

 enum CredentialsProviderError: Error {
-  case Failed(message: String)
+    case Failed(message: String)
 }

 protocol CredentialsProvider {
-  var userFriendlyName: String { get }
-  func retrieve(host: String) throws -> (String, String)?
-  func store(host: String, user: String, password: String) throws
+    func retrieve(host: String) throws -> (String, String)?
+    func store(host: String, user: String, password: String) throws
 }
--- a/Sources/tart/Credentials/DockerConfigCredentialsProvider.swift
+++ b/Sources/tart/Credentials/DockerConfigCredentialsProvider.swift
@ -1,120 +0,0 @@
-import Foundation
-
-class DockerConfigCredentialsProvider: CredentialsProvider {
-  let userFriendlyName = "Docker configuration credentials provider"
-
-  func retrieve(host: String) throws -> (String, String)? {
-    let dockerConfigURL = FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent(".docker").appendingPathComponent("config.json")
-    if !FileManager.default.fileExists(atPath: dockerConfigURL.path) {
-      return nil
-    }
-    let config = try JSONDecoder().decode(DockerConfig.self, from: Data(contentsOf: dockerConfigURL))
-
-    if let credentialsFromAuth = config.auths?[host]?.decodeCredentials() {
-      return credentialsFromAuth
-    }
-    if let helperProgram = try config.findCredHelper(host: host) {
-      return try executeHelper(binaryName: "docker-credential-\(helperProgram)", host: host)
-    }
-
-    return nil
-  }
-
-  private func executeHelper(binaryName: String, host: String) throws -> (String, String)? {
-    guard let executableURL = resolveBinaryPath(binaryName) else {
-      throw CredentialsProviderError.Failed(message: "\(binaryName) not found in PATH")
-    }
-
-    let process = Process.init()
-    process.executableURL = executableURL
-    process.arguments = ["get"]
-
-    let outPipe = Pipe()
-    let inPipe = Pipe()
-
-    process.standardOutput = outPipe
-    process.standardError = outPipe
-    process.standardInput = inPipe
-
-    process.launch()
-
-    do {
-      try inPipe.fileHandleForWriting.write(contentsOf: "\(host)\n".data(using: .utf8)!)
-    } catch {
-      throw CredentialsProviderError.Failed(message: "Failed to write host to Docker helper!")
-    }
-    inPipe.fileHandleForWriting.closeFile()
-
-    let outputData = try outPipe.fileHandleForReading.readToEnd()
-
-    process.waitUntilExit()
-
-    if !(process.terminationReason == .exit && process.terminationStatus == 0) {
-      if let outputData = outputData {
-        print(String(decoding: outputData, as: UTF8.self))
-      }
-      throw CredentialsProviderError.Failed(message: "Docker helper failed!")
-    }
-    if outputData == nil || outputData?.count == 0 {
-      throw CredentialsProviderError.Failed(message: "Docker helper output is empty!")
-    }
-
-    let getOutput = try JSONDecoder().decode(DockerGetOutput.self, from: outputData!)
-    return (getOutput.Username, getOutput.Secret)
-  }
-
-  func store(host: String, user: String, password: String) throws {
-    throw CredentialsProviderError.Failed(message: "Docker helpers don't support storing!")
-  }
-}
-
-struct DockerConfig: Codable {
-  var auths: Dictionary<String, DockerAuthConfig>? = Dictionary()
-  var credHelpers: Dictionary<String, String>? = Dictionary()
-
-  func findCredHelper(host: String) throws -> String? {
-    // Tart supports wildcards in credHelpers
-    // Similar to what is requested from Docker: https://github.com/docker/cli/issues/2928
-
-    guard let credHelpers else {
-      return nil
-    }
-
-    for (hostPattern, helperProgram) in credHelpers {
-      if (hostPattern == host) {
-        return helperProgram
-      }
-      let compiledPattern = try? Regex(hostPattern)
-      if (try compiledPattern?.wholeMatch(in: host) != nil) {
-        return helperProgram
-      }
-    }
-    return nil
-  }
-}
-
-struct DockerAuthConfig: Codable {
-  var auth: String? = nil
-
-  func decodeCredentials() -> (String, String)? {
-    // auth is a base64("username:password")
-    guard let authBase64 = auth else {
-      return nil
-    }
-    guard let data = Data(base64Encoded: authBase64) else {
-      return nil
-    }
-    guard let components = String(data: data, encoding: .utf8)?.components(separatedBy: ":") else {
-      return nil
-    }
-    if components.count != 2 {
-      return nil
-    }
-    return (components[0], components[1])
-  }
-}
-
-struct DockerGetOutput: Codable {
-  var Username: String
-  var Secret: String
-}
--- a/Sources/tart/Credentials/EnvironmentCredentialsProvider.swift
+++ b/Sources/tart/Credentials/EnvironmentCredentialsProvider.swift
@ -1,22 +0,0 @@
-import Foundation
-
-class EnvironmentCredentialsProvider: CredentialsProvider {
-  let userFriendlyName = "environment variable credentials provider"
-
-  func retrieve(host: String) throws -> (String, String)? {
-    if let tartRegistryHostname = ProcessInfo.processInfo.environment["TART_REGISTRY_HOSTNAME"],
-       tartRegistryHostname != host {
-      return nil
-    }
-
-    let username = ProcessInfo.processInfo.environment["TART_REGISTRY_USERNAME"]
-    let password = ProcessInfo.processInfo.environment["TART_REGISTRY_PASSWORD"]
-    if let username = username, let password = password {
-      return (username, password)
-    }
-    return nil
-  }
-
-  func store(host: String, user: String, password: String) throws {
-  }
-}
--- a/Sources/tart/Credentials/KeychainCredentialsProvider.swift
+++ b/Sources/tart/Credentials/KeychainCredentialsProvider.swift
@ -1,90 +1,54 @@
 import Foundation

 class KeychainCredentialsProvider: CredentialsProvider {
-  let userFriendlyName = "Keychain credentials provider"
+    func retrieve(host: String) throws -> (String, String)? {
+        let query: [String: Any] = [kSecClass as String: kSecClassInternetPassword,
+                                    kSecAttrProtocol as String: kSecAttrProtocolHTTPS,
+                                    kSecAttrServer as String: host,
+                                    kSecMatchLimit as String: kSecMatchLimitOne,
+                                    kSecReturnAttributes as String: true,
+                                    kSecReturnData as String: true,
+                                    kSecAttrLabel as String: "Tart Credentials",
+        ]

-  func retrieve(host: String) throws -> (String, String)? {
-    let query: [String: Any] = [kSecClass as String: kSecClassInternetPassword,
-                                kSecAttrProtocol as String: kSecAttrProtocolHTTPS,
-                                kSecAttrServer as String: host,
-                                kSecMatchLimit as String: kSecMatchLimitOne,
-                                kSecReturnAttributes as String: true,
-                                kSecReturnData as String: true,
-                                kSecAttrLabel as String: "Tart Credentials",
-    ]
+        var item: CFTypeRef?
+        let status = SecItemCopyMatching(query as CFDictionary, &item)

-    var item: CFTypeRef?
-    let status = SecItemCopyMatching(query as CFDictionary, &item)
+        if status != errSecSuccess {
+            if status == errSecItemNotFound {
+                return nil
+            }

-    if status != errSecSuccess {
-      if status == errSecItemNotFound {
-        return nil
-      }
+            throw CredentialsProviderError.Failed(message: "Keychain returned unsuccessful status \(status)")
+        }

-      throw CredentialsProviderError.Failed(message: "Keychain returned unsuccessful status \(status)")
+        guard let item = item as? [String: Any],
+              let user = item[kSecAttrAccount as String] as? String,
+              let passwordData = item[kSecValueData as String] as? Data,
+              let password = String(data: passwordData, encoding: .utf8)
+        else {
+            throw CredentialsProviderError.Failed(message: "Keychain item has unexpected format")
+        }
+
+        return (user, password)
    }

-    guard let item = item as? [String: Any],
-          let user = item[kSecAttrAccount as String] as? String,
-          let passwordData = item[kSecValueData as String] as? Data,
-          let password = String(data: passwordData, encoding: .utf8)
-    else {
-      throw CredentialsProviderError.Failed(message: "Keychain item has unexpected format")
+    func store(host: String, user: String, password: String) throws {
+        let attributes: [String: Any] = [kSecClass as String: kSecClassInternetPassword,
+                                         kSecAttrAccount as String: user,
+                                         kSecAttrProtocol as String: kSecAttrProtocolHTTPS,
+                                         kSecAttrServer as String: host,
+                                         kSecValueData as String: password,
+                                         kSecAttrLabel as String: "Tart Credentials",
+        ]
+
+        let status = SecItemAdd(attributes as CFDictionary, nil)
+
+        switch status {
+        case errSecSuccess, errSecDuplicateItem:
+            return
+        default:
+            throw CredentialsProviderError.Failed(message: "Keychain returned unsuccessful status \(status)")
+        }
    }
-
-    return (user, password)
-  }
-
-  func store(host: String, user: String, password: String) throws {
-    let passwordData = password.data(using: .utf8)
-    let key: [String: Any] = [kSecClass as String: kSecClassInternetPassword,
-                              kSecAttrProtocol as String: kSecAttrProtocolHTTPS,
-                              kSecAttrServer as String: host,
-                              kSecAttrLabel as String: "Tart Credentials",
-    ]
-    let value: [String: Any] = [kSecAttrAccount as String: user,
-                                kSecValueData as String: passwordData as Any,
-    ]
-
-    let status = SecItemCopyMatching(key as CFDictionary, nil)
-
-    switch status {
-    case errSecItemNotFound:
-      let status = SecItemAdd(key.merging(value) { (current, _) in current } as CFDictionary, nil)
-      if status != errSecSuccess {
-        throw CredentialsProviderError.Failed(message: "Keychain failed to add item: \(status.explanation())")
-      }
-    case errSecSuccess:
-      let status = SecItemUpdate(key as CFDictionary, value as CFDictionary)
-      if status != errSecSuccess {
-        throw CredentialsProviderError.Failed(message: "Keychain failed to update item: \(status.explanation())")
-      }
-    default:
-      throw CredentialsProviderError.Failed(message: "Keychain failed to find item: \(status.explanation())")
-    }
-  }
-
-  func remove(host: String) throws {
-    let query: [String: Any] = [kSecClass as String: kSecClassInternetPassword,
-                                kSecAttrServer as String: host,
-                                kSecAttrLabel as String: "Tart Credentials",
-    ]
-
-    let status = SecItemDelete(query as CFDictionary)
-
-    switch status {
-    case errSecSuccess:
-      return
-    case errSecItemNotFound:
-      return
-    default:
-      throw CredentialsProviderError.Failed(message: "Failed to remove Keychain item(s): \(status.explanation())")
-    }
-  }
-}
-
-extension OSStatus {
-  func explanation() -> CFString {
-    SecCopyErrorMessageString(self, nil) ?? "Unknown status code \(self)." as CFString
-  }
 }
--- a/Sources/tart/Credentials/StdinCredentials.swift
+++ b/Sources/tart/Credentials/StdinCredentials.swift
@ -6,8 +6,6 @@ enum StdinCredentialsError: Error {
 }

 class StdinCredentials {
-  let userFriendlyName = "standard input credentials provider"
-
  static func retrieve() throws -> (String, String) {
    let user = try readStdinCredential(name: "username", prompt: "User: ", isSensitive: false)
    let password = try readStdinCredential(name: "password", prompt: "Password: ", isSensitive: true)
@ -15,7 +13,7 @@ class StdinCredentials {
    return (user, password)
  }

-  private static func readStdinCredential(name: String, prompt: String, maxCharacters: Int = 8192, isSensitive: Bool) throws -> String {
+  private static func readStdinCredential(name: String, prompt: String, maxCharacters: Int = 255, isSensitive: Bool) throws -> String {
    var buf = [CChar](repeating: 0, count: maxCharacters + 1 /* sentinel */ + 1 /* NUL */)
    guard let rawCredential = readpassphrase(prompt, &buf, buf.count, isSensitive ? RPP_ECHO_OFF : RPP_ECHO_ON) else {
      throw StdinCredentialsError.CredentialRequired(which: name)
--- a/Sources/tart/DeviceInfo/DeviceInfo.swift
+++ b/Sources/tart/DeviceInfo/DeviceInfo.swift
@ -1,37 +0,0 @@
-import Foundation
-import Sysctl
-
-class DeviceInfo {
-  private static var osMemoized: String? = nil
-  private static var modelMemoized: String? = nil
-
-  static var os: String {
-    if let os = osMemoized {
-      return os
-    }
-
-    osMemoized = getOS()
-
-    return osMemoized!
-  }
-
-  static var model: String {
-    if let model = modelMemoized {
-      return model
-    }
-
-    modelMemoized = getModel()
-
-    return modelMemoized!
-  }
-
-  private static func getOS() -> String {
-    let osVersion = ProcessInfo.processInfo.operatingSystemVersion
-
-    return "macOS \(osVersion.majorVersion).\(osVersion.minorVersion).\(osVersion.patchVersion)"
-  }
-
-  private static func getModel() -> String {
-    return SystemControl().hardware.model
-  }
-}
--- a/Sources/tart/DiskImageFormat.swift
+++ b/Sources/tart/DiskImageFormat.swift
@ -1,43 +0,0 @@
-import Foundation
-import ArgumentParser
-
-enum DiskImageFormat: String, CaseIterable, Codable {
-  case raw = "raw"
-  case asif = "asif"
-
-  var displayName: String {
-    switch self {
-    case .raw:
-      return "RAW"
-    case .asif:
-      return "ASIF (Apple Sparse Image Format)"
-    }
-  }
-
-
-  /// Check if the format is supported on the current system
-  var isSupported: Bool {
-    switch self {
-    case .raw:
-      return true
-    case .asif:
-      if #available(macOS 26, *) {
-        return true
-      } else {
-        return false
-      }
-    }
-  }
-
-
-}
-
-extension DiskImageFormat: ExpressibleByArgument {
-  init?(argument: String) {
-    self.init(rawValue: argument.lowercased())
-  }
-
-  static var allValueStrings: [String] {
-    return allCases.map { $0.rawValue }
-  }
-}
--- a/Sources/tart/DiskImageStack.swift
+++ b/Sources/tart/DiskImageStack.swift
@ -1,302 +0,0 @@
-import Foundation
-import Virtualization
-
-#if canImport(DiskImageKit)
-  import DiskImageKit
-#endif
-
-/// The logical block layout exposed by a disk image.
-struct DiskImageBlockLayout {
-  let blockSize: UInt64
-  let blockCount: UInt64
-}
-
-enum DiskImageStackError: Error, Equatable, CustomStringConvertible {
-  case unavailable
-  case writableOverlayAlreadyExists(URL)
-  case writableOverlayMissing(URL)
-  case invalidBlockLayout(String)
-  case invalidDiskImage(URL, String)
-
-  var description: String {
-    switch self {
-    case .unavailable:
-      "stacked disks require DiskImageKit on macOS 27 or newer"
-    case .writableOverlayAlreadyExists(let url):
-      "writable overlay already exists: \(url.path)"
-    case .writableOverlayMissing(let url):
-      "writable overlay is missing: \(url.path)"
-    case .invalidBlockLayout(let reason):
-      reason
-    case .invalidDiskImage(let url, let reason):
-      "\(reason): \(url.path)"
-    }
-  }
-}
-
-struct DiskImageStack {
-  /// DiskImageKit-ready paths and block layout after Tart disk chunks have been
-  /// reconstructed into complete immutable files. The writable overlay stays
-  /// private to one VM.
-  let baseURL: URL
-  let baseFormat: DiskImageFormat
-  let immutableOverlayURLs: [URL]
-  let writableOverlayURL: URL
-  let blockSize: UInt64
-  let blockCount: UInt64
-
-  /// Reads a disk image's current block layout without resolving or validating a
-  /// whole stack. This is used for the VM's private writable overlay, whose
-  /// size may be newer than the pinned immutable parent manifest.
-  static func diskImageBlockLayout(at url: URL) throws -> DiskImageBlockLayout {
-    #if canImport(DiskImageKit)
-      if #available(macOS 27.0, *) {
-        let image = try DiskImage(opening: .open(url: url, mode: .readOnly))
-        return DiskImageBlockLayout(
-          blockSize: UInt64(image.blockSize.rawValue),
-          blockCount: UInt64(image.blockCount)
-        )
-      }
-    #endif
-
-    throw DiskImageStackError.unavailable
-  }
-
-  static func baseBlockLayout(
-    at url: URL,
-    expectedFormat: DiskImageFormat
-  ) throws -> DiskImageBlockLayout {
-    #if canImport(DiskImageKit)
-      if #available(macOS 27.0, *) {
-        let image = try DiskImage(opening: .open(url: url, mode: .readOnly))
-        let matchesFormat = switch expectedFormat {
-        case .raw:
-          image.format == .raw
-        case .asif:
-          image.format == .asif
-        }
-        guard matchesFormat else {
-          throw DiskImageStackError.invalidDiskImage(url, "base disk format does not match")
-        }
-        guard image.layerType == nil, image.parentUUID == nil else {
-          throw DiskImageStackError.invalidDiskImage(url, "base disk must not be an overlay")
-        }
-        if expectedFormat == .asif && image.layerUUID == nil {
-          throw DiskImageStackError.invalidDiskImage(url, "ASIF base disk is missing a UUID")
-        }
-
-        return DiskImageBlockLayout(
-          blockSize: UInt64(image.blockSize.rawValue),
-          blockCount: UInt64(image.blockCount)
-        )
-      }
-    #endif
-
-    throw DiskImageStackError.unavailable
-  }
-
-  func createWritableOverlay() throws {
-    #if canImport(DiskImageKit)
-      if #available(macOS 27.0, *) {
-        try createWritableOverlayWithDiskImageKit()
-        return
-      }
-    #endif
-
-    throw DiskImageStackError.unavailable
-  }
-
-  func copyWritableOverlay(to destinationURL: URL) throws {
-    guard !FileManager.default.fileExists(atPath: destinationURL.path) else {
-      throw DiskImageStackError.writableOverlayAlreadyExists(destinationURL)
-    }
-
-    try FileManager.default.copyItem(at: writableOverlayURL, to: destinationURL)
-  }
-
-  func makeAttachment(
-    readOnly: Bool = false,
-    cachingMode: VZDiskImageCachingMode = .automatic,
-    synchronizationMode: VZDiskImageSynchronizationMode = .full
-  ) throws -> VZStorageDeviceAttachment {
-    #if canImport(DiskImageKit)
-      if #available(macOS 27.0, *) {
-        return try attachmentWithDiskImageKit(
-          readOnly: readOnly,
-          cachingMode: cachingMode,
-          synchronizationMode: synchronizationMode
-        )
-      }
-    #endif
-
-    throw DiskImageStackError.unavailable
-  }
-
-  func growWritableOverlay(toBlockCount blockCount: UInt64) throws {
-    #if canImport(DiskImageKit)
-      if #available(macOS 27.0, *) {
-        try growWritableOverlayWithDiskImageKit(toBlockCount: blockCount)
-        return
-      }
-    #endif
-
-    throw DiskImageStackError.unavailable
-  }
-
-  #if canImport(DiskImageKit)
-    @available(macOS 27.0, *)
-    private func createWritableOverlayWithDiskImageKit() throws {
-      guard !FileManager.default.fileExists(atPath: writableOverlayURL.path) else {
-        throw DiskImageStackError.writableOverlayAlreadyExists(writableOverlayURL)
-      }
-
-      let parent = try validatedParentImage()
-      let stackedImage = try parent.appending(.asifLayer(url: writableOverlayURL, type: .overlay))
-      try validateAppendedOverlay(stackedImage, at: writableOverlayURL)
-    }
-
-    @available(macOS 27.0, *)
-    private func attachmentWithDiskImageKit(
-      readOnly: Bool,
-      cachingMode: VZDiskImageCachingMode,
-      synchronizationMode: VZDiskImageSynchronizationMode
-    ) throws -> VZDiskImageStorageDeviceAttachment {
-      guard FileManager.default.fileExists(atPath: writableOverlayURL.path) else {
-        throw DiskImageStackError.writableOverlayMissing(writableOverlayURL)
-      }
-
-      let parent = try validatedParentImage()
-      let writableOverlay = try openOverlay(
-        at: writableOverlayURL,
-        mode: readOnly ? .readOnly : .readWrite
-      )
-      let stackedImage = try append(writableOverlay, to: parent, at: writableOverlayURL)
-      try validateAppendedOverlay(stackedImage, at: writableOverlayURL)
-
-      return try VZDiskImageStorageDeviceAttachment(
-        diskImage: stackedImage,
-        cachingMode: cachingMode,
-        synchronizationMode: synchronizationMode
-      )
-    }
-
-    @available(macOS 27.0, *)
-    private func growWritableOverlayWithDiskImageKit(toBlockCount blockCount: UInt64) throws {
-      guard blockCount > 0, let desiredBlockCount = Int(exactly: blockCount) else {
-        throw DiskImageStackError.invalidBlockLayout("invalid stacked disk block count \(blockCount)")
-      }
-
-      let parent = try validatedParentImage()
-      let overlay = try openOverlay(
-        at: writableOverlayURL,
-        mode: .readWrite
-      )
-      let currentBlockCount = overlay.blockCount
-      let stackedImage = try append(overlay, to: parent, at: writableOverlayURL)
-      try validateAppendedOverlay(stackedImage, at: writableOverlayURL)
-      guard desiredBlockCount >= currentBlockCount else {
-        throw DiskImageStackError.invalidDiskImage(writableOverlayURL, "ASIF overlay block count shrinks the stacked disk")
-      }
-
-      guard let writableOverlay = stackedImage.layers.last else {
-        throw DiskImageStackError.invalidDiskImage(writableOverlayURL, "disk image must be an ASIF overlay")
-      }
-      if desiredBlockCount > currentBlockCount {
-        try writableOverlay.truncate(blockCount: desiredBlockCount)
-      }
-    }
-
-    @available(macOS 27.0, *)
-    private func validatedParentImage() throws -> DiskImage {
-      let expectedBlockSize = try diskImageBlockSize(blockSize)
-      guard blockCount > 0, let expectedBlockCount = Int(exactly: blockCount) else {
-        throw DiskImageStackError.invalidBlockLayout("invalid stacked disk block count \(blockCount)")
-      }
-
-      let baseImage = try DiskImage(opening: .open(url: baseURL, mode: .readOnly))
-      try validateBase(baseImage, at: baseURL, expectedFormat: baseFormat)
-
-      var image = baseImage
-
-      for overlayURL in immutableOverlayURLs {
-        let openedOverlay = try openOverlay(
-          at: overlayURL,
-          mode: .readOnly
-        )
-        let stackedImage = try append(openedOverlay, to: image, at: overlayURL)
-        try validateAppendedOverlay(stackedImage, at: overlayURL)
-        image = stackedImage
-      }
-
-      guard image.blockSize == expectedBlockSize else {
-        throw DiskImageStackError.invalidBlockLayout("immutable disk stack does not match manifest block size")
-      }
-      guard image.blockCount == expectedBlockCount else {
-        throw DiskImageStackError.invalidBlockLayout("immutable disk stack does not match manifest block count")
-      }
-
-      return image
-    }
-
-    @available(macOS 27.0, *)
-    private func validateBase(
-      _ image: DiskImage,
-      at url: URL,
-      expectedFormat: DiskImageFormat
-    ) throws {
-      let matchesFormat = switch expectedFormat {
-      case .raw:
-        image.format == .raw
-      case .asif:
-        image.format == .asif
-      }
-      guard matchesFormat else {
-        throw DiskImageStackError.invalidDiskImage(url, "base disk format does not match")
-      }
-      guard image.layerType == nil, image.parentUUID == nil else {
-        throw DiskImageStackError.invalidDiskImage(url, "base disk must not be an overlay")
-      }
-      if expectedFormat == .asif && image.layerUUID == nil {
-        throw DiskImageStackError.invalidDiskImage(url, "ASIF base disk is missing a UUID")
-      }
-    }
-
-    @available(macOS 27.0, *)
-    private func openOverlay(
-      at url: URL,
-      mode: OpenConfiguration.Mode
-    ) throws -> DiskImage {
-      let image = try DiskImage(opening: .open(url: url, mode: mode))
-      guard image.format == .asif else {
-        throw DiskImageStackError.invalidDiskImage(url, "overlay must use ASIF format")
-      }
-
-      return image
-    }
-
-    @available(macOS 27.0, *)
-    private func append(_ overlay: DiskImage, to parent: DiskImage, at url: URL) throws -> any StackedImage {
-      do {
-        return try parent.appending(overlay)
-      } catch is IncompatibleStackingError {
-        throw DiskImageStackError.invalidDiskImage(url, "ASIF overlay is incompatible with its parent")
-      }
-    }
-
-    @available(macOS 27.0, *)
-    private func validateAppendedOverlay(_ image: any StackedImage, at url: URL) throws {
-      guard image.layers.last?.layerType == .overlay else {
-        throw DiskImageStackError.invalidDiskImage(url, "disk image must be an ASIF overlay")
-      }
-    }
-
-    @available(macOS 27.0, *)
-    private func diskImageBlockSize(_ value: UInt64) throws -> DiskImage.BlockSize {
-      guard let intValue = Int(exactly: value), let blockSize = DiskImage.BlockSize(rawValue: intValue) else {
-        throw DiskImageStackError.invalidBlockLayout("unsupported stacked disk block size \(value)")
-      }
-
-      return blockSize
-    }
-  #endif
-}
--- a/Sources/tart/Diskutil.swift
+++ b/Sources/tart/Diskutil.swift
@ -1,108 +0,0 @@
-import Foundation
-
-struct ImageInfo: Codable {
-  let sizeInfo: SizeInfo?
-  let size: UInt64?
-
-  enum CodingKeys: String, CodingKey {
-    case sizeInfo = "Size Info"
-    case size = "Size"
-  }
-
-  func totalBytes() throws -> Int {
-    if let totalBytes = self.sizeInfo?.totalBytes {
-      return Int(totalBytes)
-    }
-
-    if let size = self.size {
-      return Int(size)
-    }
-
-    throw RuntimeError.Generic("Could not find size information in disk image info")
-  }
-}
-
-struct SizeInfo: Codable {
-  let totalBytes: UInt64?
-
-  enum CodingKeys: String, CodingKey {
-    case totalBytes = "Total Bytes"
-  }
-}
-
-struct Diskutil {
-  static func imageCreate(diskURL: URL, sizeGB: UInt16) throws {
-    do {
-      _ = try run([
-        "image", "create", "blank",
-        "--format", "ASIF",
-        "--size", "\(sizeGB)G",
-        "--volumeName", "Tart",
-        diskURL.path
-      ])
-    } catch {
-      throw RuntimeError.FailedToCreateDisk("Failed to create ASIF disk image: \(error)")
-    }
-  }
-
-  static func imageInfo(_ diskURL: URL) throws -> ImageInfo {
-    do {
-      let (stdoutData, _) = try run([
-        "image", "info", "--plist",
-        diskURL.path
-      ])
-
-      do {
-        return try PropertyListDecoder().decode(ImageInfo.self, from: stdoutData)
-      } catch {
-        throw RuntimeError.Generic("Failed to parse \"diskutil image info --plist\" output: \(error)")
-      }
-    }
-  }
-
-  private static func run(_ arguments: [String]) throws -> (Data, Data) {
-    guard let diskutilURL = resolveBinaryPath("diskutil") else {
-      throw RuntimeError.Generic("\"diskutil\" binary is not found in PATH")
-    }
-
-    let process = Process()
-    process.executableURL = diskutilURL
-    process.arguments = arguments
-
-    let stdoutPipe = Pipe()
-    process.standardOutput = stdoutPipe
-    let stderrPipe = Pipe()
-    process.standardError = stderrPipe
-
-    do {
-      try process.run()
-    } catch {
-      throw RuntimeError.Generic("\"\(arguments.joined(separator: " "))\" failed: \(error)")
-    }
-    process.waitUntilExit()
-
-    let stdoutData = stdoutPipe.fileHandleForReading.readDataToEndOfFile()
-    let stderrData = stderrPipe.fileHandleForReading.readDataToEndOfFile()
-
-    if process.terminationStatus != 0 {
-      let stdoutString = String(data: stdoutData, encoding: .utf8) ?? ""
-      let stderrString = String(data: stderrData, encoding: .utf8) ?? ""
-
-      throw RuntimeError.Generic("\"\(arguments.joined(separator: " "))\" failed with exit code \(process.terminationStatus): \(firstNonEmptyLine(stderrString, stdoutString))")
-    }
-
-    return (stdoutData, stderrData)
-  }
-
-  private static func firstNonEmptyLine(_ outputs: String...) -> String {
-    for output in outputs {
-      for line in output.split(separator: "\n", omittingEmptySubsequences: false) {
-        if !line.isEmpty {
-          return String(line)
-        }
-      }
-    }
-
-    return ""
-  }
-}
--- a/Sources/tart/Embed.swift
+++ b/Sources/tart/Embed.swift
--- a/Sources/tart/Fetcher.swift
+++ b/Sources/tart/Fetcher.swift
@ -1,97 +0,0 @@
-import Foundation
-
-fileprivate var urlSession: URLSession = {
-  let config = URLSessionConfiguration.default
-
-  // Harbor expects a CSRF token to be present if the HTTP client
-  // carries a session cookie between its requests[1] and fails if
-  // it was not present[2].
-  //
-  // To fix that, we disable the automatic cookies carry in URLSession.
-  //
-  // [1]: https://github.com/goharbor/harbor/blob/a4c577f9ec4f18396207a5e686433a6ba203d4ef/src/server/middleware/csrf/csrf.go#L78
-  // [2]: https://github.com/cirruslabs/tart/issues/295
-  config.httpShouldSetCookies = false
-
-  return URLSession(configuration: config)
-}()
-
-class Fetcher {
-  static func fetch(_ request: URLRequest, viaFile: Bool = false) async throws -> (AsyncThrowingStream<Data, Error>, HTTPURLResponse) {
-    let task = urlSession.dataTask(with: request)
-
-    let delegate = Delegate()
-    task.delegate = delegate
-
-    let stream = AsyncThrowingStream<Data, Error> { continuation in
-      delegate.streamContinuation = continuation
-    }
-
-    let response = try await withCheckedThrowingContinuation { continuation in
-      delegate.responseContinuation = continuation
-      task.resume()
-    }
-
-    return (stream, response as! HTTPURLResponse)
-  }
-}
-
-fileprivate class Delegate: NSObject, URLSessionDataDelegate {
-  var responseContinuation: CheckedContinuation<URLResponse, Error>?
-  var streamContinuation: AsyncThrowingStream<Data, Error>.Continuation?
-
-  private var buffer: Data = Data()
-  private let bufferFlushSize = 16 * 1024 * 1024
-
-  func urlSession(
-    _ session: URLSession,
-    dataTask: URLSessionDataTask,
-    didReceive response: URLResponse,
-    completionHandler: @escaping (URLSession.ResponseDisposition) -> Void
-  ) {
-    // Soft-limit for the maximum buffer capacity
-    let capacity = min(response.expectedContentLength, Int64(bufferFlushSize))
-
-    // Pre-initialize buffer as we now know the capacity
-    buffer = Data(capacity: Int(capacity))
-
-    responseContinuation?.resume(returning: response)
-    responseContinuation = nil
-    completionHandler(.allow)
-  }
-
-  func urlSession(
-    _ session: URLSession,
-    dataTask: URLSessionDataTask,
-    didReceive data: Data
-  ) {
-    buffer.append(data)
-
-    if buffer.count >= bufferFlushSize {
-      streamContinuation?.yield(buffer)
-      buffer.removeAll(keepingCapacity: true)
-    }
-  }
-
-  func urlSession(
-    _ session: URLSession,
-    task: URLSessionTask,
-    didCompleteWithError error: Error?
-  ) {
-    if let error = error {
-      responseContinuation?.resume(throwing: error)
-      responseContinuation = nil
-
-      streamContinuation?.finish(throwing: error)
-      streamContinuation = nil
-    } else {
-      if !buffer.isEmpty {
-        streamContinuation?.yield(buffer)
-        buffer.removeAll(keepingCapacity: true)
-      }
-
-      streamContinuation?.finish()
-      streamContinuation = nil
-    }
-  }
-}
--- a/Show More
+++ b/Show More