M0: compilable skeleton — Kigi 0.1.0 fork surgery
Hard fork of xai-org/grok-build (Apache-2.0) re-targeted as Kigi, an
unofficial Kimi Code CLI community build.
Rename & identity
- 72 xai-*/xai-grok-* crates -> kigi-* (explicit: xai-grok-pager-bin ->
kigi-bin [binary `kigi`], xai-grok-pager -> kigi-tui; rest mechanical);
ptyctl, ptyctl-cli, third_party/ unchanged; proto package
xai.grok.tools.v1 -> kigi.tools.v1
- Config home ~/.kigi (KIGI_SHARE_DIR override), env prefix GROK_* ->
KIGI_*, `kigi --version` carries the unofficial-community-build notice
- clap identity, help text, startup banner, prompt templates rebranded
(templates re-encrypted)
Deletions (PRD removal list #5/#6/#7/#9/#10)
- voice input (xai-grok-voice) and all TUI wiring
- telemetry: Mixpanel client, external OTel stream, Sentry, OTLP layers,
trace/GCS/S3 upload queues (kigi-file-utils halved), workspace upload
module & dc_log, heap-profile uploader, auth-diagnostics uploader,
session-analytics halves of feedback; local zero-egress observability
preserved in new kigi-log crate (unified log, --debug firehose,
subsystem file logs, opt-in instrumentation)
- announcements (crate, remote-settings fields, TUI surfaces)
- plugin marketplace (crate, sources/browse/CTA/extensions-modal tab);
direct plugin install/uninstall/update via kigi-agent git_install kept
- relay/gateway/assets endpoints and features (agent relay, headless
relay transport, gateway bridge, LeaderEnvUrls); leader IPC socket now
~/.kigi/leader.sock + KIGI_LEADER_SOCKET, no ws-url derivation
- functional types rehomed instead of deleted: PermissionMode ->
kigi-config-types, McpInitStrategy -> kigi-mcp, PrCreationSource ->
session signals, TerminalDiagnostics -> kigi-pager-render, agent_id ->
shell util
Endpoints
- kigi-env rewritten: single production KigiEndpoints {coding_api_base_url
https://api.kimi.com/coding/v1 (KIGI_CODE_BASE_URL), oauth_host
https://auth.kimi.com (KIGI_OAUTH_HOST), update_base_url (GitHub
Releases API), upgrade_page_url}; GrokBuildEnvironment enum deleted
Toolchain & workspace hygiene
- Rust 1.97.0 pinned; edition 2024; full cargo update; git2 hoisted to
workspace at 0.21 (Option->Result API migration), quick-xml 0.41
- Root Cargo.toml hand-maintained (PRD §8.1): version 0.1.0 inherited by
all members, members sorted, unused deps pruned
- cargo-deny advisories gate (deny.toml with documented transitive
exceptions); CI workflow (check/clippy/fmt/deny/test, macOS+Linux)
- cross-crate test seams re-gated behind `test-support` cargo feature;
insta snapshot baselines renamed to the kigi_tui prefix
- clippy --workspace --all-targets: zero warnings; fmt clean
Fixes surfaced by the port
- updater probe/installer divergence (bin/kigi vs bin/grok symlink set)
- idle model-metadata refresh dead under KIGI_CODE_BASE_URL override
(new is_effective_coding_endpoint_url, loopback+override aware)
- macOS symlinked-TMPDIR fixture canonicalization (foreign_sessions,
fast-worktree); RSS measurement tests serialized via serial_test
Docs & legal (Apache §4)
- NOTICE added (upstream attribution + change statement); THIRD-PARTY
notices sustained; kigi-tools ported-code notices extended; README,
CONTRIBUTING, SECURITY, AGENTS.md rewritten
Out of scope for M0 (tracked): Kimi auth/inference (M1), search/fetch,
command parity, config import (M2), Computer Hub excision & final
brand-token sweep (M2), distribution & self-update rewrite (M3).
This commit is contained in:
@@ -0,0 +1,125 @@
|
||||
//! [`TextMatcher`] — a compiled substring/regex query with smart-case matching.
|
||||
|
||||
/// How a query string is interpreted.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum QueryKind {
|
||||
/// Case-insensitive substring (compiled to a regex via `regex::escape`).
|
||||
Substring,
|
||||
/// User-supplied regex pattern.
|
||||
Regex,
|
||||
}
|
||||
|
||||
/// A compiled query that answers whether text matches.
|
||||
///
|
||||
/// Both substring and regex queries compile to a `regex::Regex`. Matching is
|
||||
/// smart-case: case-insensitive unless the query contains an uppercase
|
||||
/// character (Vim `smartcase` / ripgrep `--smart-case`).
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct TextMatcher {
|
||||
regex: regex::Regex,
|
||||
query: String,
|
||||
is_error: bool,
|
||||
}
|
||||
|
||||
impl TextMatcher {
|
||||
/// Compile `query` under the given interpretation.
|
||||
///
|
||||
/// A regex that fails to compile sets [`is_error`](Self::is_error) and falls
|
||||
/// back to a pattern that never matches.
|
||||
pub fn new(query: impl Into<String>, kind: QueryKind) -> Self {
|
||||
let query = query.into();
|
||||
let smart_ci = !query.chars().any(|c| c.is_uppercase());
|
||||
let (regex, is_error) = match kind {
|
||||
QueryKind::Substring => {
|
||||
let escaped = regex::escape(&query);
|
||||
let re = regex::RegexBuilder::new(&escaped)
|
||||
.case_insensitive(smart_ci)
|
||||
.build()
|
||||
.unwrap_or_else(|_| regex::Regex::new("(?:)").unwrap());
|
||||
(re, false)
|
||||
}
|
||||
QueryKind::Regex => match regex::RegexBuilder::new(&query)
|
||||
.case_insensitive(smart_ci)
|
||||
.build()
|
||||
{
|
||||
Ok(re) => (re, false),
|
||||
// `\z.` can never match: an end-of-text anchor followed by a char.
|
||||
Err(_) => (regex::Regex::new(r"\z.").unwrap(), true),
|
||||
},
|
||||
};
|
||||
Self {
|
||||
regex,
|
||||
query,
|
||||
is_error,
|
||||
}
|
||||
}
|
||||
|
||||
/// The raw query string the user typed.
|
||||
pub fn query(&self) -> &str {
|
||||
&self.query
|
||||
}
|
||||
|
||||
/// Whether the regex failed to compile (bad user regex).
|
||||
pub fn is_error(&self) -> bool {
|
||||
self.is_error
|
||||
}
|
||||
|
||||
/// The compiled regex, for callers that highlight matches.
|
||||
pub fn compiled_regex(&self) -> ®ex::Regex {
|
||||
&self.regex
|
||||
}
|
||||
|
||||
/// Whether `haystack` contains a match.
|
||||
pub fn is_match(&self, haystack: &str) -> bool {
|
||||
self.regex.is_match(haystack)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn substring_is_matched_literally() {
|
||||
let m = TextMatcher::new("a.c", QueryKind::Substring);
|
||||
assert!(m.is_match("xa.cx"));
|
||||
assert!(!m.is_match("abc"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn smart_case_is_insensitive_for_lowercase_query() {
|
||||
let m = TextMatcher::new("alpha", QueryKind::Substring);
|
||||
assert!(m.is_match("ALPHA"));
|
||||
assert!(m.is_match("Alpha"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn smart_case_is_sensitive_when_query_has_uppercase() {
|
||||
let m = TextMatcher::new("Alpha", QueryKind::Substring);
|
||||
assert!(m.is_match("Alpha"));
|
||||
assert!(!m.is_match("alpha"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn smart_case_applies_to_regex_queries() {
|
||||
let lower = TextMatcher::new("a.c", QueryKind::Regex);
|
||||
assert!(lower.is_match("AXC"));
|
||||
let upper = TextMatcher::new("A.C", QueryKind::Regex);
|
||||
assert!(!upper.is_match("axc"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn regex_query_matches() {
|
||||
let m = TextMatcher::new("^(a|b)$", QueryKind::Regex);
|
||||
assert!(!m.is_error());
|
||||
assert!(m.is_match("a"));
|
||||
assert!(!m.is_match("ab"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn bad_regex_flags_error_and_never_matches() {
|
||||
let m = TextMatcher::new("[invalid", QueryKind::Regex);
|
||||
assert!(m.is_error());
|
||||
assert!(!m.is_match("invalid"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
//! Reusable text-search primitives.
|
||||
//!
|
||||
//! [`TextMatcher`] compiles a substring or regex query (smart-case) once and
|
||||
//! answers match queries; it owns no corpus and no UI state. The free
|
||||
//! [`next_index_after`] / [`prev_index_before`] helpers wrap-navigate a sorted
|
||||
//! slice of match positions for `n`/`N` traversal.
|
||||
|
||||
pub mod matcher;
|
||||
|
||||
pub use matcher::{QueryKind, TextMatcher};
|
||||
|
||||
/// Position in ascending `sorted` of the first index after `current`, wrapping
|
||||
/// to the front. `None` when `sorted` is empty.
|
||||
pub fn next_index_after(sorted: &[usize], current: usize) -> Option<usize> {
|
||||
if sorted.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let pos = sorted.partition_point(|&i| i <= current);
|
||||
Some(if pos < sorted.len() { pos } else { 0 })
|
||||
}
|
||||
|
||||
/// Position in ascending `sorted` of the last index before `current`, wrapping
|
||||
/// to the back. `None` when `sorted` is empty.
|
||||
pub fn prev_index_before(sorted: &[usize], current: usize) -> Option<usize> {
|
||||
if sorted.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let pos = sorted.partition_point(|&i| i < current);
|
||||
Some(if pos > 0 { pos - 1 } else { sorted.len() - 1 })
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn next_index_after_wraps() {
|
||||
let sorted = [0usize, 2, 4];
|
||||
assert_eq!(next_index_after(&sorted, 0), Some(1));
|
||||
assert_eq!(next_index_after(&sorted, 2), Some(2));
|
||||
assert_eq!(next_index_after(&sorted, 4), Some(0));
|
||||
assert_eq!(next_index_after(&[], 3), None);
|
||||
let one = [5usize];
|
||||
assert_eq!(next_index_after(&one, 5), Some(0));
|
||||
assert_eq!(next_index_after(&one, 1), Some(0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn prev_index_before_wraps() {
|
||||
let sorted = [0usize, 2, 4];
|
||||
assert_eq!(prev_index_before(&sorted, 4), Some(1));
|
||||
assert_eq!(prev_index_before(&sorted, 2), Some(0));
|
||||
assert_eq!(prev_index_before(&sorted, 0), Some(2));
|
||||
assert_eq!(prev_index_before(&[], 3), None);
|
||||
let one = [5usize];
|
||||
assert_eq!(prev_index_before(&one, 5), Some(0));
|
||||
assert_eq!(prev_index_before(&one, 9), Some(0));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user