The PRD's first acceptance gate now holds: grep -RinE '\bx\.ai\b|grok' crates/ --include='*.rs' → 0 matches (exempt: NOTICE and third-party license archives, README provenance, and the required 'Based on Grok Build Open Source' attribution, now sourced from version_attribution.txt). Wire-visible renames (both sides in this repo, changed in lockstep): - Auth method id 'grok.com' → 'kimi-code' (AuthMethodKind::KimiCode). - Every x.ai/* and _x.ai/* ACP ext method and meta key → kigi/* / _kigi/* (~200 names; grokShell → kigiShell). Session-file replay keeps a read-side alias for the legacy '_x.ai/session/update' method so existing updates.jsonl histories load; writes emit only the new name (both directions test-pinned). - Agent types grok-build* → kigi* with a documented legacy-prefix alias at resolution time so persisted sessions keep resolving. - ToolNamespace/BuiltinAgentName GrokBuild* → Kigi* (wire snake_case kigi/kigi_concise/kigi_hashline; schema regenerated); grok_build implementation dirs renamed to kigi*. - x-grok-* headers → x-kigi-*, __GROK_* sentinels → __KIGI_*, themes grokday/groknight → kigiday/kiginight (old persisted values fall back to the default theme), web_fetch allowlist xAI hosts → kimi.com + moonshot platforms, changelog CDN → this repo, grok-build changelog archives deleted. - BYOK default endpoint removed: [endpoints] api_base_url is now truly optional with NO default — consumers fail fast with the flag name when unset (no silent x.ai egress). Mock harnesses inject it explicitly. - System-prompt identity fixed: 'released by xAI' → 'an unofficial community CLI for Kimi' (template + regenerated encrypted form). Also repaired pre-existing grok-era test debt found by the sweep: the stale trace_classify default-model pin, the grok-pager UA label test, pty-harness stale-binary reuse and non-hermetic moonshot routing (a PTY test could previously reach the real api.moonshot.cn), and the outdated oauth fixture scope key. Gates: §9 grep 0; fmt clean; workspace check/clippy 0/0 (-D warnings); FULL cargo test --workspace: 234 suites, 21,961 passed, 0 failed; deny advisories ok.
197 lines
6.9 KiB
Rust
197 lines
6.9 KiB
Rust
use kigi_tools::types::{claude_names_for, kigi_names_for};
|
|
use regex::Regex;
|
|
|
|
/// A compiled hook matcher for tool names. The pattern semantics are chosen so that
|
|
/// `matcher` entries in hooks migrated from other agent CLIs keep firing unchanged:
|
|
///
|
|
/// - an empty pattern or `"*"` matches every tool;
|
|
/// - a "simple" pattern (only `[A-Za-z0-9_|]`, i.e. a plain name or `|`-list) is an
|
|
/// **exact** match against each name (after external→Kigi alias expansion), NOT a regex;
|
|
/// - anything else is an **unanchored** regex (also tested against the tool's external
|
|
/// alias names, so e.g. `^Bash$` matches the Kigi tool `run_terminal_command`).
|
|
///
|
|
/// The simple-vs-regex split is deliberate: it avoids anchoring a `|`-alternation (a
|
|
/// naive `^a|b|c$` anchors only the first/last term and silently over-matches). Whitespace
|
|
/// is significant (not trimmed): `" "` is a regex that matches nothing.
|
|
#[derive(Debug, Clone)]
|
|
pub struct HookMatcher {
|
|
kind: MatcherKind,
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
enum MatcherKind {
|
|
All,
|
|
Exact(Vec<String>),
|
|
Regex(Regex),
|
|
}
|
|
|
|
impl HookMatcher {
|
|
/// Compile a matcher from a user pattern. Errors only when a regex-form pattern is
|
|
/// itself invalid regex (simple/empty/`*` forms never error).
|
|
pub fn new(pattern: &str) -> Result<Self, regex::Error> {
|
|
let kind = if pattern.is_empty() || pattern == "*" {
|
|
MatcherKind::All
|
|
} else if is_simple_form(pattern) {
|
|
MatcherKind::Exact(exact_names(pattern))
|
|
} else {
|
|
MatcherKind::Regex(Regex::new(pattern)?)
|
|
};
|
|
Ok(Self { kind })
|
|
}
|
|
|
|
pub fn is_match(&self, tool_name: &str) -> bool {
|
|
match &self.kind {
|
|
MatcherKind::All => true,
|
|
MatcherKind::Exact(names) => names.iter().any(|n| n == tool_name),
|
|
MatcherKind::Regex(regex) => {
|
|
regex.is_match(tool_name)
|
|
|| claude_names_for(tool_name).any(|alias| regex.is_match(alias))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A pattern is "simple" (exact/`|`-list, not regex) when it contains only
|
|
/// ASCII alphanumerics, `_`, and `|`.
|
|
fn is_simple_form(pattern: &str) -> bool {
|
|
!pattern.is_empty()
|
|
&& pattern
|
|
.bytes()
|
|
.all(|b| b.is_ascii_alphanumeric() || b == b'_' || b == b'|')
|
|
}
|
|
|
|
/// Expand a simple-form pattern into the exact set of names it matches: each `|`-term
|
|
/// plus any Kigi tool names that term aliases (so `"Bash"` also matches
|
|
/// `run_terminal_command`), per the shared external-name to Kigi registry in
|
|
/// `kigi-tools`. Empty terms and duplicates are dropped.
|
|
fn exact_names(pattern: &str) -> Vec<String> {
|
|
let mut names: Vec<String> = Vec::new();
|
|
let mut push = |name: &str| {
|
|
if !name.is_empty() && !names.iter().any(|n| n == name) {
|
|
names.push(name.to_string());
|
|
}
|
|
};
|
|
for term in pattern.split('|') {
|
|
push(term);
|
|
for kigi_name in kigi_names_for(term) {
|
|
push(kigi_name);
|
|
}
|
|
}
|
|
names
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn exact_match() {
|
|
let m = HookMatcher::new("run_terminal_command").unwrap();
|
|
assert!(m.is_match("run_terminal_command"));
|
|
assert!(!m.is_match("run_terminal_command_v2"));
|
|
assert!(!m.is_match("other_tool"));
|
|
}
|
|
|
|
#[test]
|
|
fn pipe_list_is_exact_per_term() {
|
|
let m = HookMatcher::new("read_file|list_dir").unwrap();
|
|
assert!(m.is_match("read_file"));
|
|
assert!(m.is_match("list_dir"));
|
|
assert!(!m.is_match("grep"));
|
|
// Regression for the old `^a|b$` anchoring bug: terms must not substring-match.
|
|
assert!(!m.is_match("my_read_file"));
|
|
assert!(!m.is_match("list_dir_v2"));
|
|
}
|
|
|
|
#[test]
|
|
fn pipe_skips_empty_terms() {
|
|
// Leading/trailing/double pipes contribute no spurious empty-string match.
|
|
let m = HookMatcher::new("|read_file||grep|").unwrap();
|
|
assert!(m.is_match("read_file"));
|
|
assert!(m.is_match("grep"));
|
|
assert!(!m.is_match(""));
|
|
}
|
|
|
|
#[test]
|
|
fn regex_form_is_unanchored() {
|
|
// Contains regex metachars -> regex mode, unanchored.
|
|
let m = HookMatcher::new("run_.*").unwrap();
|
|
assert!(m.is_match("run_terminal_command"));
|
|
assert!(m.is_match("xrun_yyy")); // unanchored: substring match
|
|
assert!(!m.is_match("read_file"));
|
|
}
|
|
|
|
#[test]
|
|
fn anchored_regex_respects_user_anchors() {
|
|
let m = HookMatcher::new("^run_.*$").unwrap();
|
|
assert!(m.is_match("run_terminal_command"));
|
|
assert!(!m.is_match("xrun_yyy"));
|
|
assert!(!m.is_match("read_file"));
|
|
}
|
|
|
|
#[test]
|
|
fn invalid_regex_errors() {
|
|
assert!(HookMatcher::new("[invalid").is_err());
|
|
}
|
|
|
|
#[test]
|
|
fn star_and_empty_match_all() {
|
|
for pat in ["*", ""] {
|
|
let m = HookMatcher::new(pat).unwrap();
|
|
assert!(m.is_match("read_file"), "{pat:?} should match all");
|
|
assert!(m.is_match("anything_at_all"), "{pat:?} should match all");
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn whitespace_matcher_matches_nothing() {
|
|
// Whitespace is NOT trimmed; `" "` is a regex that matches no
|
|
// real tool name (NOT match-all, which would turn a deny gate into deny-all).
|
|
let m = HookMatcher::new(" ").unwrap();
|
|
assert!(!m.is_match("read_file"));
|
|
assert!(!m.is_match("run_terminal_command"));
|
|
}
|
|
|
|
// ── External tool-name aliases ────────────────────────────────
|
|
|
|
#[test]
|
|
fn claude_bash_matches_kigi_tool() {
|
|
let m = HookMatcher::new("Bash").unwrap();
|
|
assert!(m.is_match("Bash")); // external alias name
|
|
assert!(m.is_match("run_terminal_command")); // Kigi name
|
|
assert!(!m.is_match("read_file"));
|
|
// Bug-fix regression: exact, not prefix.
|
|
assert!(!m.is_match("run_terminal_command_v2"));
|
|
}
|
|
|
|
#[test]
|
|
fn claude_edit_write_matches_kigi_tool_exactly() {
|
|
let m = HookMatcher::new("Edit|Write").unwrap();
|
|
assert!(m.is_match("Edit"));
|
|
assert!(m.is_match("Write"));
|
|
assert!(m.is_match("search_replace")); // Kigi equivalent
|
|
assert!(m.is_match("hashline_edit")); // second Kigi alias
|
|
assert!(!m.is_match("read_file"));
|
|
// The old anchoring bug matched these; the exact-list mode must not.
|
|
assert!(!m.is_match("Editorial"));
|
|
assert!(!m.is_match("my_search_replace"));
|
|
}
|
|
|
|
#[test]
|
|
fn claude_read_matches_kigi_tool() {
|
|
let m = HookMatcher::new("Read").unwrap();
|
|
assert!(m.is_match("Read"));
|
|
assert!(m.is_match("read_file"));
|
|
assert!(m.is_match("hashline_read"));
|
|
}
|
|
|
|
#[test]
|
|
fn regex_against_claude_alias_matches_kigi_tool() {
|
|
// A regex written against an external alias still matches the Kigi tool
|
|
// (legacy alias-name expansion).
|
|
let m = HookMatcher::new("^Bash$").unwrap();
|
|
assert!(m.is_match("run_terminal_command"));
|
|
assert!(m.is_match("Bash"));
|
|
}
|
|
}
|