dirsql 0.3.95__tar.gz → 0.3.97__tar.gz

{dirsql-0.3.95 → dirsql-0.3.97}/Cargo.lock

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

{dirsql-0.3.95 → dirsql-0.3.97}/PKG-INFO

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

{dirsql-0.3.95/packages/python → dirsql-0.3.97}/docs/howto/define-tables.md

@@ -42,9 +42,10 @@ zero-config default — only the tables you define are served.
 
 ## Multiple tables
 
-Add one `[[table]]` entry per table. When a file matches several globs, the
-first matching table wins — see [`[[table]]`](../reference/config.md#table)
-for that and the remaining keys (`strict`, `on-file`).
+Add one `[[table]]` entry per table. When a file matches several globs, it
+populates every matching table — each table is an independent view. See
+[`[[table]]`](../reference/config.md#table) for that and the remaining keys
+(`strict`, `on-file`).
 
 ## Going further
 

{dirsql-0.3.95/packages/rust → dirsql-0.3.97}/docs/reference/cli.md

@@ -45,7 +45,7 @@ requests, closes open `/events` streams, and exits.
 
 | Flag | Default | Description |
 |---|---|---|
-| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is always rooted at the **invocation directory** (the current working directory), regardless of where this file lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
+| `-c, --config <path>` | `./.dirsql.toml` | Path to a [config file](./config.md). **Repeatable** (`-c a -c b`): the configs load and merge in argv order — see [Composing multiple configs](./config.md#composing-multiple-configs). The index is always rooted at the **invocation directory** (the current working directory), regardless of where a config lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. With none given, `./.dirsql.toml` is used; when it does not exist, the server runs in [zero-config mode](#zero-config-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Global — also honored by [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |

{dirsql-0.3.95 → dirsql-0.3.97}/docs/reference/config.md

@@ -97,7 +97,7 @@ per-file command.
 | Key | Required | Description |
 |---|---|---|
 | `ddl` | yes | A SQLite `CREATE TABLE` statement. The table name is parsed from it. Only columns declared here are populated; auto-injected facts not in the DDL are dropped. |
-| `glob` | yes | Glob pattern matched against root-relative paths. May contain `{name}` [capture segments](./columns.md#glob-captures). First matching table wins when a file matches several globs. |
+| `glob` | yes | Glob pattern matched against root-relative paths. May contain `{name}` [capture segments](./columns.md#glob-captures). Every table whose glob matches a file receives that file's rows — a file can populate multiple tables. |
 | `strict` | no (default `false`) | When `true`, rows whose keys do not exactly match the declared columns are rejected with an error: extra keys error, and every declared column must be supplied (by the command/extract output, a glob capture, or a stat column). When `false`, extra keys are dropped and missing columns become `NULL`. |
 | `on-file` | no | A command run once per matched file; its stdout (a JSON array of row objects) becomes the file's rows. Must be non-empty. See [Command hooks](./hooks.md#on-file). |
 
@@ -131,6 +131,38 @@ by the command wins over a same-named fact. Output that is not a JSON array
 of objects is a per-file failure: the file is skipped with a stderr warning
 and the scan continues (see [failure semantics](./hooks.md#failure-semantics)).
 
+## Composing multiple configs
+
+Pass [`-c`/`--config`](./cli.md#flags) more than once to compose several config
+files — a shared team config plus local overrides, or a plugin's config
+alongside your own:
+
+```bash
+dirsql -c ./.dirsql.toml -c ~/team/embeddings.toml -c ./local.toml
+```
+
+The configs load and merge in **argv order**:
+
+- **`[[table]]`, `ignore`, and `[[dirsql.extension]]` entries accumulate** across
+  all configs, in order.
+- **Each config's `on-file`, `pre-query`, and `post-query` hooks run from that
+  config file's own directory**, under that config's own
+  [`hook-timeout`](#dirsql-keys) — so a relative command like
+  `on-file = "sh ./extract.sh"` resolves against the config that declared it,
+  wherever it lives.
+- **`pre-query` / `post-query` hooks chain FIFO**: the request body flows through
+  each `pre-query` stage in order to the final SQL, and the result rows flow
+  through each `post-query` stage to the response. See the
+  [hook contract](./hooks.md).
+- Each config is **validated on its own** (the [parse errors](#parse-errors)
+  below apply per file). There is no cross-file merge validation, with one
+  structural exception: **two configs defining a table of the same name is an
+  error**, naming the table.
+
+The index [root](./cli.md#flags) is the invocation directory regardless of where
+any config lives. With no `-c`, `./.dirsql.toml` is used; a single `-c` behaves
+exactly as before.
+
 ## Parse errors
 
 Loading fails (the CLI enters [degraded mode](./cli.md#degraded-mode); the

{dirsql-0.3.95/packages/rust → dirsql-0.3.97}/docs/reference/sdk.md

@@ -318,7 +318,9 @@ Maps files to table rows.
 - `ddl` — A SQLite `CREATE TABLE` statement; the table name is parsed from
   it. Table names must be unique across all tables.
 - `glob` — Glob pattern matched against root-relative paths. May contain
-  `{name}` [captures](./columns.md#glob-captures).
+  `{name}` [captures](./columns.md#glob-captures). Every table whose glob
+  matches a file receives that file's rows — a file can populate multiple
+  tables.
 - `extract` — Callback receiving the matched file's full path (the root
   joined with the file's relative path — absolute when `root` is absolute)
   and returning the rows that file contributes. `dirsql` never reads file

{dirsql-0.3.95 → dirsql-0.3.97}/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.95"
+version = "0.3.97"
 # 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.95/packages/rust → dirsql-0.3.97/packages/python}/docs/howto/define-tables.md

@@ -42,9 +42,10 @@ zero-config default — only the tables you define are served.
 
 ## Multiple tables
 
-Add one `[[table]]` entry per table. When a file matches several globs, the
-first matching table wins — see [`[[table]]`](../reference/config.md#table)
-for that and the remaining keys (`strict`, `on-file`).
+Add one `[[table]]` entry per table. When a file matches several globs, it
+populates every matching table — each table is an independent view. See
+[`[[table]]`](../reference/config.md#table) for that and the remaining keys
+(`strict`, `on-file`).
 
 ## Going further
 

{dirsql-0.3.95 → dirsql-0.3.97/packages/python}/docs/reference/cli.md

@@ -45,7 +45,7 @@ requests, closes open `/events` streams, and exits.
 
 | Flag | Default | Description |
 |---|---|---|
-| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is always rooted at the **invocation directory** (the current working directory), regardless of where this file lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
+| `-c, --config <path>` | `./.dirsql.toml` | Path to a [config file](./config.md). **Repeatable** (`-c a -c b`): the configs load and merge in argv order — see [Composing multiple configs](./config.md#composing-multiple-configs). The index is always rooted at the **invocation directory** (the current working directory), regardless of where a config lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. With none given, `./.dirsql.toml` is used; when it does not exist, the server runs in [zero-config mode](#zero-config-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Global — also honored by [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |

{dirsql-0.3.95/packages/rust → dirsql-0.3.97/packages/python}/docs/reference/config.md

@@ -97,7 +97,7 @@ per-file command.
 | Key | Required | Description |
 |---|---|---|
 | `ddl` | yes | A SQLite `CREATE TABLE` statement. The table name is parsed from it. Only columns declared here are populated; auto-injected facts not in the DDL are dropped. |
-| `glob` | yes | Glob pattern matched against root-relative paths. May contain `{name}` [capture segments](./columns.md#glob-captures). First matching table wins when a file matches several globs. |
+| `glob` | yes | Glob pattern matched against root-relative paths. May contain `{name}` [capture segments](./columns.md#glob-captures). Every table whose glob matches a file receives that file's rows — a file can populate multiple tables. |
 | `strict` | no (default `false`) | When `true`, rows whose keys do not exactly match the declared columns are rejected with an error: extra keys error, and every declared column must be supplied (by the command/extract output, a glob capture, or a stat column). When `false`, extra keys are dropped and missing columns become `NULL`. |
 | `on-file` | no | A command run once per matched file; its stdout (a JSON array of row objects) becomes the file's rows. Must be non-empty. See [Command hooks](./hooks.md#on-file). |
 
@@ -131,6 +131,38 @@ by the command wins over a same-named fact. Output that is not a JSON array
 of objects is a per-file failure: the file is skipped with a stderr warning
 and the scan continues (see [failure semantics](./hooks.md#failure-semantics)).
 
+## Composing multiple configs
+
+Pass [`-c`/`--config`](./cli.md#flags) more than once to compose several config
+files — a shared team config plus local overrides, or a plugin's config
+alongside your own:
+
+```bash
+dirsql -c ./.dirsql.toml -c ~/team/embeddings.toml -c ./local.toml
+```
+
+The configs load and merge in **argv order**:
+
+- **`[[table]]`, `ignore`, and `[[dirsql.extension]]` entries accumulate** across
+  all configs, in order.
+- **Each config's `on-file`, `pre-query`, and `post-query` hooks run from that
+  config file's own directory**, under that config's own
+  [`hook-timeout`](#dirsql-keys) — so a relative command like
+  `on-file = "sh ./extract.sh"` resolves against the config that declared it,
+  wherever it lives.
+- **`pre-query` / `post-query` hooks chain FIFO**: the request body flows through
+  each `pre-query` stage in order to the final SQL, and the result rows flow
+  through each `post-query` stage to the response. See the
+  [hook contract](./hooks.md).
+- Each config is **validated on its own** (the [parse errors](#parse-errors)
+  below apply per file). There is no cross-file merge validation, with one
+  structural exception: **two configs defining a table of the same name is an
+  error**, naming the table.
+
+The index [root](./cli.md#flags) is the invocation directory regardless of where
+any config lives. With no `-c`, `./.dirsql.toml` is used; a single `-c` behaves
+exactly as before.
+
 ## Parse errors
 
 Loading fails (the CLI enters [degraded mode](./cli.md#degraded-mode); the

{dirsql-0.3.95 → dirsql-0.3.97/packages/python}/docs/reference/sdk.md

@@ -318,7 +318,9 @@ Maps files to table rows.
 - `ddl` — A SQLite `CREATE TABLE` statement; the table name is parsed from
   it. Table names must be unique across all tables.
 - `glob` — Glob pattern matched against root-relative paths. May contain
-  `{name}` [captures](./columns.md#glob-captures).
+  `{name}` [captures](./columns.md#glob-captures). Every table whose glob
+  matches a file receives that file's rows — a file can populate multiple
+  tables.
 - `extract` — Callback receiving the matched file's full path (the root
   joined with the file's relative path — absolute when `root` is absolute)
   and returning the rows that file contributes. `dirsql` never reads file

dirsql-0.3.97/packages/python/e2e-attestations/claude-github-issue-580-d0jd9u.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/ -x -q",
+  "ran_at": 1783944230,
+  "exit_code": 0,
+  "commit": "f6b1948a6d2de0b769ca428a802f52899f85c4b9",
+  "branch": "claude/github-issue-580-d0jd9u"
+}

dirsql-0.3.97/packages/python/e2e-attestations/claude-open-issues-review-le8hm5-red-547.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/ -x -q",
+  "ran_at": 1783946846,
+  "exit_code": 0,
+  "commit": "8b174e918f0319dc63df7931a20997ffec7cd132",
+  "branch": "claude/open-issues-review-le8hm5-red-547"
+}

{dirsql-0.3.95 → dirsql-0.3.97}/packages/rust/benches/matcher_bench.rs

@@ -20,7 +20,7 @@ fn make_test_paths(count: usize) -> Vec<String> {
 }
 
 fn bench_match_file(c: &mut Criterion) {
-    let mut group = c.benchmark_group("matcher/match_file");
+    let mut group = c.benchmark_group("matcher/match_all");
     for pattern_count in [1, 10, 50] {
         let matcher = make_matcher(pattern_count);
         let paths = make_test_paths(100);
@@ -30,7 +30,7 @@ fn bench_match_file(c: &mut Criterion) {
             |b, _| {
                 b.iter(|| {
                     for p in &paths {
-                        matcher.match_file(Path::new(p));
+                        matcher.match_all(Path::new(p));
                     }
                 });
             },

{dirsql-0.3.95 → dirsql-0.3.97/packages/rust}/docs/howto/define-tables.md

@@ -42,9 +42,10 @@ zero-config default — only the tables you define are served.
 
 ## Multiple tables
 
-Add one `[[table]]` entry per table. When a file matches several globs, the
-first matching table wins — see [`[[table]]`](../reference/config.md#table)
-for that and the remaining keys (`strict`, `on-file`).
+Add one `[[table]]` entry per table. When a file matches several globs, it
+populates every matching table — each table is an independent view. See
+[`[[table]]`](../reference/config.md#table) for that and the remaining keys
+(`strict`, `on-file`).
 
 ## Going further
 

{dirsql-0.3.95/packages/python → dirsql-0.3.97/packages/rust}/docs/reference/cli.md

@@ -45,7 +45,7 @@ requests, closes open `/events` streams, and exits.
 
 | Flag | Default | Description |
 |---|---|---|
-| `-c, --config <path>` | `./.dirsql.toml` | Path to the [config file](./config.md). The index is always rooted at the **invocation directory** (the current working directory), regardless of where this file lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. When the file does not exist, the server runs in [zero-config mode](#zero-config-mode). |
+| `-c, --config <path>` | `./.dirsql.toml` | Path to a [config file](./config.md). **Repeatable** (`-c a -c b`): the configs load and merge in argv order — see [Composing multiple configs](./config.md#composing-multiple-configs). The index is always rooted at the **invocation directory** (the current working directory), regardless of where a config lives — so `--config /elsewhere/.dirsql.toml` still indexes the directory you ran `dirsql` from. With none given, `./.dirsql.toml` is used; when it does not exist, the server runs in [zero-config mode](#zero-config-mode). |
 | `--host <addr>` | `localhost` | Bind address. |
 | `--port <n>` | `7117` | TCP port to bind. |
 | `--persist [<path>]` | off | Keep the SQLite index on disk between runs so a restart only re-parses files that actually changed. Bare `--persist` caches at `<root>/.dirsql/cache.db`; `--persist <path>` caches at `<path>`. Off by default (the index is ephemeral). Global — also honored by [`dirsql query`](#dirsql-query). See [Keep the index across restarts](../howto/persist.md). |

{dirsql-0.3.95/packages/python → dirsql-0.3.97/packages/rust}/docs/reference/config.md

@@ -97,7 +97,7 @@ per-file command.
 | Key | Required | Description |
 |---|---|---|
 | `ddl` | yes | A SQLite `CREATE TABLE` statement. The table name is parsed from it. Only columns declared here are populated; auto-injected facts not in the DDL are dropped. |
-| `glob` | yes | Glob pattern matched against root-relative paths. May contain `{name}` [capture segments](./columns.md#glob-captures). First matching table wins when a file matches several globs. |
+| `glob` | yes | Glob pattern matched against root-relative paths. May contain `{name}` [capture segments](./columns.md#glob-captures). Every table whose glob matches a file receives that file's rows — a file can populate multiple tables. |
 | `strict` | no (default `false`) | When `true`, rows whose keys do not exactly match the declared columns are rejected with an error: extra keys error, and every declared column must be supplied (by the command/extract output, a glob capture, or a stat column). When `false`, extra keys are dropped and missing columns become `NULL`. |
 | `on-file` | no | A command run once per matched file; its stdout (a JSON array of row objects) becomes the file's rows. Must be non-empty. See [Command hooks](./hooks.md#on-file). |
 
@@ -131,6 +131,38 @@ by the command wins over a same-named fact. Output that is not a JSON array
 of objects is a per-file failure: the file is skipped with a stderr warning
 and the scan continues (see [failure semantics](./hooks.md#failure-semantics)).
 
+## Composing multiple configs
+
+Pass [`-c`/`--config`](./cli.md#flags) more than once to compose several config
+files — a shared team config plus local overrides, or a plugin's config
+alongside your own:
+
+```bash
+dirsql -c ./.dirsql.toml -c ~/team/embeddings.toml -c ./local.toml
+```
+
+The configs load and merge in **argv order**:
+
+- **`[[table]]`, `ignore`, and `[[dirsql.extension]]` entries accumulate** across
+  all configs, in order.
+- **Each config's `on-file`, `pre-query`, and `post-query` hooks run from that
+  config file's own directory**, under that config's own
+  [`hook-timeout`](#dirsql-keys) — so a relative command like
+  `on-file = "sh ./extract.sh"` resolves against the config that declared it,
+  wherever it lives.
+- **`pre-query` / `post-query` hooks chain FIFO**: the request body flows through
+  each `pre-query` stage in order to the final SQL, and the result rows flow
+  through each `post-query` stage to the response. See the
+  [hook contract](./hooks.md).
+- Each config is **validated on its own** (the [parse errors](#parse-errors)
+  below apply per file). There is no cross-file merge validation, with one
+  structural exception: **two configs defining a table of the same name is an
+  error**, naming the table.
+
+The index [root](./cli.md#flags) is the invocation directory regardless of where
+any config lives. With no `-c`, `./.dirsql.toml` is used; a single `-c` behaves
+exactly as before.
+
 ## Parse errors
 
 Loading fails (the CLI enters [degraded mode](./cli.md#degraded-mode); the

{dirsql-0.3.95/packages/python → dirsql-0.3.97/packages/rust}/docs/reference/sdk.md

@@ -318,7 +318,9 @@ Maps files to table rows.
 - `ddl` — A SQLite `CREATE TABLE` statement; the table name is parsed from
   it. Table names must be unique across all tables.
 - `glob` — Glob pattern matched against root-relative paths. May contain
-  `{name}` [captures](./columns.md#glob-captures).
+  `{name}` [captures](./columns.md#glob-captures). Every table whose glob
+  matches a file receives that file's rows — a file can populate multiple
+  tables.
 - `extract` — Callback receiving the matched file's full path (the root
   joined with the file's relative path — absolute when `root` is absolute)
   and returning the rows that file contributes. `dirsql` never reads file

{dirsql-0.3.95 → dirsql-0.3.97}/packages/rust/src/bin/dirsql.rs

@@ -33,12 +33,15 @@ struct Cli {
     #[command(subcommand)]
     command: Option<Command>,
 
-    /// Path to the config file (default: `./.dirsql.toml`). The index is
-    /// rooted at the invocation directory (cwd), not this file's location
-    /// (#540). When the file does not exist, a default `files` table is
-    /// served. Used by server mode and by the `query` subcommand.
-    #[arg(short = 'c', long, default_value = "./.dirsql.toml", global = true)]
-    config: PathBuf,
+    /// Path to a config file. **Repeatable** (`-c a -c b`): the configs load
+    /// and merge in argv order -- their `[[table]]`, `ignore`, and
+    /// `[[dirsql.extension]]` entries accumulate, and their `pre-query` /
+    /// `post-query` hooks chain FIFO. With none given, `./.dirsql.toml` is used;
+    /// when that file does not exist, a default `files` table is served. The
+    /// index is rooted at the invocation directory (cwd), not a config's
+    /// location (#540). Used by server mode and by the `query` subcommand.
+    #[arg(short = 'c', long, global = true)]
+    config: Vec<PathBuf>,
 
     /// Bind address. Used when no subcommand is given.
     #[arg(long, default_value = "localhost")]
@@ -80,6 +83,16 @@ impl Cli {
         }
         builder
     }
+
+    /// The effective config paths: those passed via `-c`/`--config`, or the
+    /// single default `./.dirsql.toml` when none were given.
+    fn config_paths(&self) -> Vec<PathBuf> {
+        if self.config.is_empty() {
+            vec![PathBuf::from("./.dirsql.toml")]
+        } else {
+            self.config.clone()
+        }
+    }
 }
 
 #[derive(Debug, Subcommand)]
@@ -138,8 +151,8 @@ async fn main() -> ExitCode {
 /// stderr with a non-zero exit.
 async fn run_query(cli: &Cli, args: QueryArgs) -> ExitCode {
     let state = load_state(cli);
-    let pre_query: Vec<PreQuery> = load_pre_query(cli).into_iter().collect();
-    let post_query: Vec<PostQuery> = load_post_query(cli).into_iter().collect();
+    let pre_query = load_pre_queries(cli);
+    let post_query = load_post_queries(cli);
     // Same default the server binds with; the pipeline enforces it.
     let timeout = ServerConfig::default().query_timeout;
 
@@ -200,10 +213,10 @@ fn run_init(args: InitArgs) -> ExitCode {
 async fn run_server(cli: Cli) -> ExitCode {
     let state = load_state(&cli);
     let mut server_config = ServerConfig::bind(cli.host.clone(), cli.port);
-    if let Some(pre_query) = load_pre_query(&cli) {
+    for pre_query in load_pre_queries(&cli) {
         server_config = server_config.with_pre_query(pre_query);
     }
-    if let Some(post_query) = load_post_query(&cli) {
+    for post_query in load_post_queries(&cli) {
         server_config = server_config.with_post_query(post_query);
     }
 
@@ -231,33 +244,38 @@ async fn run_server(cli: Cli) -> ExitCode {
 }
 
 fn load_state(cli: &Cli) -> AppState {
-    let config_path = &cli.config;
-    if !config_path.exists() {
-        // No config: serve a default `files` table so dirsql is queryable
-        // out of the box. A config file, when present, fully overrules this.
-        return load_default_state(cli, config_path);
+    let configs = cli.config_paths();
+
+    // Zero-config default: no `-c` was given and the implicit `./.dirsql.toml`
+    // is absent -> serve a default `files` table so dirsql is queryable out of
+    // the box. An explicitly-passed config that is missing degrades below.
+    if cli.config.is_empty() && !configs[0].exists() {
+        return load_default_state(cli, &configs[0]);
     }
 
-    // Canonicalize so config-relative paths (extension libraries, hook
-    // working directories) resolve against an absolute parent — `notify` and
-    // the hook subprocesses misbehave with relative paths like `./`. The
-    // index root itself is the invocation cwd (#540), not derived from here.
-    let resolved = match config_path.canonicalize() {
-        Ok(p) => p,
-        Err(err) => {
-            return AppState::Unavailable(format!(
-                "failed to resolve {}: {err}",
-                config_path.display()
-            ));
-        }
-    };
+    let mut builder = DirSQL::builder();
+    for config_path in &configs {
+        // Canonicalize so config-relative paths (extension libraries, hook
+        // working directories) resolve against an absolute parent — `notify`
+        // and the hook subprocesses misbehave with relative paths like `./`.
+        // The index root itself is the invocation cwd (#540), not derived here.
+        let resolved = match config_path.canonicalize() {
+            Ok(p) => p,
+            Err(err) => {
+                return AppState::Unavailable(format!(
+                    "failed to resolve {}: {err}",
+                    config_path.display()
+                ));
+            }
+        };
+        builder = builder.config(resolved);
+    }
 
-    // Launcher-resolved extensions (`--extension`) override the TOML config's
-    // own `[[dirsql.extension]]` entries: the launcher has already merged and
+    // Launcher-resolved extensions (`--extension`) override the configs' own
+    // `[[dirsql.extension]]` entries: the launcher has already merged and
     // resolved them (including package names the compiled binary can't
-    // resolve), so suppress the config's extension loading and supply the
-    // resolved literal paths instead.
-    let mut builder = DirSQL::builder().config(&resolved);
+    // resolve), so suppress config extension loading and supply the resolved
+    // literal paths instead.
     if !cli.extension.is_empty() {
         builder = builder
             .extensions(parse_extension_specs(&cli.extension))
@@ -290,51 +308,70 @@ fn parse_extension_specs(specs: &[String]) -> Vec<Extension> {
         .collect()
 }
 
-/// Extract the server-wide `pre-query` hook from the config, if any.
+/// Collect the `pre-query` hooks declared across the configs, in argv order,
+/// so the server chains them FIFO (#546/#547).
 ///
-/// Returns `None` when the config is absent, unresolvable, unparsable, or
-/// declares no `pre-query` — the server then parses `POST /query` bodies as
-/// `{"sql": …}` (the degraded / zero-config paths never get a hook). The
-/// command's working directory is the config file's parent, mirroring the
-/// `on-file` contract. Config resolution mirrors [`load_state`]: a config that
-/// fails here also fails there (leaving the server degraded), so the hook is
-/// simply skipped.
-fn load_pre_query(cli: &Cli) -> Option<PreQuery> {
-    let config_path = &cli.config;
-    if !config_path.exists() {
-        return None;
-    }
-    let resolved = config_path.canonicalize().ok()?;
-    let config = dirsql::config::load_config(&resolved).ok()?;
-    let command = config.pre_query?;
-    let config_dir = resolved.parent()?.to_path_buf();
-    let mut pre_query = PreQuery::new(command, config_dir);
-    if let Some(timeout) = config.hook_timeout {
-        pre_query = pre_query.with_timeout(timeout);
+/// Each config contributes at most one `pre-query`; a config that is absent,
+/// unresolvable, unparsable, or declares none is skipped (its load failure
+/// degrades the index in [`load_state`], so the hook is simply omitted here).
+/// Each hook's working directory is its own config file's parent, mirroring
+/// the `on-file` contract, and it carries that config's `hook-timeout`.
+fn load_pre_queries(cli: &Cli) -> Vec<PreQuery> {
+    let mut hooks = Vec::new();
+    for config_path in &cli.config_paths() {
+        if !config_path.exists() {
+            continue;
+        }
+        let Ok(resolved) = config_path.canonicalize() else {
+            continue;
+        };
+        let Ok(config) = dirsql::config::load_config(&resolved) else {
+            continue;
+        };
+        let Some(command) = config.pre_query else {
+            continue;
+        };
+        let Some(parent) = resolved.parent() else {
+            continue;
+        };
+        let mut pre_query = PreQuery::new(command, parent.to_path_buf());
+        if let Some(timeout) = config.hook_timeout {
+            pre_query = pre_query.with_timeout(timeout);
+        }
+        hooks.push(pre_query);
     }
-    Some(pre_query)
+    hooks
 }
 
-/// Extract the server-wide `post-query` hook from the config, if any.
-///
-/// Returns `None` when the config is absent, unresolvable, unparsable, or
-/// declares no `post-query` — the server then returns `POST /query` result rows
-/// as-is (the degraded / zero-config paths never get a hook). The command's
-/// working directory is the config file's parent, mirroring [`load_pre_query`].
-fn load_post_query(cli: &Cli) -> Option<PostQuery> {
-    let config_path = &cli.config;
-    if !config_path.exists() {
-        return None;
-    }
-    let resolved = config_path.canonicalize().ok()?;
-    let config = dirsql::config::load_config(&resolved).ok()?;
-    let command = config.post_query?;
-    let config_dir = resolved.parent()?.to_path_buf();
-    let mut post_query = PostQuery::new(command, config_dir);
-    if let Some(timeout) = config.hook_timeout {
-        post_query = post_query.with_timeout(timeout);
+/// Collect the `post-query` hooks declared across the configs, in argv order,
+/// so the server chains them FIFO. Mirrors [`load_pre_queries`]: one hook per
+/// config, skipped when absent/unloadable, each running from its own config's
+/// parent under its own `hook-timeout`.
+fn load_post_queries(cli: &Cli) -> Vec<PostQuery> {
+    let mut hooks = Vec::new();
+    for config_path in &cli.config_paths() {
+        if !config_path.exists() {
+            continue;
+        }
+        let Ok(resolved) = config_path.canonicalize() else {
+            continue;
+        };
+        let Ok(config) = dirsql::config::load_config(&resolved) else {
+            continue;
+        };
+        let Some(command) = config.post_query else {
+            continue;
+        };
+        let Some(parent) = resolved.parent() else {
+            continue;
+        };
+        let mut post_query = PostQuery::new(command, parent.to_path_buf());
+        if let Some(timeout) = config.hook_timeout {
+            post_query = post_query.with_timeout(timeout);
+        }
+        hooks.push(post_query);
     }
-    Some(post_query)
+    hooks
 }
 
 /// Zero-config fallback. When no `.dirsql.toml` is found, dirsql indexes the