From b0b977de63e9642fe17125131cad864121a3ae33 Mon Sep 17 00:00:00 2001
From: ada <ada@cubething.dev>
Date: Thu, 5 Feb 2026 18:49:43 -0600
Subject: [PATCH 1/6] refactor: mv tfw -> app

---
 .config/mise.toml                             |   5 +
 crates/{template => app}/CHANGELOG.md         |   0
 crates/{template => app}/Cargo.toml           |   0
 crates/{template => app}/README.md            |   8 +-
 crates/{template => app}/build.rs             |   0
 crates/{template => app}/src/clap.rs          |   0
 .../src/docs/architecture.md                  |   0
 crates/{template => app}/src/docs/cli.md      |   0
 .../src/docs/events_systems_scopes.md         |   0
 crates/{template => app}/src/docs/mod.rs      |   0
 crates/{template => app}/src/lib.rs           |   0
 crates/{template => app}/src/main.rs          |   0
 crates/{template => app}/src/plugin.rs        |   0
 .../src/screen/dev/camera_test/data.rs        |   0
 .../src/screen/dev/camera_test/mod.rs         |   0
 .../src/screen/dev/camera_test/screen.rs      |   0
 .../{template => app}/src/screen/dev/mod.rs   |   0
 crates/{template => app}/src/screen/mod.rs    |   0
 .../src/screen/splash/mod.rs                  |   0
 .../src/screen/splash/state.rs                |   0
 .../src/screen/splash/systems.rs              |   0
 crates/{template => app}/src/screen/util.rs   |   0
 .../{template => app}/src/screen/world/mod.rs |   0
 .../src/screen/world/screen.rs                |   0
 crates/{template => app}/src/service/data.rs  |   0
 .../src/service/dev/gizmos/data.rs            |   0
 .../src/service/dev/gizmos/mod.rs             |   0
 .../src/service/dev/gizmos/systems.rs         |   0
 .../{template => app}/src/service/dev/mod.rs  |   0
 .../service/input/camera/controller/data.rs   |   0
 .../service/input/camera/controller/events.rs |   0
 .../service/input/camera/controller/mod.rs    |   0
 .../service/input/camera/data/input_ctx.rs    |   0
 .../src/service/input/camera/data/mod.rs      |   0
 .../src/service/input/camera/fly/bundle.rs    |   0
 .../src/service/input/camera/fly/data.rs      |   0
 .../src/service/input/camera/fly/events.rs    |   0
 .../src/service/input/camera/fly/mod.rs       |   0
 .../src/service/input/camera/mod.rs           |   0
 .../service/input/camera/tracking/bundle.rs   |   0
 .../src/service/input/camera/tracking/data.rs |   0
 .../service/input/camera/tracking/events.rs   |   0
 .../src/service/input/camera/tracking/mod.rs  |   0
 .../service/input/camera/tracking/systems.rs  |   0
 .../src/service/input/cursor/data.rs          |   0
 .../src/service/input/cursor/events.rs        |   0
 .../src/service/input/cursor/mod.rs           |   0
 .../src/service/input/data.rs                 |   0
 .../src/service/input/events.rs               |   0
 .../src/service/input/mod.rs                  |   0
 crates/{template => app}/src/service/mod.rs   |   0
 .../src/service/player/data.rs                |   0
 .../src/service/player/events.rs              |   0
 .../src/service/player/mod.rs                 |   0
 .../src/service/player/systems.rs             |   0
 .../{template => app}/src/service/text/mod.rs |   0
 .../src/service/third_party.rs                |   0
 .../{template => app}/src/service/ui/mod.rs   |   0
 crates/{template => app}/src/service/util.rs  |   0
 .../src/service/worldgen/data.rs              |   0
 .../src/service/worldgen/mod.rs               |   0
 crates/template/.config/mise.toml             | 110 ------------
 .../template/.config/scripts/.python-version  |   1 -
 .../template/.config/scripts/new_mod/main.py  |  50 ------
 .../template/.config/scripts/new_mod/util.py  | 159 ------------------
 .../template/.config/scripts/pyproject.toml   |  12 --
 .../templates/screen/cargo-generate.toml      |   5 -
 .../.config/templates/screen/mod.rs.liquid    |  20 ---
 .../.config/templates/screen/screen.rs.liquid |  34 ----
 .../templates/service/bundle.rs.liquid        |  10 --
 .../templates/service/cargo-generate.toml     |  14 --
 .../.config/templates/service/data.rs.liquid  |  15 --
 .../templates/service/events.rs.liquid        |   9 -
 .../.config/templates/service/mod.rs.liquid   |  34 ----
 .../templates/service/systems.rs.liquid       |  10 --
 crates/template/.github/workflows/ci.yaml     |  54 ------
 crates/template/.zed/debug.json               |  15 --
 crates/template/.zed/settings.json            |  23 ---
 78 files changed, 6 insertions(+), 582 deletions(-)
 rename crates/{template => app}/CHANGELOG.md (100%)
 rename crates/{template => app}/Cargo.toml (100%)
 rename crates/{template => app}/README.md (70%)
 rename crates/{template => app}/build.rs (100%)
 rename crates/{template => app}/src/clap.rs (100%)
 rename crates/{template => app}/src/docs/architecture.md (100%)
 rename crates/{template => app}/src/docs/cli.md (100%)
 rename crates/{template => app}/src/docs/events_systems_scopes.md (100%)
 rename crates/{template => app}/src/docs/mod.rs (100%)
 rename crates/{template => app}/src/lib.rs (100%)
 rename crates/{template => app}/src/main.rs (100%)
 rename crates/{template => app}/src/plugin.rs (100%)
 rename crates/{template => app}/src/screen/dev/camera_test/data.rs (100%)
 rename crates/{template => app}/src/screen/dev/camera_test/mod.rs (100%)
 rename crates/{template => app}/src/screen/dev/camera_test/screen.rs (100%)
 rename crates/{template => app}/src/screen/dev/mod.rs (100%)
 rename crates/{template => app}/src/screen/mod.rs (100%)
 rename crates/{template => app}/src/screen/splash/mod.rs (100%)
 rename crates/{template => app}/src/screen/splash/state.rs (100%)
 rename crates/{template => app}/src/screen/splash/systems.rs (100%)
 rename crates/{template => app}/src/screen/util.rs (100%)
 rename crates/{template => app}/src/screen/world/mod.rs (100%)
 rename crates/{template => app}/src/screen/world/screen.rs (100%)
 rename crates/{template => app}/src/service/data.rs (100%)
 rename crates/{template => app}/src/service/dev/gizmos/data.rs (100%)
 rename crates/{template => app}/src/service/dev/gizmos/mod.rs (100%)
 rename crates/{template => app}/src/service/dev/gizmos/systems.rs (100%)
 rename crates/{template => app}/src/service/dev/mod.rs (100%)
 rename crates/{template => app}/src/service/input/camera/controller/data.rs (100%)
 rename crates/{template => app}/src/service/input/camera/controller/events.rs (100%)
 rename crates/{template => app}/src/service/input/camera/controller/mod.rs (100%)
 rename crates/{template => app}/src/service/input/camera/data/input_ctx.rs (100%)
 rename crates/{template => app}/src/service/input/camera/data/mod.rs (100%)
 rename crates/{template => app}/src/service/input/camera/fly/bundle.rs (100%)
 rename crates/{template => app}/src/service/input/camera/fly/data.rs (100%)
 rename crates/{template => app}/src/service/input/camera/fly/events.rs (100%)
 rename crates/{template => app}/src/service/input/camera/fly/mod.rs (100%)
 rename crates/{template => app}/src/service/input/camera/mod.rs (100%)
 rename crates/{template => app}/src/service/input/camera/tracking/bundle.rs (100%)
 rename crates/{template => app}/src/service/input/camera/tracking/data.rs (100%)
 rename crates/{template => app}/src/service/input/camera/tracking/events.rs (100%)
 rename crates/{template => app}/src/service/input/camera/tracking/mod.rs (100%)
 rename crates/{template => app}/src/service/input/camera/tracking/systems.rs (100%)
 rename crates/{template => app}/src/service/input/cursor/data.rs (100%)
 rename crates/{template => app}/src/service/input/cursor/events.rs (100%)
 rename crates/{template => app}/src/service/input/cursor/mod.rs (100%)
 rename crates/{template => app}/src/service/input/data.rs (100%)
 rename crates/{template => app}/src/service/input/events.rs (100%)
 rename crates/{template => app}/src/service/input/mod.rs (100%)
 rename crates/{template => app}/src/service/mod.rs (100%)
 rename crates/{template => app}/src/service/player/data.rs (100%)
 rename crates/{template => app}/src/service/player/events.rs (100%)
 rename crates/{template => app}/src/service/player/mod.rs (100%)
 rename crates/{template => app}/src/service/player/systems.rs (100%)
 rename crates/{template => app}/src/service/text/mod.rs (100%)
 rename crates/{template => app}/src/service/third_party.rs (100%)
 rename crates/{template => app}/src/service/ui/mod.rs (100%)
 rename crates/{template => app}/src/service/util.rs (100%)
 rename crates/{template => app}/src/service/worldgen/data.rs (100%)
 rename crates/{template => app}/src/service/worldgen/mod.rs (100%)
 delete mode 100644 crates/template/.config/mise.toml
 delete mode 100644 crates/template/.config/scripts/.python-version
 delete mode 100644 crates/template/.config/scripts/new_mod/main.py
 delete mode 100644 crates/template/.config/scripts/new_mod/util.py
 delete mode 100644 crates/template/.config/scripts/pyproject.toml
 delete mode 100644 crates/template/.config/templates/screen/cargo-generate.toml
 delete mode 100644 crates/template/.config/templates/screen/mod.rs.liquid
 delete mode 100644 crates/template/.config/templates/screen/screen.rs.liquid
 delete mode 100644 crates/template/.config/templates/service/bundle.rs.liquid
 delete mode 100644 crates/template/.config/templates/service/cargo-generate.toml
 delete mode 100644 crates/template/.config/templates/service/data.rs.liquid
 delete mode 100644 crates/template/.config/templates/service/events.rs.liquid
 delete mode 100644 crates/template/.config/templates/service/mod.rs.liquid
 delete mode 100644 crates/template/.config/templates/service/systems.rs.liquid
 delete mode 100644 crates/template/.github/workflows/ci.yaml
 delete mode 100644 crates/template/.zed/debug.json
 delete mode 100644 crates/template/.zed/settings.json

