mirror of
https://github.com/hanzoai/dev.git
synced 2026-11-21 14:22:49 +00:00
Wholesale-adopt latest upstream codex-rs (97 crates, new architecture: model-provider-info crate, app-server-daemon/transport, code-mode-host, thread-store, file-watcher, etc.). Hanzo-only crates (browser, debug-client, instructions, tui2) preserved on disk (not yet re-added to workspace). Builds clean as upstream (codex bin). Hanzo overlay (dev bin, api.hanzo.ai default, hanzo.id/Claude login, branding) re-applied in following commits. Co-authored-by: Hanzo Dev <[email protected]>
27 lines
819 B
Rust
27 lines
819 B
Rust
//! Requirements rules are additive across layers. Higher-priority rules are
|
|
//! appended first so the final rule order keeps priority visible.
|
|
|
|
use crate::RequirementSource;
|
|
use crate::RequirementsExecPolicyToml;
|
|
use crate::Sourced;
|
|
|
|
use super::stack::merge_output_source;
|
|
|
|
pub(super) fn merge(
|
|
target: &mut Option<Sourced<RequirementsExecPolicyToml>>,
|
|
incoming: Option<RequirementsExecPolicyToml>,
|
|
source: &RequirementSource,
|
|
) {
|
|
let Some(incoming) = incoming else {
|
|
return;
|
|
};
|
|
let Some(existing) = target.as_mut() else {
|
|
*target = Some(Sourced::new(incoming, source.clone()));
|
|
return;
|
|
};
|
|
|
|
let RequirementsExecPolicyToml { prefix_rules } = incoming;
|
|
existing.value.prefix_rules.extend(prefix_rules);
|
|
merge_output_source(&mut existing.source, source);
|
|
}
|