1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
//! Configuration loading for ix.
//!
//! The daemon discovers `.ixd.toml` files to scope its watch and index
//! behaviour. Each config file specifies which subdirectories to watch
//! and which patterns to exclude.
use crate::Builder;
use serde::{Deserialize, Serialize};
use std::path::{Path, PathBuf};
/// ix runtime configuration, loaded from `.ixd.toml`.
/// Nested `[watch]` table for backward-compatibility with alternative `.ixd.toml` styles.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
pub struct WatchSection {
/// Subdirectory paths to watch.
#[serde(default)]
pub paths: Vec<PathBuf>,
/// Debounce interval in milliseconds.
#[serde(default)]
pub debounce_ms: Option<u64>,
/// Ignore patterns specified in `[watch]` table.
#[serde(default)]
pub ignore: Vec<String>,
/// Exclude patterns specified in `[watch]` table.
#[serde(default)]
pub exclude_patterns: Vec<String>,
}
/// Nested `[build]` table for backward-compatibility with alternative `.ixd.toml` styles.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
pub struct BuildSection {
/// Exclude patterns specified in `[build]` table.
#[serde(default)]
pub exclude_patterns: Vec<String>,
/// Ignore patterns specified in `[build]` table.
#[serde(default)]
pub ignore: Vec<String>,
}
/// ix runtime configuration, loaded from `.ixd.toml`.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct Config {
/// Root directories to watch for indexing.
#[serde(default)]
pub watch_roots: Vec<PathBuf>,
/// Glob patterns for paths to exclude from indexing.
#[serde(default)]
pub exclude_patterns: Vec<String>,
/// Debounce interval in milliseconds for file-watch events.
///
/// Minimum 50 ms, maximum 10000 ms (clamped by [`crate::watcher::Watcher::with_debounce`]).
/// `None` uses the default (500 ms).
///
/// # Merged-config precedence
///
/// When [`discover_under`](Self::discover_under) merges multiple `.ixd.toml`
/// files, the **root-level** `debounce_ms` takes precedence over subdirectory
/// configs. Subdirectory `debounce_ms` values are ignored to avoid conflicting
/// timer strategies within a single daemon instance. If you need different
/// debounce intervals per watched subtree, run separate `ixd` instances.
#[serde(default)]
pub debounce_ms: Option<u64>,
/// Deprecated `[watch]` table for backward compatibility.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub watch: Option<WatchSection>,
/// Deprecated `[build]` table for backward compatibility.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub build: Option<BuildSection>,
}
impl Default for Config {
fn default() -> Self {
Self {
watch_roots: Vec::new(),
// Default exclude patterns for the `.ixd.toml` daemon config.
// The daemon (daemon.rs) reads these and bridges them to both
// Builder (via with_exclude_patterns) and Watcher (via Watcher::new).
// See also: src/lib/builder.rs:226, src/lib/watcher.rs:40
exclude_patterns: vec![
".codegraph".to_string(),
".git".to_string(),
"node_modules".to_string(),
"target".to_string(),
],
debounce_ms: None,
watch: None,
build: None,
}
}
}
impl Config {
/// Load configuration from a `.ixd.toml` file at the given path.
///
/// # Errors
///
/// Returns an error if the file cannot be read or parsed.
pub fn load(path: &Path) -> crate::error::Result<Self> {
let content = std::fs::read_to_string(path).map_err(|e| {
crate::error::Error::Config(format!("cannot read config file {}: {e}", path.display()))
})?;
let mut cfg: Self = toml::from_str(&content).map_err(|e| {
crate::error::Error::Config(format!("cannot parse config file {}: {e}", path.display()))
})?;
cfg.normalize_and_warn(path);
Ok(cfg)
}
/// Normalize legacy nested `[watch]` and `[build]` tables into flat fields,
/// emitting a deprecation warning if nested tables are present.
fn normalize_and_warn(&mut self, path: &Path) {
let has_nested = self.watch.is_some() || self.build.is_some();
if has_nested {
tracing::warn!(
"deprecated .ixd.toml format in {}: [watch]/[build] tables should be migrated to flat keys (see docs/.ixd.toml.md)",
path.display()
);
}
if let Some(ref w) = self.watch {
if self.watch_roots.is_empty() {
self.watch_roots.clone_from(&w.paths);
} else {
self.watch_roots.extend(w.paths.clone());
}
if self.debounce_ms.is_none() && w.debounce_ms.is_some() {
self.debounce_ms = w.debounce_ms;
}
self.exclude_patterns.extend(w.ignore.clone());
self.exclude_patterns.extend(w.exclude_patterns.clone());
}
if let Some(ref b) = self.build {
self.exclude_patterns.extend(b.exclude_patterns.clone());
self.exclude_patterns.extend(b.ignore.clone());
}
// Deduplicate
self.watch_roots.sort();
self.watch_roots.dedup();
self.exclude_patterns.sort();
self.exclude_patterns.dedup();
}
/// Discover `.ixd.toml` files under the given root directory by
/// walking up to two levels deep.
///
/// Returns the **merged** configuration: `exclude_patterns` from
/// the root-level config are applied globally; `watch_roots` from
/// each discovered file scope the daemon to those subdirectories.
///
/// # Errors
///
/// Returns an error only if a discovered file cannot be parsed.
/// Missing or absent config files are silently skipped.
pub fn discover_under(root: &Path) -> crate::error::Result<Self> {
let root_config_path = root.join(".ixd.toml");
let mut merged = if root_config_path.exists() {
// Resolve root-level `watch_roots` against `root`. The Builder and
// Watcher compare absolute file paths with `Path::starts_with`, so a
// relative entry (e.g. `watch_roots = ["src"]`) would never match and
// every file would be filtered out, yielding an empty index (audit D1).
let mut cfg = Self::load(&root_config_path)?;
cfg.watch_roots = cfg
.watch_roots
.into_iter()
.map(|wr| if wr.is_absolute() { wr } else { root.join(wr) })
.collect();
cfg
} else {
Self::default()
};
// Walk one level of subdirectories looking for `.ixd.toml`
if let Ok(entries) = std::fs::read_dir(root) {
for entry in entries.flatten() {
let sub_path = entry.path();
if sub_path.is_dir() {
let config_path = sub_path.join(".ixd.toml");
if config_path.exists()
&& let Ok(mut sub_config) = Self::load(&config_path)
{
if !sub_config.watch_roots.is_empty() {
// Resolve subdir `watch_roots` against the subdir (not
// the root) so they survive the absolute-path match
// in Builder/Watcher (audit D1).
sub_config.watch_roots = sub_config
.watch_roots
.into_iter()
.map(|wr| {
if wr.is_absolute() {
wr
} else {
sub_path.join(wr)
}
})
.collect();
merged.watch_roots.extend(sub_config.watch_roots);
}
merged
.exclude_patterns
.extend(sub_config.exclude_patterns.clone());
}
}
}
}
// Deduplicate
merged.watch_roots.sort();
merged.watch_roots.dedup();
merged.exclude_patterns.sort();
merged.exclude_patterns.dedup();
Ok(merged)
}
/// Apply this configuration's `exclude_patterns` and `watch_roots`
/// to a [`Builder`], returning the configured builder.
///
/// This is the single source of truth for wiring config → builder,
/// used by both the CLI (`ix --build`) and the daemon (`ixd`).
/// Ensures `--build` and the daemon scope identically (audit F2).
#[must_use]
pub fn apply_to_builder(&self, mut builder: Builder) -> Builder {
if !self.exclude_patterns.is_empty() {
builder = builder.with_exclude_patterns(self.exclude_patterns.clone());
}
if !self.watch_roots.is_empty() {
builder = builder.with_watch_roots(self.watch_roots.clone());
}
builder
}
}
#[cfg(test)]
#[allow(clippy::unwrap_used)]
mod tests {
use super::*;
#[test]
fn test_config_default() {
let config = Config::default();
assert_eq!(
config,
Config {
watch_roots: Vec::new(),
exclude_patterns: vec![
".codegraph".to_string(),
".git".to_string(),
"node_modules".to_string(),
"target".to_string(),
],
debounce_ms: None,
watch: None,
build: None,
}
);
}
#[test]
fn test_discover_under_resolves_relative_watch_roots() {
// Regression for audit D1: `watch_roots = ["src", "test"]` are written
// relative to the search root. `discover_under` must resolve them to
// absolute paths, otherwise `Builder`/`Watcher` (which compare absolute
// paths with `Path::starts_with`) never match and the index ends up
// empty.
let base = std::env::temp_dir().join(format!("ix_cfg_test_{}", std::process::id()));
let _ = std::fs::create_dir_all(&base);
std::fs::write(
base.join(".ixd.toml"),
"watch_roots = [\"src\", \"test\"]\nexclude_patterns = [\".git\"]\n",
)
.unwrap();
let cfg = Config::discover_under(&base).unwrap();
assert_eq!(cfg.watch_roots.len(), 2);
for wr in &cfg.watch_roots {
assert!(wr.is_absolute(), "watch_root {wr:?} must be absolute");
assert!(
wr.starts_with(&base),
"watch_root {wr:?} must be under the search root"
);
}
assert!(cfg.watch_roots.contains(&base.join("src")));
assert!(cfg.watch_roots.contains(&base.join("test")));
let _ = std::fs::remove_dir_all(&base);
}
#[test]
fn test_config_nested_table_compatibility() {
let toml_str = r#"
[watch]
debounce_ms = 50
paths = ["src/", "tests/"]
ignore = ["*.pyc", "__pycache__", ".git"]
[build]
exclude_patterns = ["build/", "dist/"]
"#;
let mut config: Config = toml::from_str(toml_str).unwrap();
config.normalize_and_warn(Path::new(".ixd.toml"));
assert_eq!(config.debounce_ms, Some(50));
assert_eq!(
config.watch_roots,
vec![PathBuf::from("src/"), PathBuf::from("tests/")]
);
assert_eq!(
config.exclude_patterns,
vec![
"*.pyc".to_string(),
".git".to_string(),
"__pycache__".to_string(),
"build/".to_string(),
"dist/".to_string(),
]
);
}
}