diff --git a/.pql/pql-plan.json b/.pql/pql-plan.json
index 2d85b1b2..eb7e1268 100644
--- a/.pql/pql-plan.json
+++ b/.pql/pql-plan.json
@@ -1,5 +1,5 @@
 {
-  "exported_at": "2026-04-26T11:09:45Z",
+  "exported_at": "2026-04-26T11:27:24Z",
   "decisions": [
     {
       "id": "D-1",
diff --git a/ci/smoke_bundle.sh b/ci/smoke_bundle.sh
index 312548b4..a169a1f6 100755
--- a/ci/smoke_bundle.sh
+++ b/ci/smoke_bundle.sh
@@ -10,10 +10,10 @@ set -euo pipefail
 
 cd "$(dirname "$0")/.."
 
-BUNDLE="app/build/linux/x64/release/bundle/clide_app"
+BUNDLE="build/linux/x64/release/bundle/clide"
 
 echo "==> build linux release bundle"
-(cd app && flutter build linux --release)
+flutter build linux --release
 
 if [[ ! -x "$BUNDLE" ]]; then
   echo "smoke: bundle not found at $BUNDLE" >&2
diff --git a/ci/test.sh b/ci/test.sh
index 2178926c..4ecad3a3 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -1,20 +1,15 @@
 #!/usr/bin/env bash
-# Fast test layer — unit + widget + golden. Runs in <60s on a warm
-# cache. Called from `make test` and the pre-push hook.
+# Fast test layer — analyze + format + unit + widget + golden.
+# Runs in <60s on a warm cache. Called from `make test` and the
+# pre-push hook.
 set -euo pipefail
 cd "$(dirname "$0")/.."
 
-echo "==> dart analyze (root package)"
-dart analyze
+echo "==> flutter analyze"
+flutter analyze
 
 echo "==> dart format (whole tree)"
 dart format --set-exit-if-changed .
 
-echo "==> dart test (root package)"
-dart test
-
-echo "==> flutter analyze (app)"
-(cd app && flutter analyze)
-
-echo "==> flutter test (app unit + widget + golden)"
-(cd app && flutter test)
+echo "==> flutter test (unit + widget + golden)"
+flutter test
diff --git a/ci/test_a11y.sh b/ci/test_a11y.sh
index bd4c1468..2f4bfbb4 100755
--- a/ci/test_a11y.sh
+++ b/ci/test_a11y.sh
@@ -5,4 +5,4 @@ set -euo pipefail
 cd "$(dirname "$0")/.."
 
 echo "==> a11y suite"
-(cd app && flutter test test/a11y/)
+flutter test test/a11y/
diff --git a/ci/test_core.sh b/ci/test_core.sh
index bcce2a81..2e36f3d1 100755
--- a/ci/test_core.sh
+++ b/ci/test_core.sh
@@ -33,9 +33,11 @@ TIMEOUT_SECONDS=${TIMEOUT_SECONDS:-120}
 # Run dart test in its own process group so we can kill descendants on
 # timeout. `setsid` starts a new session; `timeout --kill-after` SIGKILLs
 # after SIGTERM if the test ignores it.
-echo "test-core: dart test test/  (timeout ${TIMEOUT_SECONDS}s)"
+CORE_DIRS="test/ipc test/pty test/daemon test/git test/panes test/files test/editor test/cli test/pql"
+
+echo "test-core: dart test ${CORE_DIRS}  (timeout ${TIMEOUT_SECONDS}s)"
 if ! timeout --kill-after=5s "${TIMEOUT_SECONDS}s" \
-     setsid --wait dart test test/ ; then
+     setsid --wait dart test $CORE_DIRS ; then
   rc=$?
   if [[ $rc -eq 124 ]]; then
     echo "test-core: TIMEOUT — killing descendants" >&2
diff --git a/ci/test_coverage.sh b/ci/test_coverage.sh
index fa2f2be0..ec1ee666 100755
--- a/ci/test_coverage.sh
+++ b/ci/test_coverage.sh
@@ -6,12 +6,9 @@ set -euo pipefail
 cd "$(dirname "$0")/.."
 
 echo "==> flutter test --coverage"
-(cd app && flutter test --coverage)
-
-echo "==> root dart coverage (skipped until dart_test + coverage integrate)"
-# dart test doesn't emit lcov natively; wire package:coverage later.
+flutter test --coverage
 
 if command -v lcov >/dev/null 2>&1; then
   echo "==> lcov summary"
-  lcov --summary app/coverage/lcov.info
+  lcov --summary coverage/lcov.info
 fi
diff --git a/ci/test_integration.sh b/ci/test_integration.sh
index e88e2840..b2fec5c9 100755
--- a/ci/test_integration.sh
+++ b/ci/test_integration.sh
@@ -6,7 +6,6 @@
 set -euo pipefail
 cd "$(dirname "$0")/.."
 
-cd app
 for f in integration_test/*_test.dart; do
   echo "==> integration_test: $f"
   flutter test "$f"