dirsql 0.4.40__tar.gz → 0.4.42__tar.gz

{dirsql-0.4.40 → dirsql-0.4.42}/Cargo.lock

@@ -540,7 +540,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "dirsql"
-version = "0.4.40"
+version = "0.4.42"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -583,7 +583,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.40"
+version = "0.4.42"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.40 → dirsql-0.4.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.40
+Version: 0.4.42
 Requires-Dist: tomli>=2 ; python_full_version < '3.11'
 Requires-Dist: bin-shim>=0.1
 Summary: Ephemeral SQL index over a local directory

{dirsql-0.4.40 → dirsql-0.4.42}/dirsql/_dirsql.pyi

@@ -77,3 +77,5 @@ class DirSQL:
     def query(self, sql: str) -> list[Row]: ...
     def _start_watcher(self) -> None: ...
     def _poll_events(self, timeout_ms: int) -> list[RowEvent]: ...
+
+def config_paths_from_argv(argv: list[str]) -> list[str]: ...

{dirsql-0.4.40 → dirsql-0.4.42}/dirsql/cli/resolve_config_extensions.py

@@ -15,8 +15,8 @@ carries resolved paths.
 
 from __future__ import annotations
 
+from .._dirsql import config_paths_from_argv
 from ..resolve_configs_extension_specs import resolve_configs_extension_specs
-from .config_paths_from_argv import config_paths_from_argv
 
 # Config extensions the binary dispatches to `dirsql interpret`; never
 # pre-resolved here (that path resolves via the handshake).

{dirsql-0.4.40 → dirsql-0.4.42}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.4.40"
+version = "0.4.42"
 # abi3 note: the `abi3-py310` pyo3 feature (below) builds ONE stable-ABI
 # `cp310-abi3` wheel per platform that loads on every CPython >= 3.10
 # (matching `pyproject.toml`'s `requires-python = ">=3.10"`), instead of

dirsql-0.4.42/packages/python/changelog.d/2026-09-09-launcher-config-path-scan.md

@@ -0,0 +1,3 @@
+**Changed**
+
+- **The launcher's config-path scan now runs in the shared core.** Before clap sees argv, the pip launcher still walks it for every `--config` / `-c` value (all five spellings) so a bare package-name `[[dirsql.extension]]` entry can be resolved through `importlib` — but the walk itself is now `dirsql::launcher::config_paths_from_argv`, reached through the private `dirsql._dirsql.config_paths_from_argv` binding; the Python copy is deleted. No user-observable change: same flags, same paths, same default of `./.dirsql.toml`. (#1078, #1072)

dirsql-0.4.42/packages/python/e2e-attestations/claude-1078-argv-config-paths-core.json

@@ -0,0 +1,7 @@
+{
+  "command": "just test-e2e",
+  "ran_at": 1788979577,
+  "exit_code": 0,
+  "commit": "ae4f94c0b871cd766d45be67204c8a523a58c707",
+  "branch": "claude/1078-argv-config-paths-core"
+}

dirsql-0.4.42/packages/python/e2e-attestations/claude-1080-share-vtab-scaffolding.json

@@ -0,0 +1,7 @@
+{
+  "command": "just test-e2e",
+  "ran_at": 1789515494,
+  "exit_code": 0,
+  "commit": "51555d8d0ad35095d69c1568e4478f34feb36e09",
+  "branch": "claude/1080-share-vtab-scaffolding"
+}

dirsql-0.4.42/packages/python/e2e-attestations/claude-1109-watch-moved-out.json

@@ -0,0 +1,7 @@
+{
+  "command": "just test-e2e",
+  "ran_at": 1789595962,
+  "exit_code": 0,
+  "commit": "c645cfe8052bdca311060ca475f6ee102246650b",
+  "branch": "claude/1109-watch-moved-out"
+}

{dirsql-0.4.40 → dirsql-0.4.42}/packages/python/src/lib.rs

@@ -462,6 +462,13 @@ mod python {
         py.detach(|| dirsql::cli::run_cli(full))
     }
 
