dirsql 0.3.91__tar.gz → 0.3.92__tar.gz

{dirsql-0.3.91 → dirsql-0.3.92}/Cargo.lock

@@ -500,7 +500,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.3.91"
+version = "0.3.92"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.3.91 → dirsql-0.3.92}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.91
+Version: 0.3.92
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index
 Author: Kevin Scott

{dirsql-0.3.91 → dirsql-0.3.92}/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.3.91"
+version = "0.3.92"
 # abi3 note: the `abi3-py311` pyo3 feature (below) builds ONE stable-ABI
 # `cp311-abi3` wheel per platform that loads on every CPython >= 3.11
 # (matching `pyproject.toml`'s `requires-python = ">=3.11"`), instead of

dirsql-0.3.92/packages/python/e2e-attestations/worktree-agent-a1a637f59ef70f352.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/ -x -q",
+  "ran_at": 1783641235,
+  "exit_code": 0,
+  "commit": "e8cda44abdfccb421ad06ec83c77bd644fb2bb83",
+  "branch": "worktree-agent-a1a637f59ef70f352"
+}

{dirsql-0.3.91 → dirsql-0.3.92}/packages/rust/src/lib.rs

@@ -967,8 +967,13 @@ impl DirSQLBuilder {
             poll_interval,
         } = self;
 