diff --git a/.config/mise.toml b/.config/mise.toml
index e52f235..10e5b52 100644
--- a/.config/mise.toml
+++ b/.config/mise.toml
@@ -1,5 +1,10 @@
 experimental_monorepo_root = true
 
+[monorepo]
+config_roots = [
+    "crates/template/.config"
+]
+
 [env]
 _.source = ".config/env.sh"
 
diff --git a/crates/template/CHANGELOG.md b/crates/app/CHANGELOG.md
similarity index 100%
rename from crates/template/CHANGELOG.md
rename to crates/app/CHANGELOG.md
diff --git a/crates/template/Cargo.toml b/crates/app/Cargo.toml
similarity index 100%
rename from crates/template/Cargo.toml
rename to crates/app/Cargo.toml
diff --git a/crates/template/README.md b/crates/app/README.md
similarity index 70%
rename from crates/template/README.md
rename to crates/app/README.md
index 74714fd..d55f5d0 100644
--- a/crates/template/README.md
+++ b/crates/app/README.md
@@ -1,10 +1,4 @@
-<div align="center">
-<img src="https://raw.githubusercontent.com/ada-x64/qproj/refs/heads/main/.doc/tfw.png" height=300 alt="Illustration of a tufted titmouse with text, 'tfw - bevy template framework'" title="tfw logo" />
-</div>
-
-This is a template-based template for a bevy project. It is a simplification of the work done for [q_service.](https://github.com/ada-x64/q_service)
-
-_This continues the work started [here.](https://github.com/ada-x64/tfw)_
+app
 
 ## Goals
 
diff --git a/crates/template/build.rs b/crates/app/build.rs
similarity index 100%
rename from crates/template/build.rs
rename to crates/app/build.rs
diff --git a/crates/template/src/clap.rs b/crates/app/src/clap.rs
similarity index 100%
rename from crates/template/src/clap.rs
rename to crates/app/src/clap.rs
diff --git a/crates/template/src/docs/architecture.md b/crates/app/src/docs/architecture.md
similarity index 100%
rename from crates/template/src/docs/architecture.md
rename to crates/app/src/docs/architecture.md
diff --git a/crates/template/src/docs/cli.md b/crates/app/src/docs/cli.md
similarity index 100%
rename from crates/template/src/docs/cli.md
rename to crates/app/src/docs/cli.md
diff --git a/crates/template/src/docs/events_systems_scopes.md b/crates/app/src/docs/events_systems_scopes.md
similarity index 100%
rename from crates/template/src/docs/events_systems_scopes.md
rename to crates/app/src/docs/events_systems_scopes.md
diff --git a/crates/template/src/docs/mod.rs b/crates/app/src/docs/mod.rs
similarity index 100%
rename from crates/template/src/docs/mod.rs
rename to crates/app/src/docs/mod.rs
diff --git a/crates/template/src/lib.rs b/crates/app/src/lib.rs
similarity index 100%
rename from crates/template/src/lib.rs
rename to crates/app/src/lib.rs
diff --git a/crates/template/src/main.rs b/crates/app/src/main.rs
similarity index 100%
rename from crates/template/src/main.rs
rename to crates/app/src/main.rs
diff --git a/crates/template/src/plugin.rs b/crates/app/src/plugin.rs
similarity index 100%
rename from crates/template/src/plugin.rs
rename to crates/app/src/plugin.rs
diff --git a/crates/template/src/screen/dev/camera_test/data.rs b/crates/app/src/screen/dev/camera_test/data.rs
similarity index 100%
rename from crates/template/src/screen/dev/camera_test/data.rs
rename to crates/app/src/screen/dev/camera_test/data.rs
diff --git a/crates/template/src/screen/dev/camera_test/mod.rs b/crates/app/src/screen/dev/camera_test/mod.rs
similarity index 100%
rename from crates/template/src/screen/dev/camera_test/mod.rs
rename to crates/app/src/screen/dev/camera_test/mod.rs
diff --git a/crates/template/src/screen/dev/camera_test/screen.rs b/crates/app/src/screen/dev/camera_test/screen.rs
similarity index 100%
rename from crates/template/src/screen/dev/camera_test/screen.rs
rename to crates/app/src/screen/dev/camera_test/screen.rs
diff --git a/crates/template/src/screen/dev/mod.rs b/crates/app/src/screen/dev/mod.rs
similarity index 100%
rename from crates/template/src/screen/dev/mod.rs
rename to crates/app/src/screen/dev/mod.rs
diff --git a/crates/template/src/screen/mod.rs b/crates/app/src/screen/mod.rs
similarity index 100%
rename from crates/template/src/screen/mod.rs
rename to crates/app/src/screen/mod.rs
diff --git a/crates/template/src/screen/splash/mod.rs b/crates/app/src/screen/splash/mod.rs
similarity index 100%
rename from crates/template/src/screen/splash/mod.rs
rename to crates/app/src/screen/splash/mod.rs
diff --git a/crates/template/src/screen/splash/state.rs b/crates/app/src/screen/splash/state.rs
similarity index 100%
rename from crates/template/src/screen/splash/state.rs
rename to crates/app/src/screen/splash/state.rs
diff --git a/crates/template/src/screen/splash/systems.rs b/crates/app/src/screen/splash/systems.rs
similarity index 100%
rename from crates/template/src/screen/splash/systems.rs
rename to crates/app/src/screen/splash/systems.rs
diff --git a/crates/template/src/screen/util.rs b/crates/app/src/screen/util.rs
similarity index 100%
rename from crates/template/src/screen/util.rs
rename to crates/app/src/screen/util.rs
diff --git a/crates/template/src/screen/world/mod.rs b/crates/app/src/screen/world/mod.rs
similarity index 100%
rename from crates/template/src/screen/world/mod.rs
rename to crates/app/src/screen/world/mod.rs
diff --git a/crates/template/src/screen/world/screen.rs b/crates/app/src/screen/world/screen.rs
similarity index 100%
rename from crates/template/src/screen/world/screen.rs
rename to crates/app/src/screen/world/screen.rs
diff --git a/crates/template/src/service/data.rs b/crates/app/src/service/data.rs
similarity index 100%
rename from crates/template/src/service/data.rs
rename to crates/app/src/service/data.rs
diff --git a/crates/template/src/service/dev/gizmos/data.rs b/crates/app/src/service/dev/gizmos/data.rs
similarity index 100%
rename from crates/template/src/service/dev/gizmos/data.rs
rename to crates/app/src/service/dev/gizmos/data.rs
diff --git a/crates/template/src/service/dev/gizmos/mod.rs b/crates/app/src/service/dev/gizmos/mod.rs
similarity index 100%
rename from crates/template/src/service/dev/gizmos/mod.rs
rename to crates/app/src/service/dev/gizmos/mod.rs
diff --git a/crates/template/src/service/dev/gizmos/systems.rs b/crates/app/src/service/dev/gizmos/systems.rs
similarity index 100%
rename from crates/template/src/service/dev/gizmos/systems.rs
rename to crates/app/src/service/dev/gizmos/systems.rs
diff --git a/crates/template/src/service/dev/mod.rs b/crates/app/src/service/dev/mod.rs
similarity index 100%
rename from crates/template/src/service/dev/mod.rs
rename to crates/app/src/service/dev/mod.rs
diff --git a/crates/template/src/service/input/camera/controller/data.rs b/crates/app/src/service/input/camera/controller/data.rs
similarity index 100%
rename from crates/template/src/service/input/camera/controller/data.rs
rename to crates/app/src/service/input/camera/controller/data.rs
diff --git a/crates/template/src/service/input/camera/controller/events.rs b/crates/app/src/service/input/camera/controller/events.rs
similarity index 100%
rename from crates/template/src/service/input/camera/controller/events.rs
rename to crates/app/src/service/input/camera/controller/events.rs
diff --git a/crates/template/src/service/input/camera/controller/mod.rs b/crates/app/src/service/input/camera/controller/mod.rs
similarity index 100%
rename from crates/template/src/service/input/camera/controller/mod.rs
rename to crates/app/src/service/input/camera/controller/mod.rs
diff --git a/crates/template/src/service/input/camera/data/input_ctx.rs b/crates/app/src/service/input/camera/data/input_ctx.rs
similarity index 100%
rename from crates/template/src/service/input/camera/data/input_ctx.rs
rename to crates/app/src/service/input/camera/data/input_ctx.rs
diff --git a/crates/template/src/service/input/camera/data/mod.rs b/crates/app/src/service/input/camera/data/mod.rs
similarity index 100%
rename from crates/template/src/service/input/camera/data/mod.rs
rename to crates/app/src/service/input/camera/data/mod.rs
diff --git a/crates/template/src/service/input/camera/fly/bundle.rs b/crates/app/src/service/input/camera/fly/bundle.rs
similarity index 100%
rename from crates/template/src/service/input/camera/fly/bundle.rs
rename to crates/app/src/service/input/camera/fly/bundle.rs
diff --git a/crates/template/src/service/input/camera/fly/data.rs b/crates/app/src/service/input/camera/fly/data.rs
similarity index 100%
rename from crates/template/src/service/input/camera/fly/data.rs
rename to crates/app/src/service/input/camera/fly/data.rs
diff --git a/crates/template/src/service/input/camera/fly/events.rs b/crates/app/src/service/input/camera/fly/events.rs
similarity index 100%
rename from crates/template/src/service/input/camera/fly/events.rs
rename to crates/app/src/service/input/camera/fly/events.rs
diff --git a/crates/template/src/service/input/camera/fly/mod.rs b/crates/app/src/service/input/camera/fly/mod.rs
similarity index 100%
rename from crates/template/src/service/input/camera/fly/mod.rs
rename to crates/app/src/service/input/camera/fly/mod.rs
diff --git a/crates/template/src/service/input/camera/mod.rs b/crates/app/src/service/input/camera/mod.rs
similarity index 100%
rename from crates/template/src/service/input/camera/mod.rs
rename to crates/app/src/service/input/camera/mod.rs
diff --git a/crates/template/src/service/input/camera/tracking/bundle.rs b/crates/app/src/service/input/camera/tracking/bundle.rs
similarity index 100%
rename from crates/template/src/service/input/camera/tracking/bundle.rs
rename to crates/app/src/service/input/camera/tracking/bundle.rs
diff --git a/crates/template/src/service/input/camera/tracking/data.rs b/crates/app/src/service/input/camera/tracking/data.rs
similarity index 100%
rename from crates/template/src/service/input/camera/tracking/data.rs
rename to crates/app/src/service/input/camera/tracking/data.rs
diff --git a/crates/template/src/service/input/camera/tracking/events.rs b/crates/app/src/service/input/camera/tracking/events.rs
similarity index 100%
rename from crates/template/src/service/input/camera/tracking/events.rs
rename to crates/app/src/service/input/camera/tracking/events.rs
diff --git a/crates/template/src/service/input/camera/tracking/mod.rs b/crates/app/src/service/input/camera/tracking/mod.rs
similarity index 100%
rename from crates/template/src/service/input/camera/tracking/mod.rs
rename to crates/app/src/service/input/camera/tracking/mod.rs
diff --git a/crates/template/src/service/input/camera/tracking/systems.rs b/crates/app/src/service/input/camera/tracking/systems.rs
similarity index 100%
rename from crates/template/src/service/input/camera/tracking/systems.rs
rename to crates/app/src/service/input/camera/tracking/systems.rs
diff --git a/crates/template/src/service/input/cursor/data.rs b/crates/app/src/service/input/cursor/data.rs
similarity index 100%
rename from crates/template/src/service/input/cursor/data.rs
rename to crates/app/src/service/input/cursor/data.rs
diff --git a/crates/template/src/service/input/cursor/events.rs b/crates/app/src/service/input/cursor/events.rs
similarity index 100%
rename from crates/template/src/service/input/cursor/events.rs
rename to crates/app/src/service/input/cursor/events.rs
diff --git a/crates/template/src/service/input/cursor/mod.rs b/crates/app/src/service/input/cursor/mod.rs
similarity index 100%
rename from crates/template/src/service/input/cursor/mod.rs
rename to crates/app/src/service/input/cursor/mod.rs
diff --git a/crates/template/src/service/input/data.rs b/crates/app/src/service/input/data.rs
similarity index 100%
rename from crates/template/src/service/input/data.rs
rename to crates/app/src/service/input/data.rs
diff --git a/crates/template/src/service/input/events.rs b/crates/app/src/service/input/events.rs
similarity index 100%
rename from crates/template/src/service/input/events.rs
rename to crates/app/src/service/input/events.rs
diff --git a/crates/template/src/service/input/mod.rs b/crates/app/src/service/input/mod.rs
similarity index 100%
rename from crates/template/src/service/input/mod.rs
rename to crates/app/src/service/input/mod.rs
diff --git a/crates/template/src/service/mod.rs b/crates/app/src/service/mod.rs
similarity index 100%
rename from crates/template/src/service/mod.rs
rename to crates/app/src/service/mod.rs
diff --git a/crates/template/src/service/player/data.rs b/crates/app/src/service/player/data.rs
similarity index 100%
rename from crates/template/src/service/player/data.rs
rename to crates/app/src/service/player/data.rs
diff --git a/crates/template/src/service/player/events.rs b/crates/app/src/service/player/events.rs
similarity index 100%
rename from crates/template/src/service/player/events.rs
rename to crates/app/src/service/player/events.rs
diff --git a/crates/template/src/service/player/mod.rs b/crates/app/src/service/player/mod.rs
similarity index 100%
rename from crates/template/src/service/player/mod.rs
rename to crates/app/src/service/player/mod.rs
diff --git a/crates/template/src/service/player/systems.rs b/crates/app/src/service/player/systems.rs
similarity index 100%
rename from crates/template/src/service/player/systems.rs
rename to crates/app/src/service/player/systems.rs
diff --git a/crates/template/src/service/text/mod.rs b/crates/app/src/service/text/mod.rs
similarity index 100%
rename from crates/template/src/service/text/mod.rs
rename to crates/app/src/service/text/mod.rs
diff --git a/crates/template/src/service/third_party.rs b/crates/app/src/service/third_party.rs
similarity index 100%
rename from crates/template/src/service/third_party.rs
rename to crates/app/src/service/third_party.rs
diff --git a/crates/template/src/service/ui/mod.rs b/crates/app/src/service/ui/mod.rs
similarity index 100%
rename from crates/template/src/service/ui/mod.rs
rename to crates/app/src/service/ui/mod.rs
diff --git a/crates/template/src/service/util.rs b/crates/app/src/service/util.rs
similarity index 100%
rename from crates/template/src/service/util.rs
rename to crates/app/src/service/util.rs
diff --git a/crates/template/src/service/worldgen/data.rs b/crates/app/src/service/worldgen/data.rs
similarity index 100%
rename from crates/template/src/service/worldgen/data.rs
rename to crates/app/src/service/worldgen/data.rs
diff --git a/crates/template/src/service/worldgen/mod.rs b/crates/app/src/service/worldgen/mod.rs
similarity index 100%
rename from crates/template/src/service/worldgen/mod.rs
rename to crates/app/src/service/worldgen/mod.rs
diff --git a/crates/template/.config/mise.toml b/crates/template/.config/mise.toml
deleted file mode 100644
index 7d6d407..0000000
--- a/crates/template/.config/mise.toml
+++ /dev/null
@@ -1,110 +0,0 @@
-# GENERATION ##################################################################
-
-[tasks.new]
-raw=true
-alias=['generate', 'n']
-description="Generate a new service or screen."
-tools={"cargo:cargo-generate" = "latest"}
-usage = '''
-arg "<template>" help="The template to generate." {
-    choices "screen" "service"
-}
-
-arg "<name>" help="Name of the generated module." long_help="""
-The chosen template will be output to the src directory corresponding to the
-template, postfixed with given template name. For example, calling
-'mise new service foo/bar' will generate 'src/service/foo/bar/...'.
-"""
-
-flag "--base-path <path>" help="Base path for the project. Scripts expect modules named '$BASE_PATH/${service, screen}' Defaults to 'src'" default="src"
-
-flag "--debug" help="Enable debug output."
-'''
-run='''
-#!/usr/bin/bash
-TEMPLATE=${usage_template?}
-NAME=${usage_name?}
-DEBUG=${usage_debug:+--debug}
-BASE_PATH=${usage_base_path?}
-
-BASENAME=$(basename $NAME)
-DESTINATION="$(realpath $BASE_PATH/$TEMPLATE/$(dirname $NAME))"
-
-if [[ -n "$DEBUG" ]]; then
-cat <<EOF
-DEBUG
-TEMPLATE="$TEMPLATE"
-NAME="$NAME"
-BASENAME="$BASENAME"
-DESTINATION="$DESTINATION"
-EOF
-fi
-
-catch_err () {
-    VAL=$?
-    if [ $VAL -ne 0 ]; then
-        echo "Got exit code $VAL!"
-        echo "Reverting changes on fail..."
-        set -x
-        git restore $DESTINATION/mod.rs
-        rm $DESTINATION/$BASENAME -r
-        exit 1
-    fi
-}
-
-cargo generate \
-    --name "$BASENAME" \
-    -d name="$BASENAME" \
-    --path ".config/templates/$TEMPLATE" \
-    --destination "$DESTINATION";
-
-catch_err
-
-uv run .config/scripts/new_mod/main.py\
-    "$DESTINATION/$BASENAME"
-
-catch_err
-
-echo "[INFO] Formatting ..."
-cargo fmt -- -l;
-'''
-
-[tasks.delete]
-alias=['del', 'd']
-description="Remove a generated service or screen"
-usage = '''
-arg "<template>" help="The template to remove." {
-    choices "screen" "service"
-}
-
-arg "<name>" help="Name of the generated module." long_help="""
-The chosen template will be removed from the src directory corresponding to the
-template, postfixed with given template name. For example, calling
-'mise new service foo/bar' will generate 'src/service/foo/bar/...'.
-"""
-
-flag "--base-path <path>" help="Base path for the project. Scripts expect modules named '$BASE_PATH/${service, screen}' Defaults to 'src'" default="src"
-
-flag "--debug" help="Enable debug output."
-'''
-run='''
-#!/usr/bin/bash
-set -e
-TEMPLATE=${usage_template?}
-NAME=${usage_name?}
-BASE_PATH=${usage_base_path?}
-DESTINATION="$(realpath $BASE_PATH/$TEMPLATE/$NAME)"
-DEBUG=${usage_debug:+--debug}
-
-uv run .config/scripts/new_mod/main.py\
-    "$DESTINATION" \
-    --remove \
-    $DEBUG
-
-set -x
-rm -r $DESTINATION
-set +x
-
-echo "[INFO] Formatting ..."
-cargo fmt -- -l;
-'''
diff --git a/crates/template/.config/scripts/.python-version b/crates/template/.config/scripts/.python-version
deleted file mode 100644
index 24ee5b1..0000000
--- a/crates/template/.config/scripts/.python-version
+++ /dev/null
@@ -1 +0,0 @@
-3.13
diff --git a/crates/template/.config/scripts/new_mod/main.py b/crates/template/.config/scripts/new_mod/main.py
deleted file mode 100644
index 091eafb..0000000
--- a/crates/template/.config/scripts/new_mod/main.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import argparse
-from util import get_vars, add_module, remove_module, Args
-import util
-from typing import cast
-
-# parse args
-parser = argparse.ArgumentParser(prog="update_parent_module")
-_ = parser.add_argument("base-path")
-_ = parser.add_argument("--debug", action="store_true")
-_ = parser.add_argument("--remove", action="store_true")
-args = parser.parse_args()
-args = cast(Args, args)
-
-get_vars(args)
-vars = util.vars
-
-# modify super module
-util.read(vars.super_mod)
-if args.remove:
-    remove_module()
-else:
-    add_module()
-util.write(vars.super_mod)
-
-# update screen enum
-if vars.is_screen:
-    util.read(vars.screens_data_mod)
-    if args.remove:
-        util.re_replace(
-            vars.screens_exists_expr,
-            "",
-            "Could not find screen name in Screens enum. Please remove the screen manually, if it exists.",
-        )
-        util.re_replace(
-            vars.screens_pat_expr,
-            "",
-            "Could not find screen name in Screens impl. Please remove the screen manually, if it exists.",
-        )
-    else:
-        util.insert_after(
-            [vars.screens_expr],
-            vars.screens_str,
-            "Could not find Screens enum. Please register the screen manually.",
-        )
-        util.insert_after(
-            [vars.screens_match_expr],
-            vars.screens_pat,
-            "Could not find screen conversion fn. Please insert manually.",
-        )
-    util.write(vars.screens_data_mod)
diff --git a/crates/template/.config/scripts/new_mod/util.py b/crates/template/.config/scripts/new_mod/util.py
deleted file mode 100644
index db5fc70..0000000
--- a/crates/template/.config/scripts/new_mod/util.py
+++ /dev/null
@@ -1,159 +0,0 @@
-from os import PathLike, fspath, path, stat
-import re
-from dataclasses import dataclass, asdict
-from os.path import basename, join, realpath
-from re import Match, Pattern
-from pprint import pformat
-import logging
-import argparse
-
-type Expr = Pattern[str]
-
-
-@dataclass
-class Args(argparse.Namespace):
-    base_path: PathLike[str] | None
-    remove: bool
-    debug: bool
-
-
-@dataclass
-class Vars:
-    use_expr: Expr
-    mod_expr: Expr
-    prelude_expr: Expr
-    plugin_expr: Expr
-    screens_expr: Expr
-    screens_pat_expr: Expr
-    screens_match_expr: Expr
-    screens_exists_expr: Expr
-    screens_data_mod: str
-    super_mod: str
-    mod_name: str
-    mod_str: str
-    prelude_str: str
-    plugin_str: str
-    screens_str: str
-    screens_pat: str
-    file_str: str
-    is_screen: bool
-
-
-def get_vars(args: Args):
-    global vars, logger
-
-    logging.basicConfig(
-        level=logging.DEBUG if args.debug else logging.INFO,
-        format="[%(levelname)s] %(message)s",
-    )
-    logger = logging.getLogger(__name__)
-
-    if args.base_path is None:
-        logger.error("Please provide a module path.\n")
-        exit(1)
-
-    mod_name = basename(args.base_path)
-    mod_camel_case = mod_name.replace("_", " ").title().replace(" ", "")
-    vars = Vars(
-        use_expr=re.compile(r"(\s*use\s+[\w:]+;\n?)+"),
-        mod_expr=re.compile(r"(\s*mod\s+\w+;\n?)+"),
-        prelude_expr=re.compile(r"\s*pub mod prelude \{"),
-        plugin_expr=re.compile(r"\s*pub fn plugin\(_?\w+: &mut App\) \{[^}]*"),
-        screens_expr=re.compile(r"enum Screens \{[^}]*"),
-        screens_exists_expr=re.compile(rf"\s+{mod_camel_case},?\s+"),
-        screens_pat_expr=re.compile(rf"Screens::{mod_camel_case}\s+=>\s+\"\w+\",?"),
-        screens_match_expr=re.compile(
-            r"pub\s+const\s+fn\s+as_screen_type\(self\)\s+->\s+ScreenId\s+\{\n.+match self \{"
-        ),
-        screens_data_mod=realpath(join(args.base_path, "../data.rs")),
-        super_mod=realpath(join(args.base_path, "../mod.rs")),
-        mod_name=mod_name,
-        mod_str=f"mod {mod_name};",
-        prelude_str=f"pub use super::{mod_name}::prelude::*;",
-        plugin_str=f"app.add_plugins({mod_name}::plugin);",
-        screens_str=f"{mod_camel_case},",
-        screens_pat=f'Screens::{mod_camel_case} => "{mod_name}",',
-        file_str="",
-        is_screen="/screen" in fspath(args.base_path),
-    )
-
-    if args.debug:
-        logger.debug(pformat(asdict(vars)))
-
-
-def add_module():
-    global vars
-    ms = vars.mod_str.center(len(vars.mod_str) + 2)
-    prs = vars.prelude_str.center(len(vars.prelude_str) + 2)
-    pls = vars.plugin_str.center(len(vars.plugin_str) + 2)
-
-    if not try_insert_after([vars.mod_expr, vars.use_expr], ms):
-        insert(0, ms)
-
-    insert_after(
-        [vars.prelude_expr], prs, "No prelude found, not exposing new module's prelude"
-    )
-    insert_after(
-        [vars.plugin_expr],
-        pls,
-        "Could not find plugin insertion point, please insert the plugin manually.",
-    )
-
-
-def remove_module():
-    global vars
-    replace(vars.mod_str, "")
-    replace(vars.prelude_str, "")
-    replace(vars.plugin_str, "")
-
-
-def insert(pos: int, inserted_str: str):
-    global vars
-    vars.file_str = vars.file_str[:pos] + inserted_str + vars.file_str[pos:]
-
-
-def read(file: str):
-    global vars
-    with open(file) as buf:
-        vars.file_str = buf.read()
-
-
-def write(file: str):
-    global vars
-    with open(file, "w") as buf:
-        logger.info(f"Writing to {file}")
-        _ = buf.write(vars.file_str)
-
-
-def replace(match: str, replace: str):
-    vars.file_str = vars.file_str.replace(match, replace)
-
-
-def re_replace(pattern: Expr, replace: str, msg_on_err: str):
-    if match := find([pattern]):
-        vars.file_str = vars.file_str.replace(match.group(0), replace)
-    else:
-        logger.warning(msg_on_err)
-
-
-def find(exprs: list[Expr]) -> Match[str] | None:
-    for expr in exprs:
-        if match := expr.search(vars.file_str, re.MULTILINE):
-            return match
-    return None
-
-
-def try_insert_after(exprs: list[Expr], replace: str) -> bool:
-    global vars
-    if match := find(exprs):
-        insert(match.end(), replace)
-        return True
-    return False
-
-
-def insert_after(exprs: list[Expr], replace: str, msg_on_err: str):
-    global vars
-    if match := find(exprs):
-        insert(match.end(), replace)
-    else:
-        logger.warning(msg_on_err)
diff --git a/crates/template/.config/scripts/pyproject.toml b/crates/template/.config/scripts/pyproject.toml
deleted file mode 100644
index d70d655..0000000
--- a/crates/template/.config/scripts/pyproject.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[project]
-name = "scripts"
-version = "0.1.0"
-requires-python = ">=3.13"
-dependencies = []
-
-[tool.basedpyright]
-include= ["./"]
-exclude=["**/__pycache__"]
-executionEnvironments = [
-    {root="."}
-]
diff --git a/crates/template/.config/templates/screen/cargo-generate.toml b/crates/template/.config/templates/screen/cargo-generate.toml
deleted file mode 100644
index f16b808..0000000
--- a/crates/template/.config/templates/screen/cargo-generate.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[placeholders]
-name = {type="string", prompt="Screen name?", default="screen"}
-assets = {type="bool", prompt="Require assets?" }
-settings = {type="bool", prompt="Require settings?" }
-strategy = {type="string", prompt="Loading strategy?", choices=["Blocking", "NonBlocking"] }
diff --git a/crates/template/.config/templates/screen/mod.rs.liquid b/crates/template/.config/templates/screen/mod.rs.liquid
deleted file mode 100644
index c1d2f01..0000000
--- a/crates/template/.config/templates/screen/mod.rs.liquid
+++ /dev/null
@@ -1,20 +0,0 @@
-{%- assign settings_name = name | upper_camel_case | append: "Settings" -%}
-{%- assign screen_name = name | upper_camel_case | append: "Screen" -%}
-{%- assign screen_name = name | upper_camel_case | append: "Assets" -%}
-use crate::prelude::*;
-
-mod screen;
-pub mod prelude {
-    pub use super::screen::{ {{screen_name}}
-    {%- if settings -%}
-    , {{settings_name}}
-    {%- endif -%}
-    {%- if assets -%}
-    , {{assets_name}}
-    {%- endif -%}
-    };
-}
-
-pub fn plugin(app: &mut App) {
-    app.add_plugins(screen::plugin);
-}
diff --git a/crates/template/.config/templates/screen/screen.rs.liquid b/crates/template/.config/templates/screen/screen.rs.liquid
deleted file mode 100644
index 3ebf050..0000000
--- a/crates/template/.config/templates/screen/screen.rs.liquid
+++ /dev/null
@@ -1,34 +0,0 @@
-{%- assign settings_name = name | upper_camel_case | append: "Settings" -%}
-{%- assign screen_name = name | upper_camel_case | append: "Screen" -%}
-{%- assign assets_name = name | upper_camel_case | append: "Assets" -%}
-use crate::prelude::*;
-
-{% if settings %}
-#[derive(PartialEq, Eq, Clone, Debug, Hash, Reflect, Default, Resource)]
-pub struct {{settings_name -}};
-{%- endif %}
-
-{% if assets %}
-#[derive(AssetCollection, Resource, Debug, Default)]
-pub struct {{assets_name -}} {
-    // some assets ...
-    // see bevy_asset_loader docs
-    // https://docs.rs/bevy_asset_loader/latest/bevy_asset_loader/
-}
-{%-  endif %}
-
-#[derive(Component, Debug, Clone, Copy, Default, PartialEq, Eq, Hash, Reflect)]
-pub struct {{screen_name -}};
-impl Screen for {{screen_name}} {
-    type SETTINGS = {% if settings -%} {{- settings_name -}} {%- else -%} NoSettings {%- endif -%};
-    type ASSETS = {% if assets -%} {{- assets_name -}} {%- else -%} NoAssets {%- endif %};
-    const STRATEGY: LoadingStrategy = LoadingStrategy::{{strategy -}};
-}
-
-pub fn plugin(app: &mut App) {
-    ScreenScopeBuilder::<{{screen_name}}>::new(app)
-        // .add_systems(some_service_systems().take())
-        // .on_ready(init)
-        // .on_unload(unload)
-        .build();
-}
diff --git a/crates/template/.config/templates/service/bundle.rs.liquid b/crates/template/.config/templates/service/bundle.rs.liquid
deleted file mode 100644
index 2c923b6..0000000
--- a/crates/template/.config/templates/service/bundle.rs.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-{%- assign title = name | title_case -%}
-{%- assign bundle_marker = name | upper_camel_case | append: "BundleMarker" -%}
-use crate::prelude::*;
-
-// We use functions to initialize bundles because they are more flexible than
-// struct types.
-/// Use this function to initialize a {{title}} bundle.
-pub fn bundle() -> impl Bundle {
-    ({{bundle_marker}})
-}
diff --git a/crates/template/.config/templates/service/cargo-generate.toml b/crates/template/.config/templates/service/cargo-generate.toml
deleted file mode 100644
index 1f2303a..0000000
--- a/crates/template/.config/templates/service/cargo-generate.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[placeholders]
-name = {type="string", prompt="Service name?", default="service"}
-use_bundle = {type="bool", prompt="Include a bundle?", default=false}
-use_systems = {type="bool", prompt="Include systems?", default=false}
-use_events = {type="bool", prompt="Include events?", default=true}
-
-[conditional.'!use_bundle']
-ignore= [ 'bundle.rs' ]
-
-[conditional.'!use_systems']
-ignore= [ 'systems.rs' ]
-
-[conditional.'!use_events']
-ignore= [ 'events.rs' ]
diff --git a/crates/template/.config/templates/service/data.rs.liquid b/crates/template/.config/templates/service/data.rs.liquid
deleted file mode 100644
index 2ed1aac..0000000
--- a/crates/template/.config/templates/service/data.rs.liquid
+++ /dev/null
@@ -1,15 +0,0 @@
-use crate::prelude::*;
-
-// Add all your data types here.
-// That includes all helper types, components, and their derivatives
-// (e.g. Resources, Events)
-
-{% if use_bundle  -%}
-#[derive(Component, Default, Debug, Reflect)]
-pub struct {{name | upper_camel_case | append: "BundleMarker"}};
-{%- endif %}
-
-{% if use_events  -%}
-#[derive(Event, Default, Debug, Reflect)]
-pub struct {{name | upper_camel_case | append: "Event"}};
-{%- endif %}
diff --git a/crates/template/.config/templates/service/events.rs.liquid b/crates/template/.config/templates/service/events.rs.liquid
deleted file mode 100644
index 2d2edf0..0000000
--- a/crates/template/.config/templates/service/events.rs.liquid
+++ /dev/null
@@ -1,9 +0,0 @@
-use crate::prelude::*;
-
-fn on_event(trigger: On<{{name | upper_camel_case | append: "Event"}}>) {
-    // Replace me!
-}
-
-pub fn plugin(app: &mut App) {
-    app.add_observer(on_event);
-}
diff --git a/crates/template/.config/templates/service/mod.rs.liquid b/crates/template/.config/templates/service/mod.rs.liquid
deleted file mode 100644
index c04e2fc..0000000
--- a/crates/template/.config/templates/service/mod.rs.liquid
+++ /dev/null
@@ -1,34 +0,0 @@
-{%- assign name = name | snake_case -%}
-use crate::prelude::*;
-
-{% if use_bundle -%}
-mod bundle;
-{%- endif %}
-{% if use_events -%}
-mod events;
-{%- endif %}
-{% if use_systems -%}
-mod systems;
-{%- endif %}
-mod data;
-
-pub mod prelude {
-    pub use super::data::*;
-    {% if use_bundle -%}
-    pub use super::bundle::bundle as {{name | append: "_bundle" }};
-    {%- endif -%}
-    {% if use_systems -%}
-    pub use super::systems::systems as {{name | append: "_systems" }};
-    {%- endif -%}
-    // pub use super::my_submodule::prelude::*;
-}
-
-pub fn plugin(app: &mut App) {
-    {% if use_events %}
-    app.add_plugins(
-        events::plugin
-    );
-    {%- else %}
-    // app.add_plugins(/* ... */);
-    {% endif -%}
-}
diff --git a/crates/template/.config/templates/service/systems.rs.liquid b/crates/template/.config/templates/service/systems.rs.liquid
deleted file mode 100644
index 48a2c73..0000000
--- a/crates/template/.config/templates/service/systems.rs.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-use crate::prelude::*;
-
-pub fn example() {
-    // replace me!
-}
-
-/// Add this function to any screens which need to use this service.
-pub fn systems() -> ServiceSystems {
-    ServiceSystems::new((example))
-}
diff --git a/crates/template/.github/workflows/ci.yaml b/crates/template/.github/workflows/ci.yaml
deleted file mode 100644
index 3ccb05f..0000000
--- a/crates/template/.github/workflows/ci.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: Cargo Build & Test
-
-on:
-  push:
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  build_and_test:
-    runs-on: ubuntu-24.04
-    env:
-      CARGO_TERM_COLOR: always
-    strategy:
-      matrix:
-        target: [x86_64-pc-windows-msvc, x86_64-unknown-linux-gnu]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ matrix.target }}-ci-${{ hashFiles('**/Cargo.toml') }}
-
-      - name: Install dependencies
-        shell: bash
-        run: >
-          sudo apt-get update;
-          sudo apt-get install -y --no-install-recommends
-          libasound2-dev
-          libudev-dev
-          libwayland-dev
-          ;
-
-      - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: nightly-2026-01-22
-          components: rustc-codegen-cranelift-preview,rustc-dev,llvm-tools-preview,clippy
-
-      - uses: jdx/mise-action@v3
-        with:
-          log_level: info
-
-      - run: "rustup component list --installed"
-      - run: "RUST_BACKTRACE=1 RUST_LOG=app=debug,tfw=debug MISE_ENV=ci mise check ::: test"
diff --git a/crates/template/.zed/debug.json b/crates/template/.zed/debug.json
deleted file mode 100644
index 601cfd9..0000000
--- a/crates/template/.zed/debug.json
+++ /dev/null
@@ -1,15 +0,0 @@
-// Project-local debug tasks
-//
-// For more documentation on how to configure debug tasks,
-// see: https://zed.dev/docs/debugger
-[
-  {
-    "label": "Debug game",
-    "adapter": "CodeLLDB",
-    "build": {
-      "command": "cargo",
-      "args": ["build"]
-    },
-    "sourceLanguages": ["rust"]
-  }
-]
diff --git a/crates/template/.zed/settings.json b/crates/template/.zed/settings.json
deleted file mode 100644
index f11efb2..0000000
--- a/crates/template/.zed/settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "lsp": {
-        "rust-analyzer": {
-            "initialization_options": {
-                "cargo": {
-                    "features": "all"
-                },
-                "check": {
-                    "command": "clippy",
-                    "extraArgs": [
-                        "--locked",
-                        "--target-dir=target/rust-analyzer"
-                    ]
-                }
-            }
-        }
-    },
-    "languages": {
-        "Python": {
-            "language_servers": ["ruff", "pyright"]
-        }
-    }
-}
-- 
2.51.2


