remove tokio db runtimes

.github/workflows/pr-ci.yml

@@ -42,13 +42,22 @@ jobs:
 
       - name: Run flake checks
         run: |
-          time nix flake check --fallback --print-build-logs
+          start="$SECONDS"
+          nix flake check --fallback --print-build-logs
+          elapsed="$((SECONDS - start))"
+          printf 'Nix flake check: %dm %02ds\n' "$((elapsed / 60))" "$((elapsed % 60))" | tee -a "$GITHUB_STEP_SUMMARY"
 
+      # On macOS release validation builds the same native CLI dependency
+      # closure, so run its smoke test there rather than building it twice.
       - name: Build and smoke-test native CLI
+        if: matrix.os == 'ubuntu-latest'
         run: |
-          time nix build .#sce --fallback --out-link result --print-build-logs
+          start="$SECONDS"
+          nix build .#sce --fallback --out-link result --print-build-logs
           ./result/bin/sce --help
           ./result/bin/sce version
+          elapsed="$((SECONDS - start))"
+          printf 'Native CLI build + smoke: %dm %02ds\n' "$((elapsed / 60))" "$((elapsed % 60))" | tee -a "$GITHUB_STEP_SUMMARY"
 
   release-validation:
     name: Release validation (${{ matrix.os }})
@@ -78,4 +87,19 @@ jobs:
 
       - name: Build release package and audit portability
         run: |
-          time nix build .#ci-checks --fallback --out-link result-ci-checks --print-build-logs
+          start="$SECONDS"
+          nix build .#ci-checks --fallback --out-link result-ci-checks --print-build-logs
+          elapsed="$((SECONDS - start))"
+          printf 'Release validation: %dm %02ds\n' "$((elapsed / 60))" "$((elapsed % 60))" | tee -a "$GITHUB_STEP_SUMMARY"
+
+      # On Darwin, .#sce-release is the native CLI with commit metadata.
+      # Smoke-test that exact binary, which is already built by .#ci-checks.
+      - name: Smoke-test macOS release CLI
+        if: matrix.os == 'macos-latest'
+        run: |
+          start="$SECONDS"
+          ./result-ci-checks/sce-release/bin/sce --help
+          ./result-ci-checks/sce-release/bin/sce version
+          elapsed="$((SECONDS - start))"
+          printf 'macOS release CLI smoke: %dm %02ds\n' "$((elapsed / 60))" "$((elapsed % 60))" | tee -a "$GITHUB_STEP_SUMMARY"
+

.github/workflows/quint.yml

@@ -55,8 +55,8 @@ jobs:
     needs: detect
     if: needs.detect.outputs.quint == 'true'
     runs-on: ubuntu-latest
-    # The Quint Connect Nix check compiles the CLI crate, so this needs more
-    # headroom than the pure-Quint steps alone required.
+    # The Rust/Quint Connect MBT suite already runs in the Nix CI cli-tests
+    # check on both Linux and macOS. Keep this workflow spec-only.
     timeout-minutes: 30
     steps:
       - name: Harden the runner (Audit all outbound calls)
@@ -70,12 +70,6 @@ jobs:
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
 
-      - name: Enable Magic Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@908b263ff629f4cc17666315b7fd3ec127c6244d # v14
-        with:
-          use-flakehub: false
-          use-gha-cache: true
-
       - name: Typecheck Quint spec
         run: nix run .#quint -- typecheck spec/mutation_cursor.qnt
 
@@ -95,13 +89,6 @@ jobs:
           --max-samples=5000
           --max-steps=20
 
-      - name: Quint Connect model-based tests (Nix-pinned Rust + Quint)
-        # The entire MBT invocation goes through this Nix check rather than
-        # `cargo test` on the runner's own Cargo, so both the Rust toolchain
-        # and the Quint binary come from the repository's pinned flake
-        # inputs, never a second, unpinned Rust installation.
-        run: nix build .#checks.x86_64-linux.mutation-trace-quint-connect --print-build-logs
-
   gate:
     name: Quint gate
     if: always()

.gitignore

@@ -1,6 +1,6 @@
 .direnv/
 node_modules/
-cli/target/
+cli/target*/
 cli/package-fallback/
 integrations/**/target/
 result*

.sce/config.json

