dirsql 0.3.58__tar.gz → 0.3.60__tar.gz

{dirsql-0.3.58 → dirsql-0.3.60}/Cargo.lock

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

{dirsql-0.3.58 → dirsql-0.3.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.3.58
+Version: 0.3.60
 Requires-Dist: pytest>=8 ; extra == 'dev'
 Requires-Dist: pytest-describe>=2 ; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23 ; extra == 'dev'

dirsql-0.3.60/docs/AGENTS.md

@@ -0,0 +1,95 @@
+# Documentation Development
+
+Instructions for agents working on `dirsql` documentation.
+
+## Stack
+
+The docs site uses [VitePress](https://vitepress.dev/). Source files are in `docs/` at the project root.
+
+## Running locally
+
+```bash
+cd docs
+pnpm install
+pnpm dev
+```
+
+This starts a local dev server (default: `http://localhost:5173/dirsql/`). The site hot-reloads on file changes.
+
+## Building
+
+```bash
+cd docs
+pnpm build
+```
+
+The build must succeed before pushing. VitePress will fail on broken links, missing assets, and syntax errors in markdown.
+
+## Testing changes
+
+Before pushing any docs changes:
+
+1. Run `pnpm build` in `docs/` and confirm it exits cleanly
+2. Spot-check the built output with `pnpm preview`
+3. Verify sidebar navigation, code blocks, and internal links render correctly
+
+## Structure
+
+The docs follow the [Diataxis](https://diataxis.fr/) framework. **Type is
+the only organizational axis** -- there are no product-area sections (no
+"CLI" section; #353). The nav and the sidebar mirror the four types exactly.
+
+The **primary reader is the CLI user**: someone with a directory of files,
+one command (`uvx` / `npx dirsql`), and a `.dirsql.toml`. The SDKs are the
+secondary audience and appear **only in Reference**, plus the single
+"Embed `dirsql` in your application" how-to.
+
+Target tree (the spec for #353; existing pages are *quarried* into it, not
+migrated -- a page survives only if a slot wants its content):
+
+- **Tutorial** -- one lesson: *Your first dirsql database*. The reader
+  performs every step and sees output at each one; success is
+  author-guaranteed (toy dataset, no branching).
+- **How-to Guides** -- goal-named recipes: define tables for your files;
+  derive columns from file paths; extract rows from file contents
+  (`on-file`); search documents by meaning; skip files; load a SQLite
+  extension; keep the index across restarts; react to file changes; embed
+  `dirsql` in an application.
+- **Reference** -- CLI flags and defaults; the complete `.dirsql.toml`
+  schema; the command hook contract (placeholders, stdout protocol, exit
+  codes, timeouts); virtual columns and glob captures; the HTTP API;
+  per-language SDK pages (the sole SDK home).
+- **Explanation** -- one page: how `dirsql` thinks (the filesystem is the
+  source of truth; the database is a derived, ephemeral, read-only view;
+  reconcile and diffing). Its canonical home is the root `ARCHITECTURE.md`;
+  #374 surfaces it via an include page, the same mechanism
+  `docs/migrations.md` uses for `MIGRATIONS.md`. Edit the root file, never
+  a rendered include.
+
+Working rules:
+
+- **Facts live once, in Reference.** Tutorials and how-tos link to reference
+  material; they never re-list constructor parameters or duplicate API tables.
+- **A how-to opens with a 1-2 line goal/motivation statement.** Deep
+  rationale (tradeoffs, alternatives considered, theory) moves to Explanation
+  only when it is substantial enough to stand alone and is reused across
+  pages. Do not manufacture stub pages for a paragraph of "why".
+- **Tutorial vs how-to:** a tutorial is a lesson along a path the author
+  guarantees; a how-to serves a competent reader pursuing their own goal.
+- **One global sidebar.** Never add a path-scoped sidebar key -- it swaps
+  out the whole tree and hides every other section while inside one (#301;
+  see the comment above `sidebar` in `config.ts`).
+
+## Conventions
+
+- **Lead with the use case.** Open each feature description with *why* a
+  reader would reach for it before *how* it works. Don't frame a feature
+  by what an adjacent feature can't do.
+  *Don't:* "Persistence avoids the thing the default mode can't do..."
+  *Do:* "Persistence keeps the SQLite index on disk between runs so large
+  directories don't re-scan on every startup."
+- Wrap `dirsql` in backticks in all prose text
+- Use VitePress [code group](https://vitepress.dev/guide/markdown#code-groups) syntax (`::: code-group`) for multi-language examples with `Python`, `Rust`, and `TypeScript` tabs
+- Internal links use relative paths (e.g., `./guide/tables.md`)
+- The VitePress config is at `docs/.vitepress/config.ts`
+- The site is deployed under the `/dirsql/` base path

{dirsql-0.3.58 → dirsql-0.3.60}/docs/cli/config.md

@@ -244,6 +244,13 @@ file is skipped (it contributes no rows) and a one-line warning naming the file
 and the error is written to stderr. One bad file never aborts the scan; the
 other files' rows are indexed normally.
 
+**Timeout.** Each run is bounded by the default 30-second timeout. When a
+command legitimately needs longer — it downloads a model on first run, or calls
+a rate-limited API — raise the bound with the global
+[`[dirsql].hook-timeout`](#command-execution) key (positive whole seconds). A
+run exceeding the bound is killed and handled with the per-file error isolation
+above (the file is skipped with a stderr warning).
+
 See [Command execution](#command-execution) for the full contract (argv
 splitting, injection safety, cwd, environment, timeout, and output framing).
 
@@ -279,7 +286,8 @@ key and the `{"sql": …}` contract returns.
 **On failure** — a non-zero exit, a timeout, or a spawn error — the request
 returns `500 Internal Server Error` with the command's stderr tail in the JSON
 `error` body. The command runs in the config file's directory and is bounded by
-a fixed **30-second** timeout.
+a **30-second** timeout by default; a slow translator (e.g. LLM-backed) can
+raise it with the global [`[dirsql].hook-timeout`](#command-execution) key.
 
 #### The hook owns SQL safety
 
@@ -361,7 +369,8 @@ returns.
 **On failure** — a non-zero exit, a timeout, or a spawn error — the request
 returns `500 Internal Server Error` with the command's stderr tail in the JSON
 `error` body. The command runs in the config file's directory and is bounded by
-a fixed **30-second** timeout.
+a **30-second** timeout by default; raise it with the global
+[`[dirsql].hook-timeout`](#command-execution) key.
 
 See [Command execution](#command-execution) for the full contract (argv
 splitting, injection safety, cwd, environment, timeout, and output framing).
@@ -409,9 +418,18 @@ Config keys that run an external command — today `on-file`, `pre-query`, and
 - **Output framing.** The command's result is the **last non-empty line of
   stdout**; any log/chatter lines above it are ignored. stderr is never data —
   it is captured only to enrich error messages.
-- **Timeout.** Each command run is bounded by a fixed **30-second** timeout (no
-  per-table override yet); a command that exceeds it is killed and treated as a
-  failure.
+- **Timeout.** Each command run is bounded by a **30-second** timeout by
+  default; a command that exceeds it is killed and treated as a failure. Raise
+  (or tighten) it for **all** hooks — `on-file`, `pre-query`, and `post-query`
+  alike — with a single global `[dirsql].hook-timeout` key, in positive whole
+  seconds:
+
+  ```toml
+  [dirsql]
+  hook-timeout = 300
+  ```
+
+  Zero and negative values are rejected as a config error.
 - **Errors.** A non-zero exit, a timeout, a spawn failure, or output that does
   not parse as expected is a per-file failure: the file is skipped with a
   stderr warning and the scan continues.

{dirsql-0.3.58 → dirsql-0.3.60}/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.58"
+version = "0.3.60"
 edition.workspace = true
 publish = false
 readme = "README.md"

dirsql-0.3.60/packages/python/docs/AGENTS.md

@@ -0,0 +1,95 @@
+# Documentation Development
+
+Instructions for agents working on `dirsql` documentation.
+
+## Stack
+
+The docs site uses [VitePress](https://vitepress.dev/). Source files are in `docs/` at the project root.
+
+## Running locally
+
+```bash
+cd docs
+pnpm install
+pnpm dev
+```
+
+This starts a local dev server (default: `http://localhost:5173/dirsql/`). The site hot-reloads on file changes.
+
+## Building
+
+```bash
+cd docs
+pnpm build
+```
+
+The build must succeed before pushing. VitePress will fail on broken links, missing assets, and syntax errors in markdown.
+
+## Testing changes
+
+Before pushing any docs changes:
+
+1. Run `pnpm build` in `docs/` and confirm it exits cleanly
+2. Spot-check the built output with `pnpm preview`
+3. Verify sidebar navigation, code blocks, and internal links render correctly
+
+## Structure
+
+The docs follow the [Diataxis](https://diataxis.fr/) framework. **Type is
+the only organizational axis** -- there are no product-area sections (no
+"CLI" section; #353). The nav and the sidebar mirror the four types exactly.
+
+The **primary reader is the CLI user**: someone with a directory of files,
+one command (`uvx` / `npx dirsql`), and a `.dirsql.toml`. The SDKs are the
+secondary audience and appear **only in Reference**, plus the single
+"Embed `dirsql` in your application" how-to.
+
+Target tree (the spec for #353; existing pages are *quarried* into it, not
+migrated -- a page survives only if a slot wants its content):
+
+- **Tutorial** -- one lesson: *Your first dirsql database*. The reader
+  performs every step and sees output at each one; success is
+  author-guaranteed (toy dataset, no branching).
+- **How-to Guides** -- goal-named recipes: define tables for your files;
+  derive columns from file paths; extract rows from file contents
+  (`on-file`); search documents by meaning; skip files; load a SQLite
+  extension; keep the index across restarts; react to file changes; embed
+  `dirsql` in an application.
+- **Reference** -- CLI flags and defaults; the complete `.dirsql.toml`
+  schema; the command hook contract (placeholders, stdout protocol, exit
+  codes, timeouts); virtual columns and glob captures; the HTTP API;
+  per-language SDK pages (the sole SDK home).
+- **Explanation** -- one page: how `dirsql` thinks (the filesystem is the
+  source of truth; the database is a derived, ephemeral, read-only view;
+  reconcile and diffing). Its canonical home is the root `ARCHITECTURE.md`;
+  #374 surfaces it via an include page, the same mechanism
+  `docs/migrations.md` uses for `MIGRATIONS.md`. Edit the root file, never
+  a rendered include.
+
+Working rules:
+
+- **Facts live once, in Reference.** Tutorials and how-tos link to reference
+  material; they never re-list constructor parameters or duplicate API tables.
+- **A how-to opens with a 1-2 line goal/motivation statement.** Deep
+  rationale (tradeoffs, alternatives considered, theory) moves to Explanation
+  only when it is substantial enough to stand alone and is reused across
+  pages. Do not manufacture stub pages for a paragraph of "why".
+- **Tutorial vs how-to:** a tutorial is a lesson along a path the author
+  guarantees; a how-to serves a competent reader pursuing their own goal.
+- **One global sidebar.** Never add a path-scoped sidebar key -- it swaps
+  out the whole tree and hides every other section while inside one (#301;
+  see the comment above `sidebar` in `config.ts`).
+
+## Conventions
+
+- **Lead with the use case.** Open each feature description with *why* a
+  reader would reach for it before *how* it works. Don't frame a feature
+  by what an adjacent feature can't do.
+  *Don't:* "Persistence avoids the thing the default mode can't do..."
+  *Do:* "Persistence keeps the SQLite index on disk between runs so large
+  directories don't re-scan on every startup."
+- Wrap `dirsql` in backticks in all prose text
+- Use VitePress [code group](https://vitepress.dev/guide/markdown#code-groups) syntax (`::: code-group`) for multi-language examples with `Python`, `Rust`, and `TypeScript` tabs
+- Internal links use relative paths (e.g., `./guide/tables.md`)
+- The VitePress config is at `docs/.vitepress/config.ts`
+- The site is deployed under the `/dirsql/` base path

{dirsql-0.3.58/packages/rust → dirsql-0.3.60/packages/python}/docs/cli/config.md

@@ -244,6 +244,13 @@ file is skipped (it contributes no rows) and a one-line warning naming the file
 and the error is written to stderr. One bad file never aborts the scan; the
 other files' rows are indexed normally.
 
+**Timeout.** Each run is bounded by the default 30-second timeout. When a
+command legitimately needs longer — it downloads a model on first run, or calls
+a rate-limited API — raise the bound with the global
+[`[dirsql].hook-timeout`](#command-execution) key (positive whole seconds). A
+run exceeding the bound is killed and handled with the per-file error isolation
+above (the file is skipped with a stderr warning).
+
 See [Command execution](#command-execution) for the full contract (argv
 splitting, injection safety, cwd, environment, timeout, and output framing).
 
@@ -279,7 +286,8 @@ key and the `{"sql": …}` contract returns.
 **On failure** — a non-zero exit, a timeout, or a spawn error — the request
 returns `500 Internal Server Error` with the command's stderr tail in the JSON
 `error` body. The command runs in the config file's directory and is bounded by
-a fixed **30-second** timeout.
+a **30-second** timeout by default; a slow translator (e.g. LLM-backed) can
+raise it with the global [`[dirsql].hook-timeout`](#command-execution) key.
 
 #### The hook owns SQL safety
 
@@ -361,7 +369,8 @@ returns.
 **On failure** — a non-zero exit, a timeout, or a spawn error — the request
 returns `500 Internal Server Error` with the command's stderr tail in the JSON
 `error` body. The command runs in the config file's directory and is bounded by
-a fixed **30-second** timeout.
+a **30-second** timeout by default; raise it with the global
+[`[dirsql].hook-timeout`](#command-execution) key.
 
 See [Command execution](#command-execution) for the full contract (argv
 splitting, injection safety, cwd, environment, timeout, and output framing).
@@ -409,9 +418,18 @@ Config keys that run an external command — today `on-file`, `pre-query`, and
 - **Output framing.** The command's result is the **last non-empty line of
   stdout**; any log/chatter lines above it are ignored. stderr is never data —
   it is captured only to enrich error messages.
-- **Timeout.** Each command run is bounded by a fixed **30-second** timeout (no
-  per-table override yet); a command that exceeds it is killed and treated as a
-  failure.
+- **Timeout.** Each command run is bounded by a **30-second** timeout by
+  default; a command that exceeds it is killed and treated as a failure. Raise
+  (or tighten) it for **all** hooks — `on-file`, `pre-query`, and `post-query`
+  alike — with a single global `[dirsql].hook-timeout` key, in positive whole
+  seconds:
+
+  ```toml
+  [dirsql]
+  hook-timeout = 300
+  ```
+
+  Zero and negative values are rejected as a config error.
 - **Errors.** A non-zero exit, a timeout, a spawn failure, or output that does
   not parse as expected is a per-file failure: the file is skipped with a
   stderr warning and the scan continues.

{dirsql-0.3.58 → dirsql-0.3.60}/packages/python/e2e-attestation.json

@@ -1,6 +1,6 @@
 {
   "command": "uv run python -m pytest tests/e2e/ -x -q",
-  "ran_at": 1783118080,
+  "ran_at": 1783167859,
   "exit_code": 0,
-  "commit": "b45791b9ad04fbac360618f3ff885e5f84a8289e"
+  "commit": "edd031c6e37ab86d3e7906b6e67b22d7c37ba43d"
 }

{dirsql-0.3.58/packages/python → dirsql-0.3.60/packages/rust}/docs/cli/config.md

@@ -244,6 +244,13 @@ file is skipped (it contributes no rows) and a one-line warning naming the file
 and the error is written to stderr. One bad file never aborts the scan; the
 other files' rows are indexed normally.
 
+**Timeout.** Each run is bounded by the default 30-second timeout. When a
+command legitimately needs longer — it downloads a model on first run, or calls
+a rate-limited API — raise the bound with the global
+[`[dirsql].hook-timeout`](#command-execution) key (positive whole seconds). A
+run exceeding the bound is killed and handled with the per-file error isolation
+above (the file is skipped with a stderr warning).
+
 See [Command execution](#command-execution) for the full contract (argv
 splitting, injection safety, cwd, environment, timeout, and output framing).
 
@@ -279,7 +286,8 @@ key and the `{"sql": …}` contract returns.
 **On failure** — a non-zero exit, a timeout, or a spawn error — the request
 returns `500 Internal Server Error` with the command's stderr tail in the JSON
 `error` body. The command runs in the config file's directory and is bounded by
-a fixed **30-second** timeout.
+a **30-second** timeout by default; a slow translator (e.g. LLM-backed) can
+raise it with the global [`[dirsql].hook-timeout`](#command-execution) key.
 
 #### The hook owns SQL safety
 
@@ -361,7 +369,8 @@ returns.
 **On failure** — a non-zero exit, a timeout, or a spawn error — the request
 returns `500 Internal Server Error` with the command's stderr tail in the JSON
 `error` body. The command runs in the config file's directory and is bounded by
-a fixed **30-second** timeout.
+a **30-second** timeout by default; raise it with the global
+[`[dirsql].hook-timeout`](#command-execution) key.
 
 See [Command execution](#command-execution) for the full contract (argv
 splitting, injection safety, cwd, environment, timeout, and output framing).
@@ -409,9 +418,18 @@ Config keys that run an external command — today `on-file`, `pre-query`, and
 - **Output framing.** The command's result is the **last non-empty line of
   stdout**; any log/chatter lines above it are ignored. stderr is never data —
   it is captured only to enrich error messages.
-- **Timeout.** Each command run is bounded by a fixed **30-second** timeout (no
-  per-table override yet); a command that exceeds it is killed and treated as a
-  failure.
+- **Timeout.** Each command run is bounded by a **30-second** timeout by
+  default; a command that exceeds it is killed and treated as a failure. Raise
+  (or tighten) it for **all** hooks — `on-file`, `pre-query`, and `post-query`
+  alike — with a single global `[dirsql].hook-timeout` key, in positive whole
+  seconds:
+
+  ```toml
+  [dirsql]
+  hook-timeout = 300
+  ```
+
+  Zero and negative values are rejected as a config error.
 - **Errors.** A non-zero exit, a timeout, a spawn failure, or output that does
   not parse as expected is a per-file failure: the file is skipped with a
   stderr warning and the scan continues.

{dirsql-0.3.58 → dirsql-0.3.60}/packages/rust/src/bin/dirsql.rs

@@ -228,9 +228,14 @@ fn load_pre_query(cli: &Cli) -> Option<PreQuery> {
         return None;
     }
     let resolved = config_path.canonicalize().ok()?;
-    let command = dirsql::config::load_config(&resolved).ok()?.pre_query?;
+    let config = dirsql::config::load_config(&resolved).ok()?;
+    let command = config.pre_query?;
     let config_dir = resolved.parent()?.to_path_buf();
-    Some(PreQuery::new(command, config_dir))
+    let mut pre_query = PreQuery::new(command, config_dir);
+    if let Some(timeout) = config.hook_timeout {
+        pre_query = pre_query.with_timeout(timeout);
+    }
+    Some(pre_query)
 }
 
 /// Extract the server-wide `post-query` hook from the config, if any.
@@ -245,9 +250,14 @@ fn load_post_query(cli: &Cli) -> Option<PostQuery> {
         return None;
     }
     let resolved = config_path.canonicalize().ok()?;
-    let command = dirsql::config::load_config(&resolved).ok()?.post_query?;
+    let config = dirsql::config::load_config(&resolved).ok()?;
+    let command = config.post_query?;
     let config_dir = resolved.parent()?.to_path_buf();
-    Some(PostQuery::new(command, config_dir))
+    let mut post_query = PostQuery::new(command, config_dir);
+    if let Some(timeout) = config.hook_timeout {
+        post_query = post_query.with_timeout(timeout);
+    }
+    Some(post_query)
 }
 
 /// Zero-config fallback. When no `.dirsql.toml` is found, dirsql indexes the

{dirsql-0.3.58 → dirsql-0.3.60}/packages/rust/src/cli/mod.rs

@@ -27,6 +27,7 @@ use tokio::task::JoinError;
 use tokio::task::JoinHandle;
 
 use crate::DirSQL;
+use crate::command::DEFAULT_COMMAND_TIMEOUT;
 
 pub mod init;
 pub mod router;
@@ -51,16 +52,29 @@ pub struct PreQuery {
     pub command: String,
     /// The command's working directory — the config file's parent.
     pub config_dir: PathBuf,
+    /// Per-run timeout. Defaults to the shared 30-second
+    /// [`DEFAULT_COMMAND_TIMEOUT`]; override it via [`Self::with_timeout`]
+    /// (the CLI wires the global `[dirsql].hook-timeout` here, #351).
+    pub timeout: Duration,
 }
 
 impl PreQuery {
-    /// Build a [`PreQuery`] from a command template and its working directory.
+    /// Build a [`PreQuery`] from a command template and its working directory,
+    /// with the default 30-second timeout.
     pub fn new(command: impl Into<String>, config_dir: impl Into<PathBuf>) -> Self {
         Self {
             command: command.into(),
             config_dir: config_dir.into(),
+            timeout: DEFAULT_COMMAND_TIMEOUT,
         }
     }
+
+    /// Override the per-run timeout (from the global `[dirsql].hook-timeout`).
+    /// A run exceeding it is killed and the request returns 500.
+    pub fn with_timeout(mut self, timeout: Duration) -> Self {
+        self.timeout = timeout;
+        self
+    }
 }
 
 /// A server-wide `post-query` command hook, carrying the command template plus
@@ -76,16 +90,29 @@ pub struct PostQuery {
     pub command: String,
     /// The command's working directory — the config file's parent.
     pub config_dir: PathBuf,
+    /// Per-run timeout. Defaults to the shared 30-second
+    /// [`DEFAULT_COMMAND_TIMEOUT`]; override it via [`Self::with_timeout`]
+    /// (the CLI wires the global `[dirsql].hook-timeout` here, #351).
+    pub timeout: Duration,
 }
 
 impl PostQuery {
-    /// Build a [`PostQuery`] from a command template and its working directory.
+    /// Build a [`PostQuery`] from a command template and its working directory,
+    /// with the default 30-second timeout.
     pub fn new(command: impl Into<String>, config_dir: impl Into<PathBuf>) -> Self {
         Self {
             command: command.into(),
             config_dir: config_dir.into(),
+            timeout: DEFAULT_COMMAND_TIMEOUT,
         }
     }
+
+    /// Override the per-run timeout (from the global `[dirsql].hook-timeout`).
+    /// A run exceeding it is killed and the request returns 500.
+    pub fn with_timeout(mut self, timeout: Duration) -> Self {
+        self.timeout = timeout;
+        self
+    }
 }
 
 /// Configure how the server binds. Defaults to `localhost:7117` with a
@@ -258,10 +285,17 @@ mod tests {
     #[test]
     fn pre_query_constructor_carries_command_and_dir() {
         // `PreQuery::new` is pure data plumbing: the command template and the
-        // working directory it will run in.
+        // working directory it will run in, with the shared default timeout.
         let pq = PreQuery::new("to_sql.py {args}", "/proj");
         assert_eq!(pq.command, "to_sql.py {args}");
         assert_eq!(pq.config_dir, PathBuf::from("/proj"));
+        assert_eq!(pq.timeout, Duration::from_secs(30));
+    }
+
+    #[test]
+    fn pre_query_with_timeout_overrides_the_default() {
+        let pq = PreQuery::new("cmd {args}", "/proj").with_timeout(Duration::from_secs(60));
+        assert_eq!(pq.timeout, Duration::from_secs(60));
     }
 
     #[test]
@@ -275,10 +309,17 @@ mod tests {
     #[test]
     fn post_query_constructor_carries_command_and_dir() {
         // `PostQuery::new` is pure data plumbing: the command template and the
-        // working directory it will run in.
+        // working directory it will run in, with the shared default timeout.
         let pq = PostQuery::new("jq '{results: .}'", "/proj");
         assert_eq!(pq.command, "jq '{results: .}'");
         assert_eq!(pq.config_dir, PathBuf::from("/proj"));
+        assert_eq!(pq.timeout, Duration::from_secs(30));
+    }
+
+    #[test]
+    fn post_query_with_timeout_overrides_the_default() {
+        let pq = PostQuery::new("reshape {args}", "/proj").with_timeout(Duration::from_secs(60));
+        assert_eq!(pq.timeout, Duration::from_secs(60));
     }
 
     #[test]

{dirsql-0.3.58 → dirsql-0.3.60}/packages/rust/src/cli/router.rs

@@ -21,15 +21,6 @@ use super::{AppState, PostQuery, PreQuery};
 use crate::command::{Placeholder, run_command};
 use crate::{DirSQL, DirSqlError};
 
-/// Fixed timeout for a server-wide `pre-query` command. There is no override
-/// key yet; this module constant is the documented current default (mirrors
-/// `on-file`'s `ON_FILE_TIMEOUT`).
-const PRE_QUERY_TIMEOUT: Duration = Duration::from_secs(30);
-
-/// Fixed timeout for a server-wide `post-query` command (mirrors
-/// `PRE_QUERY_TIMEOUT`).
-const POST_QUERY_TIMEOUT: Duration = Duration::from_secs(30);
-
 /// Cap on the serialized result payload passed as the `{args}` argv token.
 /// Beyond this, `{args}` is emptied and the operator is directed to stdin
 /// (which always carries the full payload) — comfortably under Linux's 128 KiB
@@ -155,15 +146,17 @@ fn parse_sql_body(body: &str) -> Result<String, Response> {
 async fn run_pre_query(pq: &PreQuery, raw_body: String) -> Result<String, Response> {
     let command = pq.command.clone();
     let config_dir = pq.config_dir.clone();
+    let timeout = pq.timeout;
     // `run_command` is blocking — it spawns a child and joins drain threads —
-    // so run it off the async runtime. It enforces `PRE_QUERY_TIMEOUT`
-    // internally, so no outer `tokio::time::timeout` is needed.
+    // so run it off the async runtime. It enforces the hook's timeout
+    // (the global `[dirsql].hook-timeout`, default 30s) internally, so no outer
+    // `tokio::time::timeout` is needed.
     let outcome = tokio::task::spawn_blocking(move || {
         run_command(
             &command,
             &[Placeholder::new("args", &raw_body)],
             &config_dir,
-            PRE_QUERY_TIMEOUT,
+            timeout,
             None,
         )
     })
@@ -198,9 +191,11 @@ async fn run_post_query(
         .map_err(|err| error_response(StatusCode::INTERNAL_SERVER_ERROR, err.to_string()))?;
     let command = pq.command.clone();
     let config_dir = pq.config_dir.clone();
+    let timeout = pq.timeout;
     // `run_command` is blocking — it spawns a child and joins drain threads —
-    // so run it off the async runtime. It enforces `POST_QUERY_TIMEOUT`
-    // internally, so no outer `tokio::time::timeout` is needed.
+    // so run it off the async runtime. It enforces the hook's timeout
+    // (the global `[dirsql].hook-timeout`, default 30s) internally, so no outer
+    // `tokio::time::timeout` is needed.
     let outcome = tokio::task::spawn_blocking(move || {
         let args_value = if payload.len() <= POST_QUERY_ARGS_MAX {
             payload.clone()
@@ -217,7 +212,7 @@ async fn run_post_query(
             &command,
             &[Placeholder::new("args", &args_value)],
             &config_dir,
-            POST_QUERY_TIMEOUT,
+            timeout,
             Some(payload.as_bytes()),
         )
     })

{dirsql-0.3.58 → dirsql-0.3.60}/packages/rust/src/command.rs

@@ -36,6 +36,11 @@ use std::time::Duration;
 
 use wait_timeout::ChildExt;
 
+/// The default timeout for every command-backed event (`on-file`,
+/// `pre-query`, `post-query`) when the config declares no override
+/// (`[dirsql].hook-timeout`, positive whole seconds).
+pub const DEFAULT_COMMAND_TIMEOUT: Duration = Duration::from_secs(30);
+
 /// A named placeholder substituted into a command's argv.
 ///
 /// `name` is the bare identifier (no braces): a `name` of `path` matches the