+    /// The config paths a launcher must inspect for package-name extensions;
+    /// see [`dirsql::launcher::config_paths_from_argv`].
+    #[pyfunction]
+    fn config_paths_from_argv(argv: Vec<String>) -> Vec<String> {
+        dirsql::launcher::config_paths_from_argv(&argv)
+    }
+
     #[pymodule]
     #[pyo3(name = "_dirsql")]
     fn py_dirsql_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
@@ -471,6 +478,7 @@ mod python {
         m.add_class::<PyRowEvent>()?;
         m.add_class::<PyScanFailure>()?;
         m.add_function(wrap_pyfunction!(run_cli, m)?)?;
+        m.add_function(wrap_pyfunction!(config_paths_from_argv, m)?)?;
         Ok(())
     }
 
@@ -553,6 +561,14 @@ mod python {
             assert_eq!(OnFileError("bad".to_string()).to_string(), "bad");
         }
 
+        #[test]
+        fn config_paths_from_argv_forwards_to_the_core_scan() {
+            assert_eq!(
+                config_paths_from_argv(vec!["-c".into(), "a.toml".into()]),
+                ["a.toml"]
+            );
+        }
+
         #[test]
         fn int_overflow_message_names_the_value() {
             let m = int_overflow_message("9223372036854775808");

{dirsql-0.4.40 → dirsql-0.4.42}/packages/rust/Cargo.toml

@@ -6,7 +6,7 @@ description = "Ephemeral SQL index over a local directory"
 # version stays for the binding crates (publish = false). The literal
 # intentionally lags the published version: putitoutthere rewrites it to
 # the planned release version at build time and never commits it back.
-version = "0.4.40"
+version = "0.4.42"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly

{dirsql-0.4.40 → dirsql-0.4.42}/packages/rust/src/db.rs

@@ -645,6 +645,19 @@ impl Db {
         Ok(out)
     }
 
+    /// Every distinct `(table_name, file_path)` whose file sits beneath the
+    /// directory `dir`, ordered by table then path.
+    pub fn files_under(&self, dir: &str) -> Result<Vec<(String, String)>> {
+        let prefix = format!("{dir}{}", std::path::MAIN_SEPARATOR);
+        let mut stmt = self.conn.prepare(
+            "SELECT DISTINCT table_name, file_path FROM _dirsql_internal_rows \
+             WHERE substr(file_path, 1, length(?1)) = ?1 \
+             ORDER BY table_name, file_path",
+        )?;
+        let rows = stmt.query_map([prefix], |r| Ok((r.get(0)?, r.get(1)?)))?;
+        Ok(rows.collect::<rusqlite::Result<Vec<_>>>()?)
+    }
+
     /// Helper to execute delete_rows_by_file statements on any connection.
     /// Called from delete_rows_by_file() either inside a caller-supplied
     /// transaction or inside a transaction opened by delete_rows_by_file().
@@ -1700,6 +1713,45 @@ mod tests {
         assert_eq!(rows[0].2, 42, "rowid_ref must be the user-declared rowid");
     }
 
+    #[test]
+    fn files_under_lists_each_file_beneath_the_directory_once_across_tables() {
+        let db = Db::new().unwrap();
+        db.create_table("t1", "CREATE TABLE t1 (id TEXT)").unwrap();
+        db.create_table("t2", "CREATE TABLE t2 (id TEXT)").unwrap();
+        let row = HashMap::from([("id".into(), Value::Text("x".into()))]);
+        for (table, file, idx) in [
+            ("t1", "dir/a.jsonl", 0),
+            ("t1", "dir/a.jsonl", 1),
+            ("t1", "dir/sub/b.jsonl", 0),
+            ("t2", "dir/c.jsonl", 0),
+            ("t1", "dir2/x.jsonl", 0),
+            ("t1", "other.jsonl", 0),
+        ] {
+            db.insert_row(table, &row, file, idx).unwrap();
+        }
+
+        assert_eq!(
+            db.files_under("dir").unwrap(),
+            vec![
+                ("t1".to_string(), "dir/a.jsonl".to_string()),
+                ("t1".to_string(), "dir/sub/b.jsonl".to_string()),
+                ("t2".to_string(), "dir/c.jsonl".to_string()),
+            ],
+            "a multi-row file is listed once; `dir2/` is not beneath `dir`"
+        );
+        assert!(db.files_under("nothing").unwrap().is_empty());
+    }
+
+    #[test]
+    fn files_under_surfaces_sql_failure() {
+        let db = Db::new().unwrap();
+        db.conn
+            .execute("DROP TABLE _dirsql_internal_rows", [])
+            .unwrap();
+        let err = db.files_under("dir").unwrap_err();
+        assert!(matches!(err, DbError::Sqlite(_)), "got: {err:?}");
+    }
+
     #[test]
     fn delete_rows_by_file_removes_mapping() {
         let db = Db::new().unwrap();
@@ -2340,7 +2392,7 @@ mod tests {
         let mut db = Db::new().unwrap();
         db.set_path_table_root(PathBuf::from("/nonexistent-dirsql-root"));
 
-        let rows = db.query("SELECT path FROM './'").unwrap();
+        let rows = db.query("SELECT path FROM './' LIMIT 1").unwrap();
 
         assert!(rows.is_empty(), "an empty root yields no rows: {rows:?}");
     }
@@ -2361,7 +2413,7 @@ mod tests {
         db.set_path_table_root(PathBuf::from("/nonexistent-dirsql-root"));
 
         let rows = db
-            .query("SELECT path FROM '/nonexistent-dirsql-dir/*.log'")
+            .query("SELECT path FROM '/nonexistent-dirsql-dir/*.log' LIMIT 1")
             .unwrap();
 
         assert!(

dirsql-0.4.42/packages/rust/src/launcher.rs

@@ -0,0 +1,168 @@
+//! Argv scanning the language launchers share.
+//!
+//! The pip and npm launchers must know which config files an invocation names
+//! *before* the core parses argv: a config's `[[dirsql.extension]]` entry may
+//! name an extension by bare package name, and resolving that needs the
+//! interpreter the launcher has and this crate does not. Everything about
+//! locating those config paths is language-neutral, so it lives here and each
+//! launcher reaches it through its binding rather than reimplementing it.
+
+/// The config a launcher inspects when argv names none.
+const DEFAULT_CONFIG_PATH: &str = "./.dirsql.toml";
+
+/// Every config value in `argv`, in order (`--config X`, `--config=X`,
+/// `-c X`, `-c=X`, `-cX`), or [`DEFAULT_CONFIG_PATH`] when argv names none.
+///
+/// The scan is deliberately looser than clap: it runs before argv is parsed,
+/// only to find files to read extensions out of, so a bare trailing `-c`
+/// yields an empty string rather than an error. A malformed invocation is
+/// clap's to reject once the launcher hands argv over.
+pub fn config_paths_from_argv(argv: &[String]) -> Vec<String> {
+    let mut paths = Vec::new();
+    let mut args = argv.iter();
+    while let Some(arg) = args.next() {
+        if arg == "--config" || arg == "-c" {
+            paths.push(args.next().cloned().unwrap_or_default());
+        } else if let Some(value) = arg.strip_prefix("--config=") {
+            paths.push(value.to_string());
+        } else if let Some(value) = arg.strip_prefix("-c") {
+            paths.push(value.strip_prefix('=').unwrap_or(value).to_string());
+        }
+    }
+    if paths.is_empty() {
+        paths.push(DEFAULT_CONFIG_PATH.to_string());
+    }
+    paths
+}
+
+#[cfg(test)]
+mod tests {
+    use super::config_paths_from_argv;
+
+    fn scan(argv: &[&str]) -> Vec<String> {
+        config_paths_from_argv(&argv.iter().map(|a| (*a).to_string()).collect::<Vec<_>>())
+    }
+
+    #[test]
+    fn reads_the_long_config_form() {
+        assert_eq!(
+            scan(&["--config", "/cfg/.dirsql.toml"]),
+            ["/cfg/.dirsql.toml"]
+        );
+    }
+
+    #[test]
+    fn reads_the_long_config_equals_form() {
+        assert_eq!(scan(&["--config=/c/.dirsql.toml"]), ["/c/.dirsql.toml"]);
+    }
+
+    #[test]
+    fn reads_the_short_c_form() {
+        assert_eq!(scan(&["-c", "/frag/dirsql.toml"]), ["/frag/dirsql.toml"]);
+    }
+
+    #[test]
+    fn reads_the_short_c_equals_form() {
+        assert_eq!(scan(&["-c=/frag/dirsql.toml"]), ["/frag/dirsql.toml"]);
+    }
+
+    #[test]
+    fn reads_the_short_c_attached_form() {
+        assert_eq!(scan(&["-c/frag/dirsql.toml"]), ["/frag/dirsql.toml"]);
+    }
+
+    #[test]
+    fn collects_every_config_flag_in_argv_order() {
+        assert_eq!(
+            scan(&[
+                "-c",
+                "a.toml",
+                "--config",
+                "b.toml",
+                "--config=c.toml",
+                "-cd.toml"
+            ]),
+            ["a.toml", "b.toml", "c.toml", "d.toml"]
+        );
+    }
+
+    #[test]
+    fn reads_the_config_value_at_any_argv_position() {
+        assert_eq!(scan(&["-v", "--config", "/x/y", "tail"]), ["/x/y"]);
+    }
+
+    #[test]
+    fn collects_a_discovery_injected_fragment_rather_than_the_default() {
+        assert_eq!(
+            scan(&[
+                "query",
+                "SELECT 1",
+                "--include-default",
+                "-c",
+                "/frag/dirsql.toml"
+            ]),
+            ["/frag/dirsql.toml"]
+        );
+    }
+
+    #[test]
+    fn consumes_a_config_value_that_looks_like_a_flag() {
+        assert_eq!(scan(&["--config", "-cx.toml"]), ["-cx.toml"]);
+    }
+
+    #[test]
+    fn consumes_a_config_value_that_is_itself_a_config_flag() {
+        assert_eq!(scan(&["-c", "-c", "x"]), ["-c"]);
+    }
+
+    #[test]
+    fn does_not_mistake_other_short_flags_for_config() {
+        assert_eq!(scan(&["-v", "-x", "val"]), ["./.dirsql.toml"]);
+    }
+
+    #[test]
+    fn does_not_mistake_other_long_flags_for_config() {
+        assert_eq!(scan(&["--a", "val"]), ["./.dirsql.toml"]);
+    }
+
+    #[test]
+    fn does_not_mistake_a_config_prefixed_long_flag_for_config() {
+        assert_eq!(scan(&["--configuration", "val"]), ["./.dirsql.toml"]);
+    }
+
+    #[test]
+    fn defaults_when_no_config_flag_is_given() {
+        assert_eq!(scan(&["--port", "9000"]), ["./.dirsql.toml"]);
+    }
+
+    #[test]
+    fn defaults_for_an_empty_argv() {
+        assert_eq!(scan(&[]), ["./.dirsql.toml"]);
+    }
+
+    #[test]
+    fn treats_a_bare_trailing_long_config_as_an_empty_path() {
+        assert_eq!(scan(&["--config"]), [""]);
+    }
+
+    #[test]
+    fn treats_a_bare_trailing_short_c_as_an_empty_path() {
+        assert_eq!(scan(&["-c"]), [""]);
+    }
+
+    #[test]
+    fn keeps_a_bare_trailing_short_c_after_an_earlier_config() {
+        assert_eq!(scan(&["--config", "a.toml", "-c"]), ["a.toml", ""]);
+    }
+
+    #[test]
+    fn reads_an_empty_value_from_the_equals_forms() {
+        assert_eq!(scan(&["--config="]), [""]);
+        assert_eq!(scan(&["-c="]), [""]);
+    }
+
+    #[test]
+    fn does_not_treat_a_double_dash_as_end_of_options() {
+        assert_eq!(scan(&["--", "-c", "a.toml"]), ["a.toml"]);
+    }
+}

{dirsql-0.4.40 → dirsql-0.4.42}/packages/rust/src/lib.rs

@@ -20,6 +20,8 @@ pub mod functions;
 #[doc(hidden)]
 pub mod infer;
 #[doc(hidden)]
+pub mod launcher;
+#[doc(hidden)]
 pub mod matcher;
 #[doc(hidden)]
 pub mod parsed_cache;
@@ -37,6 +39,7 @@ pub mod scanner;
 pub mod sql_literal;
 #[doc(hidden)]
 pub mod vtab;
+mod vtab_scaffold;
 #[doc(hidden)]
 pub mod watcher;
 
@@ -555,9 +558,6 @@ impl DirSQL {
         // unspecified. An `on_file` failure produces an error event for that
         // table only; the other matching tables still process the event.
         let matches = self.inner.matcher.match_all(&rel_path_buf);
-        if matches.is_empty() {
-            return Vec::new();
-        }
         let rel_path = rel_path_buf.to_string_lossy().to_string();
 
         let mut events = Vec::new();
@@ -571,6 +571,33 @@ impl DirSQL {
                 }
             }
         }
+        // The mirror of the walk above: a directory that leaves the tree
+        // (`rm -r`, or a rename out of or within the root) arrives as one
+        // event naming the directory and none for the files beneath it. It is
+        // already gone, so the rows are the only record of what it held.
+        if matches!(event, FileEvent::Deleted(_)) {
+            events.extend(self.delete_subtree(&rel_path));
+        }
+        events
+    }
+
+    /// Delete the rows of every file recorded beneath `rel_dir`, in every
+    /// table, as if each file had its own delete event.
+    fn delete_subtree(&self, rel_dir: &str) -> Vec<RowEvent> {
+        let files = {
+            let db = match self.inner.db.lock() {
+                Ok(db) => db,
+                Err(e) => return vec![error_event(None, rel_dir, e.to_string())],
+            };
+            match db.files_under(rel_dir) {
+                Ok(files) => files,
+                Err(e) => return vec![error_event(None, rel_dir, e.to_string())],
+            }
+        };
+        let mut events = Vec::new();
+        for (table, file_path) in files {
+            events.extend(self.handle_delete(&table, &file_path));
+        }
         events
     }
 
@@ -2751,6 +2778,153 @@ mod internal_tests {
         );
     }
 
+    /// A one-table db whose fake fs stats every file in `files`, each already
+    /// upserted so the db holds a row per file.
+    fn populated_db(root: &Path, glob: &str, files: &[&str]) -> DirSQL {
+        let mut fake = FakeFs::default();
+        for f in files {
+            fake.stats.insert(root.join(f), fake_stat());
+        }
+        let db = DirSQL::with_ignore_and_fs(
+            root,
+            vec![Table::new(
+                "items",
+                "CREATE TABLE items (name TEXT)",
+                glob,
+                |path| {
+                    vec![Row::from_iter([(
+                        "name".to_string(),
+                        Value::Text(path.to_string()),
+                    )])]
+                },
+            )],
+            Vec::<String>::new(),
+            Arc::new(fake),
+        )
+        .unwrap();
+        for f in files {
+            let events = db.handle_upsert("items", &root.join(f), f);
+            assert!(
+                matches!(&events[..], [RowEvent::Insert { .. }]),
+                "got: {events:?}"
+            );
+        }
+        db
+    }
+
+    fn row_names(db: &DirSQL) -> Vec<String> {
+        let mut names: Vec<String> = db
+            .query("SELECT name FROM items")
+            .unwrap()
+            .into_iter()
+            .filter_map(|r| match r.get("name") {
+                Some(Value::Text(n)) => Some(n.clone()),
+                _ => None,
+            })
+            .collect();
+        names.sort();
+        names
+    }
+
+    fn deleted_paths(events: &[RowEvent]) -> Vec<String> {
+        assert!(
+            events.iter().all(|e| matches!(e, RowEvent::Delete { .. })),
+            "expected only Delete events: {events:?}"
+        );
+        let mut paths: Vec<String> = events
+            .iter()
+            .filter_map(|e| match e {
+                RowEvent::Delete { file_path, .. } => Some(file_path.clone()),
+                _ => None,
+            })
+            .collect();
+        paths.sort();
+        paths
+    }
+
+    /// A deleted directory matches no file glob, yet every row recorded
+    /// beneath it goes, with one Delete per file. A sibling whose name merely
+    /// starts with the directory's (`moved2/`) is untouched.
+    #[test]
+    fn process_file_event_deleted_directory_removes_the_rows_beneath_it() {
+        let dir = TempDir::new().unwrap();
+        let root = dir.path().to_path_buf();
+        let files = ["moved/a.txt", "moved/one/deep.txt", "moved2/x.txt"];
+        let db = populated_db(&root, "**/*.txt", &files);
+
+        let events = db.process_file_event(FileEvent::Deleted(root.join("moved")));
+
+        assert_eq!(
+            deleted_paths(&events),
+            vec!["moved/a.txt".to_string(), "moved/one/deep.txt".to_string()]
+        );
+        assert_eq!(
+            row_names(&db),
+            vec![root.join("moved2/x.txt").to_string_lossy().to_string()]
+        );
+    }
+
+    /// With a glob that also matches the directory itself (`**/*`), the
+    /// exact-path delete finds no row and the subtree delete still runs.
+    #[test]
+    fn process_file_event_deleted_directory_matching_a_glob_removes_the_rows_beneath_it() {
+        let dir = TempDir::new().unwrap();
+        let root = dir.path().to_path_buf();
+        let db = populated_db(&root, "**/*", &["moved/a.txt", "keep.txt"]);
+
+        let events = db.process_file_event(FileEvent::Deleted(root.join("moved")));
+
+        assert_eq!(deleted_paths(&events), vec!["moved/a.txt".to_string()]);
+        assert_eq!(
+            row_names(&db),
+            vec![root.join("keep.txt").to_string_lossy().to_string()]
+        );
+    }
+
+    /// Only a *deleted* directory empties its subtree; a metadata change on
+    /// one says nothing about its files.
+    #[test]
+    fn process_file_event_keeps_the_rows_beneath_a_modified_directory() {
+        let dir = TempDir::new().unwrap();
+        let root = dir.path().to_path_buf();
+        let db = populated_db(&root, "**/*.txt", &["moved/a.txt"]);
+
+        let events = db.process_file_event(FileEvent::Modified(root.join("moved")));
+
+        assert!(events.is_empty(), "got: {events:?}");
+        assert_eq!(
+            row_names(&db),
+            vec![root.join("moved/a.txt").to_string_lossy().to_string()]
+        );
+    }
+
+    #[test]
+    fn delete_subtree_surfaces_db_poison() {
+        let (_dir, db, _abs, _rel) = upsert_fixture();
+        poison(&db.inner.db);
+        let events = db.delete_subtree("moved");
+        assert_single_lock_error(&events);
+    }
+
+    #[test]
+    fn delete_subtree_surfaces_db_failure() {
+        let (_dir, db, _abs, _rel) = upsert_fixture();
+        db.inner
+            .db
+            .lock()
+            .unwrap()
+            .conn()
+            .execute("DROP TABLE _dirsql_internal_rows", [])
+            .unwrap();
+        let events = db.delete_subtree("moved");
+        assert_eq!(events.len(), 1, "expected one error event: {events:?}");
+        assert!(
+            matches!(&events[0], RowEvent::Error { table: None, file_path, error }
+                if file_path == Path::new("moved") && error.contains("no such table")),
+            "got: {events:?}"
+        );
+    }
+
     /// Building with a **relative** root canonicalizes `watch_root` to an
     /// absolute path while leaving `root` exactly as the caller supplied it,
     /// so `notify` never sees `.`.
@@ -3536,7 +3710,7 @@ mod internal_tests {
         let db = DirSQL::builder().root(dir.path()).build().unwrap();
 
         assert!(
-            db.query("SELECT path FROM './'").is_ok(),
+            db.query("SELECT path FROM './' LIMIT 1").is_ok(),
             "the path-table fallback must be armed on an ephemeral db"
         );
     }
@@ -3577,7 +3751,7 @@ mod internal_tests {
             .unwrap();
 
         assert!(
-            db.query("SELECT path FROM './'").is_ok(),
+            db.query("SELECT path FROM './' LIMIT 1").is_ok(),
             "the persist branch must arm the fallback too"
         );
     }