@@ -6,8 +6,8 @@
   "integrations": {
     "optional_workflows": [],
     "target": [
-      "claude",
       "opencode",
+      "claude",
       "pi",
       "codex"
     ]

AGENTS.md

@@ -135,7 +135,7 @@ Run from repo root through Nix (do not call bare `bun` on the host). Working dir
 
 ## Testing notes
 
-- Rust tests live inline in source files and in module test files such as `cli/src/services/setup/tests.rs`.
+- Rust tests live inline in source files and in module test files such as `cli/src/services/mutation_trace/mbt/tests.rs`.
 - Repository Cargo builds must use `scripts/run-cli-cargo.sh`; it generates a fresh temporary Pkl payload, passes `SCE_CLI_GENERATED_INPUT_DIR` to Cargo, and cleans up the payload afterward.
 - Rust/Cargo commands should be executed through `nix develop`, even for one-off builds, tests, fmt, and clippy runs.
 - Prefer `nix flake check` for routine verification and avoid bare `cargo test` / `cargo check` / `cargo fmt --check` unless the user explicitly asks.
@@ -258,7 +258,6 @@ Run from repo root through Nix (do not call bare `bun` on the host). Working dir
 - `context/overview.md`
 - `cli/Cargo.toml`
 - `cli/src/app.rs`
-- `cli/src/services/setup/tests.rs`
 - `config/lib/bash-policy-plugin/package.json`
 - `config/lib/bash-policy-plugin/bash-policy-runtime.test.ts`
 - `config/lib/bash-policy-plugin/opencode-bash-policy-plugin.ts`

cli/Cargo.toml

@@ -43,7 +43,7 @@ reqwest = { version = "0.13", default-features = false, features = ["json", "for
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sha2 = "0.11"
-tokio = { version = "1", default-features = false, features = ["rt", "io-util", "sync", "time", "macros", "rt-multi-thread"] }
+tokio = { version = "1", default-features = false, features = ["rt", "io-util", "sync", "time", "macros", "rt-multi-thread", "process", "fs"] }
 toml = "0.9"
 tracing = "0.1"
 

cli/build.rs

@@ -187,7 +187,11 @@ fn stage_generated_input(
 
     let output_root = out_dir.join(PKL_OUTPUT_DIR);
     remove_path_if_exists(&output_root)?;
-    copy_tree(&generated_input_root.join(PKL_OUTPUT_DIR), &output_root)?;
+    copy_tree(
+        &generated_input_root.join(PKL_OUTPUT_DIR),
+        &output_root,
+        true,
+    )?;
 
     Ok(())
 }
@@ -257,7 +261,7 @@ fn stage_packaged_fallback(manifest_dir: &Path, out_dir: &Path) -> io::Result<()
         let source = fallback_root.join(directory);
         let destination = out_dir.join(directory);
         remove_path_if_exists(&destination)?;
-        copy_tree(&source, &destination)?;
+        copy_tree(&source, &destination, true)?;
     }
 
     Ok(())
@@ -342,14 +346,17 @@ fn stage_static_inputs(
     copy_tree(
         &manifest_dir.join("assets/hooks"),
         &static_root.join("hooks"),
+        true,
     )?;
     copy_tree(
         &manifest_dir.join(MIGRATIONS_ROOT),
         &static_root.join(MIGRATIONS_ROOT),
+        true,
     )?;
     copy_file(
         &repository_root.join("config/schema/agent-trace.schema.json"),
         &static_root.join("schema/agent-trace.schema.json"),
+        true,
     )
 }
 
@@ -366,33 +373,39 @@ fn stage_codex_target(out_dir: &Path) -> io::Result<()> {
     copy_tree(
         &pkl_output_root.join(CODEX_AGENTS_SOURCE_DIR),
         &destination_root.join(".agents"),
+        false,
     )?;
     copy_tree(
         &pkl_output_root.join(CODEX_HOOKS_SOURCE_DIR),
         &destination_root.join(".codex"),
+        false,
     )
 }
 
-fn copy_tree(source_root: &Path, destination_root: &Path) -> io::Result<()> {
-    println!("cargo:rerun-if-changed={}", source_root.display());
+fn copy_tree(source_root: &Path, destination_root: &Path, track_sources: bool) -> io::Result<()> {
+    if track_sources {
+        println!("cargo:rerun-if-changed={}", source_root.display());
+    }
 
     let mut files = Vec::new();
     collect_files(source_root, source_root, &mut files)?;
     files.sort_unstable_by(|left, right| left.relative_path.cmp(&right.relative_path));
 
     for file in files {
-        println!("cargo:rerun-if-changed={}", file.absolute_path.display());
         copy_file(
             &file.absolute_path,
             &destination_root.join(&file.relative_path),
+            track_sources,
         )?;
     }
 
     Ok(())
 }
 
-fn copy_file(source: &Path, destination: &Path) -> io::Result<()> {
-    println!("cargo:rerun-if-changed={}", source.display());
+fn copy_file(source: &Path, destination: &Path, track_source: bool) -> io::Result<()> {
+    if track_source {
+        println!("cargo:rerun-if-changed={}", source.display());
+    }
     let parent = destination
         .parent()
         .ok_or_else(|| invalid_data(&"staged file must have a parent directory"))?;

cli/src/app.rs

@@ -57,21 +57,16 @@ pub(crate) trait HasLogger {
     fn logger(&self) -> &Self::Logger;
 }
 
-#[allow(dead_code)]
 pub(crate) trait HasTelemetry {
     type Telemetry: TelemetryTrait;
 
     fn telemetry(&self) -> &Self::Telemetry;
 }
 
-#[allow(dead_code)]
 pub(crate) trait HasFs {
     type Fs: services::capabilities::FsOps;
-
-    fn fs(&self) -> &Self::Fs;
 }
 
-#[allow(dead_code)]
 pub(crate) trait HasGit {
     type Git: services::capabilities::GitOps;
 
@@ -113,23 +108,12 @@ where
         HasLogger::logger(self)
     }
 
-    #[allow(dead_code)]
-    pub(crate) fn fs(&self) -> &F {
-        HasFs::fs(self)
-    }
-
-    #[allow(dead_code)]
-    pub(crate) fn git(&self) -> &G {
-        HasGit::git(self)
-    }
-
     fn telemetry(&self) -> &T {
         HasTelemetry::telemetry(self)
     }
 
     /// Returns a context for a command-scoped repository root while preserving
     /// the runtime logger, telemetry, and capability dependencies.
-    #[allow(dead_code)]
     pub(crate) fn with_repo_root(&self, repo_root: impl Into<PathBuf>) -> Self {
         Self {
             logger: self.logger,
@@ -139,15 +123,6 @@ where
             repo_root: Some(repo_root.into()),
         }
     }
-
-    /// Returns the resolved repository root path when available.
-    ///
-    /// Lifecycle providers use this during setup to avoid re-resolving
-    /// the repository root independently.
-    #[allow(dead_code)]
-    pub fn repo_root(&self) -> Option<&Path> {
-        HasRepoRoot::repo_root(self)
-    }
 }
 
 impl<L, T, F, G> HasLogger for AppContext<'_, L, T, F, G>
@@ -186,10 +161,6 @@ where
     G: services::capabilities::GitOps,
 {
     type Fs = F;
-
-    fn fs(&self) -> &Self::Fs {
-        self.fs
-    }
 }
 
 impl<L, T, F, G> HasGit for AppContext<'_, L, T, F, G>
@@ -415,6 +386,9 @@ where
     Ok(command)
 }
 
+#[cfg(test)]
+mod doctor_reconciliation_cli_tests;
+
 #[cfg(test)]
 mod tests {
     use std::future::{poll_fn, Future};
@@ -590,12 +564,12 @@ mod tests {
             let fs = services::capabilities::StdFsOps;
             let git = services::capabilities::ProcessGitOps;
             let context = AppContext::new(&logger, &telemetry, &fs, &git, None);
-            let result = run_command_lifecycle_with_context(
+            let result = Box::pin(run_command_lifecycle_with_context(
                 args.into_iter().map(String::from),
                 &services::command_registry::CommandRegistry::default(),
                 &context,
                 &mut Vec::new(),
-            )
+            ))
             .await;
             if let Some(class) = expected_error {
                 let error = result.unwrap_err();
@@ -695,7 +669,7 @@ mod tests {
         stdout.clear();
         stderr.clear();
         let missing_config = std::env::current_dir().unwrap().join("missing-config.json");
-        let code = run_with_dependency_check_and_streams(
+        let code = Box::pin(run_with_dependency_check_and_streams(
             [
                 "sce",
                 "config",
@@ -707,7 +681,7 @@ mod tests {
             || Ok(()),
             &mut stdout,
             &mut stderr,
-        )
+        ))
         .await;
         assert_eq!(code, ExitCode::from(4));
         assert_eq!(stdout, b"");