From 6d71831a79a33d3ac625241e5621be6e7c5dc5ea Mon Sep 17 00:00:00 2001
From: ada <ada@cubething.dev>
Date: Fri, 6 Feb 2026 17:41:08 -0600
Subject: [PATCH 2/6] feat: basic console integration

---
 .config/env.sh                            |   1 -
 .config/mise.toml                         |   7 --
 Cargo.lock                                |   2 +
 crates/app/Cargo.toml                     |   2 +
 crates/app/src/service/dev/console/mod.rs |  14 +++
 crates/app/src/service/dev/console/ui.rs  | 103 ++++++++++++++++++++++
 crates/app/src/service/dev/mod.rs         |   7 +-
 crates/screens/src/systems.rs             |   2 +-
 8 files changed, 128 insertions(+), 10 deletions(-)
 create mode 100644 crates/app/src/service/dev/console/mod.rs
 create mode 100644 crates/app/src/service/dev/console/ui.rs

diff --git a/.config/env.sh b/.config/env.sh
index 94aa17c..6a30564 100644
--- a/.config/env.sh
+++ b/.config/env.sh
@@ -1,7 +1,6 @@
 export CARGO_TERM_COLOR="always"
 export PYTHONUNBUFFERED=1
 export RUSTC_WRAPPER="sccache"