-        let mut config_root: Option<PathBuf> = None;
-
+        // The config layer is an ordered list of entries, each carrying its
+        // loaded `config`, its `config_dir` (where `on-file` hooks run and the
+        // base for extension/persist path resolution), its resolved index
+        // `root` (the base for `{path}`), and its `hook_timeout`. Every caller
+        // supplies at most one config, so the list holds 0 or 1 entries and the
+        // in-order merge below is byte-for-byte identical to a single pass.
+        let mut config_entries: Vec<ResolvedConfigEntry> = Vec::new();
         if let Some(ref cfg_path) = config_path {
             let cfg = config::load_config(cfg_path).map_err(DirSqlError::config)?;
 
@@ -985,12 +990,30 @@ impl DirSQLBuilder {
             } else {
                 cfg_parent.clone()
             };
+            let hook_timeout = cfg.hook_timeout.unwrap_or(command::DEFAULT_COMMAND_TIMEOUT);
+            config_entries.push(ResolvedConfigEntry {
+                config: cfg,
+                config_dir: cfg_parent,
+                root: resolved_root,
+                hook_timeout,
+            });
+        }
+
+        let mut config_root: Option<PathBuf> = None;
+        for entry in config_entries {
+            let ResolvedConfigEntry {
+                config: cfg,
+                config_dir: cfg_parent,
+                root: resolved_root,
+                hook_timeout,
+            } = entry;
             config_root = Some(resolved_root.clone());
 
             // `on-file` commands run in the config file's directory; `{path}`
             // is the matched file's absolute path and `{root}` the resolved
             // index root.
-            let cfg_tables = build_tables_from_config(&cfg, &cfg_parent, &resolved_root)?;
+            let cfg_tables =
+                build_tables_from_config(&cfg, &cfg_parent, &resolved_root, hook_timeout)?;
             tables.extend(cfg_tables);
             ignore.extend(cfg.ignore);
 
@@ -1070,6 +1093,18 @@ impl DirSQLBuilder {
 /// Default poll interval for the channel-based watch loop.
 const DEFAULT_POLL_INTERVAL: Duration = Duration::from_millis(200);
 
+/// One resolved config file in the ordered list [`DirSQLBuilder::resolve`]
+/// merges over. Carries the loaded `config`, its `config_dir` (the config
+/// file's parent -- where `on-file` hooks run and the base for extension /
+/// persist path resolution), the resolved index `root` (the base for the
+/// `{path}` placeholder), and the `hook_timeout` bounding each `on-file` run.
+struct ResolvedConfigEntry {
+    config: config::Config,
+    config_dir: PathBuf,
+    root: PathBuf,
+    hook_timeout: Duration,
+}
+
 /// Fully-resolved builder inputs: the result of merging programmatic
 /// settings with values loaded from a `.dirsql.toml` config file.
 #[doc(hidden)]
@@ -1361,16 +1396,17 @@ fn relative_path(root: &Path, path: &Path) -> String {
 /// array of row objects on stdout, which becomes the file's rows (filesystem
 /// facts are still merged on top, user values winning). `config_dir` is the
 /// command's working directory (the config file's parent) and `root` is the
-/// resolved index root exposed as the `{root}` placeholder. Each run is
-/// bounded by the global `[dirsql].hook-timeout` key when present, falling
-/// back to [`command::DEFAULT_COMMAND_TIMEOUT`].
+/// resolved index root exposed as the `{root}` placeholder. `timeout` bounds
+/// each `on-file` run; the caller resolves it from the global
+/// `[dirsql].hook-timeout` key, falling back to
+/// [`command::DEFAULT_COMMAND_TIMEOUT`].
 fn build_tables_from_config(
     cfg: &config::Config,
     config_dir: &Path,
     root: &Path,
+    timeout: Duration,
 ) -> Result<Vec<Table>> {
     let mut tables = Vec::with_capacity(cfg.tables.len());
-    let timeout = cfg.hook_timeout.unwrap_or(command::DEFAULT_COMMAND_TIMEOUT);
 
     for table_cfg in &cfg.tables {
         let mut table = match &table_cfg.on_file {
@@ -2871,12 +2907,46 @@ mod internal_tests {
         ))
         .unwrap();
         let dir = TempDir::new().unwrap();
-        let tables = build_tables_from_config(&cfg, dir.path(), dir.path()).unwrap();
+        let tables = build_tables_from_config(
+            &cfg,
+            dir.path(),
+            dir.path(),
+            command::DEFAULT_COMMAND_TIMEOUT,
+        )
+        .unwrap();
         assert_eq!(tables.len(), 2);
         assert_eq!((tables[0].extract)("/whatever").unwrap().len(), 1);
         assert!(tables[1].strict, "on-file table preserves strict flag");
     }
 
+    #[test]
+    fn build_tables_from_config_uses_the_caller_supplied_timeout() {
+        // The timeout is now threaded in as an explicit argument rather than
+        // re-derived from `cfg.hook_timeout` inside the function; a table built
+        // from a config declaring its own `hook-timeout` must honor the value
+        // the caller passes, independent of the config key.
+        let cfg = config::load_config_str(concat!(
+            "[dirsql]\n",
+            "hook-timeout = 999\n\n",
+            "[[table]]\n",
+            "ddl = \"CREATE TABLE b (y TEXT)\"\n",
+            "glob = \"*.b\"\n",
+            "on-file = \"printf '[{\\\"y\\\":1}]'\"\n",
+        ))
+        .unwrap();
+        let dir = TempDir::new().unwrap();
+        let abs = dir.path().join("f.b");
+        let tables =
+            build_tables_from_config(&cfg, dir.path(), dir.path(), Duration::from_secs(5)).unwrap();
+        assert_eq!(tables.len(), 1);
+        // The passed timeout is generous, so the on-file command runs and its
+        // row is produced -- proving the argument path is live.
+        assert_eq!(
+            (tables[0].extract)(&abs.to_string_lossy()).unwrap().len(),
+            1
+        );
+    }
+
     #[test]
     fn run_on_file_parses_command_json_output() {
         let dir = TempDir::new().unwrap();

dirsql-0.3.91/packages/python/e2e-attestation.json

@@ -1,6 +0,0 @@
-{
-  "command": "uv run python -m pytest tests/e2e/ -x -q",
-  "ran_at": 1783639859,
-  "exit_code": 0,
-  "commit": "8b7d30b7097ed56f7f1cca359b7a67ffaf8c4e65"
-}