-export MISE_EXPERIMENTAL=1
 
 if [[ -n "$SSH_CLIENT" ]]; then
    export FEATURES=""
diff --git a/.config/mise.toml b/.config/mise.toml
index 10e5b52..9406067 100644
--- a/.config/mise.toml
+++ b/.config/mise.toml
@@ -1,10 +1,3 @@
-experimental_monorepo_root = true
-
-[monorepo]
-config_roots = [
-    "crates/template/.config"
-]
-
 [env]
 _.source = ".config/env.sh"
 
diff --git a/Cargo.lock b/Cargo.lock
index 7d1d3c7..6eb56b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -236,6 +236,7 @@ dependencies = [
  "anyhow",
  "avian3d",
  "bevy",
+ "bevy-inspector-egui",
  "bevy-tnua",
  "bevy-tnua-avian3d",
  "bevy_asset_loader",
@@ -246,6 +247,7 @@ dependencies = [
  "built",
  "clap",
  "itertools 0.14.0",
+ "q_cmd_prompt",
  "q_screens",
  "serde",
  "strum",
diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
index 119ad01..d4074fb 100644
--- a/crates/app/Cargo.toml
+++ b/crates/app/Cargo.toml
@@ -33,6 +33,8 @@ clap = {version = "4.5.54", features = ["derive"] }
 
 # workspace
 q_screens = {path = "../screens", version= "^0.1.0" }
+q_cmd_prompt = {path = "../cmd_prompt", version="^0.1.0"}
+bevy-inspector-egui = "0.36.0"
 
 [build-dependencies]
 built = {version = "0.8.0", features=["chrono"]}
diff --git a/crates/app/src/service/dev/console/mod.rs b/crates/app/src/service/dev/console/mod.rs
new file mode 100644
index 0000000..6490296
--- /dev/null
+++ b/crates/app/src/service/dev/console/mod.rs
@@ -0,0 +1,14 @@
+mod commands;
+mod ui;
+
+use crate::prelude::*;
+
+pub mod prelude {
+    pub use super::commands::*;
+    pub use super::ui::*;
+}
+
+pub fn plugin(app: &mut App) {
+    app.add_plugins(q_cmd_prompt::ConsolePlugin);
+    app.add_plugins((ui::plugin, commands::plugin));
+}
diff --git a/crates/app/src/service/dev/console/ui.rs b/crates/app/src/service/dev/console/ui.rs
new file mode 100644
index 0000000..2a47e1f
--- /dev/null
+++ b/crates/app/src/service/dev/console/ui.rs
@@ -0,0 +1,103 @@
+// add a bevy-ui based console wrapper here.
+// open and close with `
+
+use crate::prelude::*;
+use bevy::input_focus::InputFocus;
+use q_cmd_prompt::prelude::*;
+
+fn on_switch_screen(
+    trigger: On<ScreenChanged>,
+    screens: Screens,
+    mut prompts: Query<&mut ConsolePrompt>,
+) {
+    for mut prompt in &mut prompts {
+        let screen_name = screens.get_by_id(trigger.to).unwrap().name();
+        prompt.0 = format!("<{screen_name}>\n> ");
+    }
+}
+
+fn toggle_console(
+    keys: Res<ButtonInput<KeyCode>>,
+    mut focus: ResMut<InputFocus>,
+    mut consoles: Query<(Entity, &mut Visibility), With<Console>>,
+) {
+    if keys.just_pressed(KeyCode::Backquote)
+        && (keys.pressed(KeyCode::ControlLeft) || keys.pressed(KeyCode::ControlRight))
+    {
+        for (id, mut visibility) in consoles.iter_mut() {
+            match *visibility {
+                Visibility::Hidden => {
+                    *visibility = Visibility::Visible;
+                    focus.set(id);
+                    debug!("Opening and focusing dev console.")
+                }
+                Visibility::Visible => {
+                    *visibility = Visibility::Hidden;
+                    if let Some(focus_id) = focus.0
+                        && focus_id == id
+                    {
+                        focus.clear()
+                    }
+                    debug!("Closing dev console.")
+                }
+                _ => {
+                    warn!("Got unsupported visibility: Inherited");
+                }
+            }
+        }
+    }
+}
+
+// this should really be an observer but AcquireFocus isn't publically accessible
+fn on_focus(
+    focus: Res<InputFocus>,
+    console: Query<&ConsoleUiSettings>,
+    mut commands: Commands,
+    mut last_focus: Local<Option<Entity>>,
+) {
+    let focus_entity = focus.get();
+    if *last_focus == focus_entity {
+        return;
+    }
+    if let Some(id) = focus_entity
+        && console.get(id).is_ok()
+    {
+        commands.entity(id).insert(ConsoleUiSettings {
+            font_color: LinearRgba::new(1., 1., 1., 1.).into(),
+            background_color: LinearRgba::new(0., 0., 0., 0.8).into(),
+        });
+    } else if let Some(last_focus) = *last_focus {
+        commands.entity(last_focus).insert(ConsoleUiSettings {
+            font_color: LinearRgba::new(1., 1., 1., 0.5).into(),
+            background_color: LinearRgba::new(0., 0., 0., 0.4).into(),
+        });
+    }
+    *last_focus = focus_entity;
+}
+
+pub fn plugin(app: &mut App) {
+    app.add_observer(on_switch_screen);
+    app.add_systems(PostUpdate, (toggle_console, on_focus).chain());
+    app.add_systems(Startup, |mut commands: Commands| {
+        // TODO: Dev overlay should be put into a more generalized editor mod
+        commands.spawn((
+            Persistent,
+            Name::new("Dev overlay"),
+            Node {
+                width: vw(100),
+                height: vh(100),
+                ..Default::default()
+            },
+            children![(
+                Name::new("Console wrapper"),
+                Node {
+                    width: percent(100),
+                    height: percent(33),
+                    top: percent(67),
+                    ..Default::default()
+                },
+                children![(Name::new("Console"), Visibility::Hidden, Console,)],
+            )],
+        ));
+    });
+}
diff --git a/crates/app/src/service/dev/mod.rs b/crates/app/src/service/dev/mod.rs
index 9eb73c6..48d994d 100644
--- a/crates/app/src/service/dev/mod.rs
+++ b/crates/app/src/service/dev/mod.rs
@@ -1,11 +1,16 @@
+use bevy_inspector_egui::{bevy_egui::EguiPlugin, quick::WorldInspectorPlugin};
+
 use crate::prelude::*;
 
+mod console;
 mod gizmos;
 
 pub mod prelude {
+    pub use super::console::prelude::*;
     pub use super::gizmos::prelude::*;
 }
 
 pub fn plugin(app: &mut App) {
-    app.add_plugins(gizmos::plugin);
+    app.add_plugins((gizmos::plugin, console::plugin));
+    app.add_plugins((EguiPlugin::default(), WorldInspectorPlugin::new()));
 }
diff --git a/crates/screens/src/systems.rs b/crates/screens/src/systems.rs
index 11061b0..acd57f2 100644
--- a/crates/screens/src/systems.rs
+++ b/crates/screens/src/systems.rs
@@ -145,7 +145,7 @@ pub(crate) fn initial_screen(
     screens: Screens,
 ) {
     if let Some(initial_screen) = (*initial_screen).as_ref() {
-        let info = screens.get_by_name(initial_screen).unwrap();
+        let info = r!(screens.get_by_name(initial_screen));
         commands.write_message(SwitchToScreenMsg(info.screen_id()));
     }
 }
-- 
2.51.2


From 766fe39448a4654cd8a878f2806bc488c2df91a1 Mon Sep 17 00:00:00 2001
From: ada <ada@cubething.dev>
Date: Fri, 6 Feb 2026 17:41:27 -0600
Subject: [PATCH 3/6] feat: 'screen' console command

---
 .../src/service/dev/console/commands/mod.rs   |  7 +++
 .../service/dev/console/commands/screen.rs    | 53 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 crates/app/src/service/dev/console/commands/mod.rs
 create mode 100644 crates/app/src/service/dev/console/commands/screen.rs

diff --git a/crates/app/src/service/dev/console/commands/mod.rs b/crates/app/src/service/dev/console/commands/mod.rs
new file mode 100644
index 0000000..3f6b3d2
--- /dev/null
+++ b/crates/app/src/service/dev/console/commands/mod.rs
@@ -0,0 +1,7 @@
+mod screen;
+
+use crate::prelude::*;
+
+pub fn plugin(app: &mut App) {
+    app.add_plugins(screen::plugin);
+}
diff --git a/crates/app/src/service/dev/console/commands/screen.rs b/crates/app/src/service/dev/console/commands/screen.rs
new file mode 100644
index 0000000..6758970
--- /dev/null
+++ b/crates/app/src/service/dev/console/commands/screen.rs
@@ -0,0 +1,53 @@
+use clap::Parser;
+use q_cmd_prompt::prelude::*;
+
+use crate::prelude::*;
+
+#[derive(Parser, Debug, Message, Clone)]
+#[command(name = "screen")]
+struct ScreenCmd {
+    target: Option<String>,
+    #[arg(short, long)]
+    list: bool,
+    #[arg(short, long)]
+    show: bool,
+}
+
+fn on_msg(
+    mut reader: MessageReader<CommandMsg<ScreenCmd>>,
+    mut commands: Commands,
+    screens: Screens,
+    data: Res<ScreenData>,
+    current_screen: Res<CurrentScreen>,
+) {
+    for msg in reader.read() {
+        if msg.command.list {
+            let list = data
+                .iter()
+                .filter_map(|i| i.as_ref().map(|i| format!("{}\n", i.name())))
+                .collect::<String>();
+            msg.println(&mut commands, list);
+        }
+        if msg.command.show
+            && let Some(screen) = &**current_screen.as_ref()
+        {
+            let screen = c!(screens.get_by_id(*screen));
+            msg.println(&mut commands, screen.name().to_owned());
+        }
+        if let Some(target) = msg.command.target.as_ref() {
+            match screens.get_by_name(target) {
+                Ok(screen) => {
+                    commands.write_message(SwitchToScreenMsg(screen.screen_id()));
+                    msg.println(&mut commands, format!("Switching to {}", screen.name()));
+                }
+                Err(err) => {
+                    msg.println(&mut commands, err.to_string());
+                }
+            }
+        }
+    }
+}
+pub fn plugin(app: &mut App) {
+    app.add_systems(PreUpdate, on_msg);
+    app.add_console_command::<ScreenCmd>();
+}
-- 
2.51.2


From 3fe152fcdd8ce647ad6c4432dd6d562786ffa886 Mon Sep 17 00:00:00 2001
From: ada <ada@cubething.dev>
Date: Sat, 7 Feb 2026 21:04:40 -0600
Subject: [PATCH 4/6] fix: cleanup scoping

Cleanup method was being run too late, resulting in errantly cleaning up
entities from the next scene. I introduced the LoadQueued and Cleanup
states to fix this issue.
---
 crates/screens/src/data.rs                   | 64 +++++++++++++++++---
 crates/screens/src/scope.rs                  | 42 ++++++++++---
 crates/screens/src/systems.rs                | 26 +++++++-
 crates/screens/tests/screens/entity_scope.rs |  3 +
 crates/screens/tests/screens/lifecycle.rs    | 42 ++++++++-----
 5 files changed, 143 insertions(+), 34 deletions(-)

diff --git a/crates/screens/src/data.rs b/crates/screens/src/data.rs
index 646c54f..8247112 100644
--- a/crates/screens/src/data.rs
+++ b/crates/screens/src/data.rs
@@ -215,10 +215,11 @@ mod screens {
             }
         }
 
-        /// Loads the screen.
-        /// Has no effect if already in Loading or Ready states.
-        pub fn load(&mut self, tick: Tick) {
-            if matches!(self.state, ScreenState::Unloaded | ScreenState::Unloading) {
+        pub(crate) fn load(&mut self, tick: Tick) {
+            if matches!(
+                self.state,
+                ScreenState::Unloaded | ScreenState::Unloading | ScreenState::LoadQueued
+            ) {
                 if self.skip_load {
                     self.state = ScreenState::Ready
                 } else {
@@ -234,7 +235,7 @@ mod screens {
         pub fn unload(&mut self, tick: Tick) {
             if matches!(self.state, ScreenState::Loading | ScreenState::Ready) {
                 if self.skip_unload {
-                    self.state = ScreenState::Unloaded
+                    self.state = ScreenState::Cleanup;
                 } else {
                     self.state = ScreenState::Unloading;
                 }
@@ -242,6 +243,16 @@ mod screens {
                 self.changed_at = tick;
             }
         }
+        /// Queues the screen to load, unloading any other screens and waiting
+        /// until their cleanup is complete.
+        /// Only works if in the `Unloaded` state.
+        pub fn queue_load(&mut self, tick: Tick) {
+            if matches!(self.state, ScreenState::Unloaded) {
+                self.state = ScreenState::LoadQueued;
+                self.needs_update = true;
+                self.changed_at = tick;
+            }
+        }
         /// Finishes loading the screen.
         /// Has no effect if already in Loading or Ready states.
         pub fn finish_loading(&mut self, tick: Tick) {
@@ -255,6 +266,14 @@ mod screens {
         /// Has no effect if already in Loading or Ready states.
         pub fn finish_unloading(&mut self, tick: Tick) {
             if matches!(self.state, ScreenState::Unloading) {
+                self.state = ScreenState::Cleanup;
+                self.needs_update = true;
+                self.changed_at = tick;
+            }
+        }
+
+        pub(crate) fn finish_cleanup(&mut self, tick: Tick) {
+            if matches!(self.state, ScreenState::Cleanup) {
                 self.state = ScreenState::Unloaded;
                 self.needs_update = true;
                 self.changed_at = tick;
@@ -344,6 +363,8 @@ mod schedules {
         Loading,
         /// Runs on [Update] when the screen has [ScreenState::Unloading]
         Unloading,
+        /// For internal use! Runs after [ScreenState::Unloading]. Used to clean up screen-scoped entities.
+        Cleanup,
         /// Can also be specified as [on_screen_load]
         OnLoad,
         /// Can also be specified as [on_screen_ready]
@@ -354,6 +375,7 @@ mod schedules {
         OnUnloaded,
     }
 
+    // TODO: This should use ScreenId internally.
     /// Wrapper around [ScreenSchedule]. Needed to make schedules unique per type.
     #[derive(ScheduleLabel, Debug, Clone, Copy, PartialEq, Eq, Hash)]
     pub struct ScreenScheduleLabel {
@@ -380,14 +402,18 @@ pub use schedules::*;
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
 pub enum ScreenState {
     #[default]
-    #[allow(missing_docs)]
+    /// The screen is currently down.
     Unloaded,
-    #[allow(missing_docs)]
+    /// The screen is waiting for cleanup to finish.
+    LoadQueued,
+    /// The screen is running any custom load systems.
     Loading,
-    #[allow(missing_docs)]
+    /// The screen is fully loaded and ready to execute its main systems.
     Ready,
-    #[allow(missing_docs)]
+    /// The screen is running any custom unload systems.
     Unloading,
+    /// For internal use. Cleaning up screen-scoped entities.
+    Cleanup,
 }
 
 mod system_params {
@@ -472,6 +498,10 @@ mod system_params {
             let tick = self.change_tick;
             self.data.finish_unloading(tick);
         }
+        pub(crate) fn finish_cleanup(&mut self) {
+            let tick = self.change_tick;
+            self.data.finish_cleanup(tick);
+        }
         #[allow(missing_docs)]
         pub fn data(&self) -> &ScreenInfo {
             self.data.as_ref()
@@ -672,6 +702,22 @@ mod helpers {
         OnScreenLoad(TypeId::of::<S>())
     }
 
+    /// Label of a schedule which fires when the screen has begun its cleanup schedule.
+    /// Try to avoid spawning anything during this schedule.
+    #[derive(ScheduleLabel, Debug, PartialEq, Eq, Hash, Clone, Copy)]
+    pub struct OnScreenCleanup(pub TypeId);
+    /// See [OnScreenCleanup]
+    pub fn on_screen_cleanup<S: Screen>() -> impl ScheduleLabel {
+        OnScreenCleanup(TypeId::of::<S>())
+    }
+    /// Label of a schedule which fires when the screen is waiting to load.
+    #[derive(ScheduleLabel, Debug, PartialEq, Eq, Hash, Clone, Copy)]
+    pub struct OnScreenLoadQueued(pub TypeId);
+    /// See [OnScreenLoadQueued]
+    pub fn on_screen_load_queued<S: Screen>() -> impl ScheduleLabel {
+        OnScreenLoadQueued(TypeId::of::<S>())
+    }
+
     /// Label of a schedule which fires when the screen has finished loading.
     #[derive(ScheduleLabel, Debug, PartialEq, Eq, Hash, Clone, Copy)]
     pub struct OnScreenReady(pub TypeId);
diff --git a/crates/screens/src/scope.rs b/crates/screens/src/scope.rs
index 03c230e..7709bf3 100644
--- a/crates/screens/src/scope.rs
+++ b/crates/screens/src/scope.rs
@@ -1,7 +1,10 @@
 use std::any::TypeId;
 
 pub use crate::prelude::*;
-use bevy::{ecs::system::ScheduleSystem, platform::collections::HashMap};
+use bevy::{
+    ecs::system::{ScheduleSystem, SystemIdMarker},
+    platform::collections::HashMap,
+};
 use strum::IntoEnumIterator;
 
 #[allow(missing_docs)]
@@ -140,6 +143,7 @@ where
         app.add_observer(on_switch_screen::<S>);
         app.add_observer(on_finish_loading::<S>);
         app.add_observer(on_finish_unloading::<S>);
+        app.add_systems(on_screen_cleanup::<S>(), clean_up_scoped_entities::<S>);
 
         // scope systems
         for (kind, schedule) in self.schedules.into_iter() {
@@ -159,7 +163,7 @@ where
                 ScreenSchedule::OnUnload => {
                     let label = schedule.label();
                     app.add_systems(on_screen_unload::<S>(), move |mut commands: Commands| {
-                        commands.run_schedule(label)
+                        commands.run_schedule(label);
                     });
                 }
                 ScreenSchedule::OnUnloaded => {
@@ -178,16 +182,25 @@ where
         // Lifecycle
         #[cfg(debug_assertions)]
         {
-            app.add_systems(on_screen_load::<S>(), || debug!("Loading {:?}", S::name()));
-            app.add_systems(on_screen_ready::<S>(), || debug!("Ready {:?}", S::name()));
+            app.add_systems(on_screen_load_queued::<S>(), || {
+                debug!("LoadQueued {:?}", S::name())
+            });
+            app.add_systems(on_screen_load::<S>(), || {
+                debug!("   Loading {:?}", S::name())
+            });
+            app.add_systems(on_screen_ready::<S>(), || {
+                debug!("     Ready {:?}", S::name())
+            });
             app.add_systems(on_screen_unload::<S>(), || {
-                debug!("Unloading {:?}", S::name())
+                debug!(" Unloading {:?}", S::name())
+            });
+            app.add_systems(on_screen_cleanup::<S>(), || {
+                debug!("   Cleanup {:?}", S::name())
             });
             app.add_systems(on_screen_unloaded::<S>(), || {
-                debug!("Unloaded {:?}", S::name())
+                debug!("  Unloaded {:?}", S::name())
             });
         }
-        app.add_systems(on_screen_unloaded::<S>(), clean_up_scoped_entities::<S>);
         debug!("Built {} (id={:?})", S::name(), id);
     }
 }
@@ -224,13 +237,22 @@ fn clean_up_scoped_entities<S: Screen>(
             )>,
         ),
     >,
-    top_levels: Query<Entity, (Or<(With<Observer>, With<Window>)>, Without<ChildOf>)>,
+    top_levels: Query<
+        Entity,
+        (
+            Or<(With<Observer>, With<Window>, With<SystemIdMarker>)>, // there are probably others i'm missing
+            Without<ChildOf>,
+        ),
+    >,
 ) {
     screen_scoped
         .iter()
         .filter(|c| !top_levels.iter().contains(c))
         .for_each(|e| {
-            commands.entity(e).detach_all_children().despawn();
+            if let Ok(mut cmds) = commands.get_entity(e) {
+                cmds.clear(); // removes all relationship components
+                cmds.despawn();
+            }
         });
-    screen_data.unload();
+    screen_data.finish_cleanup();
 }
diff --git a/crates/screens/src/systems.rs b/crates/screens/src/systems.rs
index acd57f2..9cde586 100644
--- a/crates/screens/src/systems.rs
+++ b/crates/screens/src/systems.rs
@@ -22,7 +22,7 @@ fn handle_switch_msg(
     for (key, value) in registry.iter_mut().enumerate() {
         if let Some(data) = value {
             if key == *msg_key.0 {
-                data.load(tick.this_run());
+                data.queue_load(tick.this_run());
             } else {
                 data.unload(tick.this_run());
             }
@@ -60,6 +60,13 @@ pub(crate) fn on_finish_unloading<S: Screen>(
 }
 
 fn run_schedules(mut data: ResMut<ScreenData>, mut commands: Commands, tick: SystemChangeTick) {
+    let all_clear = data.iter().filter_map(|info| info.as_ref()).all(|info| {
+        matches!(
+            info.state(),
+            ScreenState::Unloaded | ScreenState::LoadQueued
+        )
+    });
+
     for info in data.iter_mut().filter_map(|info| info.as_mut()) {
         match info.state() {
             ScreenState::Unloaded => {
@@ -74,6 +81,16 @@ fn run_schedules(mut data: ResMut<ScreenData>, mut commands: Commands, tick: Sys
                     info.changed_at = tick.this_run();
                 }
             }
+            ScreenState::LoadQueued => {
+                if info.needs_update {
+                    commands.run_schedule(OnScreenLoadQueued(info.type_id()));
+                    info.needs_update = false;
+                    info.changed_at = tick.this_run();
+                }
+                if all_clear {
+                    info.load(tick.this_run());
+                }
+            }
             ScreenState::Loading => {
                 commands.run_schedule(ScreenScheduleLabel::from_id(
                     ScreenSchedule::Loading,
@@ -113,6 +130,13 @@ fn run_schedules(mut data: ResMut<ScreenData>, mut commands: Commands, tick: Sys
                     info.changed_at = tick.this_run();
                 }
             }
+            ScreenState::Cleanup => {
+                if info.needs_update {
+                    commands.run_schedule(OnScreenCleanup(info.type_id()));
+                    info.needs_update = false;
+                    info.changed_at = tick.this_run();
+                }
+            }
         }
     }
 }
diff --git a/crates/screens/tests/screens/entity_scope.rs b/crates/screens/tests/screens/entity_scope.rs
index 73666c5..d04139b 100644
--- a/crates/screens/tests/screens/entity_scope.rs
+++ b/crates/screens/tests/screens/entity_scope.rs
@@ -6,6 +6,9 @@ use itertools::Itertools;
 
 use crate::prelude::*;
 
+// TODO: Test that screens which spawn entities in `load` are able to access those entities.
+// Don't run `load` until all the scoped entities are removed!
+
 #[derive(Component, PartialEq, Debug, Copy, Clone)]
 #[component(on_insert = Self::on_insert)]
 enum Target {
diff --git a/crates/screens/tests/screens/lifecycle.rs b/crates/screens/tests/screens/lifecycle.rs
index 3cc05a6..afefa2f 100644
--- a/crates/screens/tests/screens/lifecycle.rs
+++ b/crates/screens/tests/screens/lifecycle.rs
@@ -53,7 +53,12 @@ macro_rules! impl_test_fns {
     }
 }
 
-gen_test_fns!(on_screen_load, on_screen_ready, on_screen_unloaded);
+gen_test_fns!(
+    on_screen_load,
+    on_screen_ready,
+    on_screen_unloaded,
+    on_screen_cleanup
+);
 
 macro_rules! progress_by {
     ($name:ident) => {
@@ -115,18 +120,6 @@ impl Screen for LifecycleScreen {
                             commands.write_message(AppExit::error());
                         }
                     },
-                    |r: Res<LifecycleStatus>, r2: Res<TestRes>, mut commands: Commands| {
-                        let ok = r.ok() && r2.ok();
-                        if ok {
-                            info!("OK!");
-                            commands.write_message(AppExit::Success);
-                        } else {
-                            error!("Did not reach all expected points.");
-                            error!(?r);
-                            error!(?r2);
-                            commands.write_message(AppExit::error());
-                        }
-                    },
                 )
                     .chain(),
             );
@@ -141,6 +134,27 @@ fn lifecycle() {
     app.register_screen::<EmptyScreen>();
     app.init_resource::<LifecycleStatus>();
     app.init_resource::<TestRes>();
-    impl_test_fns!(app, on_screen_load, on_screen_ready, on_screen_unloaded);
+    impl_test_fns!(
+        app,
+        on_screen_load,
+        on_screen_ready,
+        on_screen_unloaded,
+        on_screen_cleanup
+    );
+    app.add_systems(
+        on_screen_ready::<EmptyScreen>(),
+        |r: Res<LifecycleStatus>, r2: Res<TestRes>, mut commands: Commands| {
+            let ok = r.ok() && r2.ok();
+            if ok {
+                info!("OK!");
+                commands.write_message(AppExit::Success);
+            } else {
+                error!("Did not reach all expected points.");
+                error!(?r);
+                error!(?r2);
+                commands.write_message(AppExit::error());
+            }
+        },
+    );
     assert!(app.run().is_success());
 }
-- 
2.51.2


From 553c1cedd34b5e5bf0e9f82875a8b7b650f0f051 Mon Sep 17 00:00:00 2001
From: ada <ada@cubething.dev>
Date: Sun, 8 Feb 2026 14:43:43 -0600
Subject: [PATCH 5/6] successfully integrate console

---
 crates/app/src/service/dev/console/ui.rs | 37 ++++++++++--------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/crates/app/src/service/dev/console/ui.rs b/crates/app/src/service/dev/console/ui.rs
index 2a47e1f..30e30f7 100644
--- a/crates/app/src/service/dev/console/ui.rs
+++ b/crates/app/src/service/dev/console/ui.rs
@@ -5,17 +5,6 @@ use crate::prelude::*;
 use bevy::input_focus::InputFocus;
 use q_cmd_prompt::prelude::*;
 
-fn on_switch_screen(
-    trigger: On<ScreenChanged>,
-    screens: Screens,
-    mut prompts: Query<&mut ConsolePrompt>,
-) {
-    for mut prompt in &mut prompts {
-        let screen_name = screens.get_by_id(trigger.to).unwrap().name();
-        prompt.0 = format!("<{screen_name}>\n> ");
-    }
-}
-
 fn toggle_console(
     keys: Res<ButtonInput<KeyCode>>,
     mut focus: ResMut<InputFocus>,
@@ -51,14 +40,13 @@ fn toggle_console(
 // this should really be an observer but AcquireFocus isn't publically accessible
 fn on_focus(
     focus: Res<InputFocus>,
-    console: Query<&ConsoleUiSettings>,
+    console: Query<Entity, With<ConsoleUiSettings>>,
     mut commands: Commands,
-    mut last_focus: Local<Option<Entity>>,
 ) {
-    let focus_entity = focus.get();
-    if *last_focus == focus_entity {
+    if !focus.is_changed() {
         return;
     }
+    let focus_entity = focus.get();
     if let Some(id) = focus_entity
         && console.get(id).is_ok()
     {
@@ -66,17 +54,17 @@ fn on_focus(
             font_color: LinearRgba::new(1., 1., 1., 1.).into(),
             background_color: LinearRgba::new(0., 0., 0., 0.8).into(),
         });
-    } else if let Some(last_focus) = *last_focus {
-        commands.entity(last_focus).insert(ConsoleUiSettings {
-            font_color: LinearRgba::new(1., 1., 1., 0.5).into(),
-            background_color: LinearRgba::new(0., 0., 0., 0.4).into(),
+    } else {
+        console.iter().for_each(|entity| {
+            commands.entity(entity).insert(ConsoleUiSettings {
+                font_color: LinearRgba::new(1., 1., 1., 0.5).into(),
+                background_color: LinearRgba::new(0., 0., 0., 0.4).into(),
+            });
         });
     }
-    *last_focus = focus_entity;
 }
 
 pub fn plugin(app: &mut App) {
-    app.add_observer(on_switch_screen);
     app.add_systems(PostUpdate, (toggle_console, on_focus).chain());
     app.add_systems(Startup, |mut commands: Commands| {
         // TODO: Dev overlay should be put into a more generalized editor mod
@@ -96,7 +84,12 @@ pub fn plugin(app: &mut App) {
                     top: percent(67),
                     ..Default::default()
                 },
-                children![(Name::new("Console"), Visibility::Hidden, Console,)],
+                children![(
+                    Name::new("Console"),
+                    Visibility::Hidden,
+                    Console,
+                    ConsolePrompt("\n\n> ".into())
+                )],
             )],
         ));
     });
-- 
2.51.2


From 895498092a495581a14f53c1e29910a199affdd0 Mon Sep 17 00:00:00 2001
From: ada <ada@cubething.dev>
Date: Sun, 8 Feb 2026 15:11:44 -0600
Subject: [PATCH 6/6] lint

---
 crates/app/src/service/dev/console/mod.rs | 5 -----
 crates/app/src/service/dev/mod.rs         | 1 -
 2 files changed, 6 deletions(-)

diff --git a/crates/app/src/service/dev/console/mod.rs b/crates/app/src/service/dev/console/mod.rs
index 6490296..d92e394 100644
--- a/crates/app/src/service/dev/console/mod.rs
+++ b/crates/app/src/service/dev/console/mod.rs
@@ -3,11 +3,6 @@ mod ui;
 
 use crate::prelude::*;
 
-pub mod prelude {
-    pub use super::commands::*;
-    pub use super::ui::*;
-}
-
 pub fn plugin(app: &mut App) {
     app.add_plugins(q_cmd_prompt::ConsolePlugin);
     app.add_plugins((ui::plugin, commands::plugin));
diff --git a/crates/app/src/service/dev/mod.rs b/crates/app/src/service/dev/mod.rs
index 48d994d..9fdc77d 100644
--- a/crates/app/src/service/dev/mod.rs
+++ b/crates/app/src/service/dev/mod.rs
@@ -6,7 +6,6 @@ mod console;
 mod gizmos;
 
 pub mod prelude {
-    pub use super::console::prelude::*;
     pub use super::gizmos::prelude::*;
 }
 
-- 
2.51.2