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,112 @@
|
||||
//! Skip logic for copy operations (gitignore + additional patterns).
|
||||
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::Arc;
|
||||
|
||||
use anyhow::Result;
|
||||
use dashmap::DashSet;
|
||||
use ignore::{WalkBuilder, WalkState};
|
||||
|
||||
/// Build a globset matcher for skip patterns.
|
||||
pub(crate) fn build_skip_matcher(patterns: &[String]) -> Result<globset::GlobSet> {
|
||||
let mut builder = globset::GlobSetBuilder::new();
|
||||
for pattern in patterns {
|
||||
builder.add(globset::Glob::new(pattern)?);
|
||||
}
|
||||
Ok(builder.build()?)
|
||||
}
|
||||
|
||||
/// Collect all *unignored* paths in `source` (relative).
|
||||
///
|
||||
/// This is used to implement an "ignored-only" copy: by collecting unignored paths
|
||||
/// and then skipping them during a second pass with `respect_gitignore=false`.
|
||||
pub(crate) fn collect_unignored_paths(
|
||||
source: &Path,
|
||||
parallelism: usize,
|
||||
) -> Result<DashSet<PathBuf>> {
|
||||
let unignored: Arc<DashSet<PathBuf>> = Arc::new(DashSet::new());
|
||||
|
||||
// git_exclude/git_global off: external tools append broad patterns (e.g.
|
||||
// *.zip) to `.git/info/exclude`; the `ignore` crate would then drop matching
|
||||
// TRACKED files from the unignored set, so the ignored-copy clobbers them.
|
||||
let walker = WalkBuilder::new(source)
|
||||
.hidden(false)
|
||||
.git_ignore(true)
|
||||
.git_global(false)
|
||||
.git_exclude(false)
|
||||
.filter_entry(|entry| entry.file_name() != ".git")
|
||||
.threads(parallelism)
|
||||
.build_parallel();
|
||||
|
||||
walker.run(|| {
|
||||
let unignored = Arc::clone(&unignored);
|
||||
Box::new(move |entry_result| {
|
||||
let entry = match entry_result {
|
||||
Ok(e) => e,
|
||||
Err(_) => return WalkState::Continue,
|
||||
};
|
||||
|
||||
let rel_path = match entry.path().strip_prefix(source) {
|
||||
Ok(p) => p.to_path_buf(),
|
||||
Err(_) => return WalkState::Continue,
|
||||
};
|
||||
|
||||
unignored.insert(rel_path);
|
||||
WalkState::Continue
|
||||
})
|
||||
});
|
||||
|
||||
Ok(match Arc::try_unwrap(unignored) {
|
||||
Ok(set) => set,
|
||||
Err(arc) => {
|
||||
let mut set = DashSet::new();
|
||||
set.extend(arc.iter().map(|p| p.clone()));
|
||||
set
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use kigi_test_utils::git::{git_commit_all, init_git_repo};
|
||||
use tempfile::TempDir;
|
||||
|
||||
#[test]
|
||||
fn collect_unignored_includes_tracked_file_matching_git_exclude() {
|
||||
kigi_test_utils::require_git!();
|
||||
// A tracked file matching `.git/info/exclude` must stay "unignored" so
|
||||
// the ignored-copy doesn't re-copy and clobber it.
|
||||
let temp = TempDir::new().unwrap();
|
||||
let repo = temp.path();
|
||||
init_git_repo(repo);
|
||||
|
||||
std::fs::write(repo.join("data.zip"), "tracked-archive").unwrap();
|
||||
std::fs::write(repo.join("main.rs"), "fn main() {}").unwrap();
|
||||
std::fs::write(repo.join(".gitignore"), "build/\n").unwrap();
|
||||
git_commit_all(repo, "initial");
|
||||
|
||||
// External tooling appends broad patterns here (e.g., *.min.js, *.zip).
|
||||
// `git init` does not always create `.git/info/` (the hermetic git on
|
||||
// arm64 CI ships no init template), so create it before writing.
|
||||
let info_dir = repo.join(".git").join("info");
|
||||
std::fs::create_dir_all(&info_dir).unwrap();
|
||||
std::fs::write(info_dir.join("exclude"), "*.zip\n").unwrap();
|
||||
|
||||
// A truly-ignored (gitignored, untracked) artifact.
|
||||
std::fs::create_dir(repo.join("build")).unwrap();
|
||||
std::fs::write(repo.join("build/out.o"), "obj").unwrap();
|
||||
|
||||
let unignored = collect_unignored_paths(repo, 1).unwrap();
|
||||
|
||||
assert!(
|
||||
unignored.contains(&PathBuf::from("data.zip")),
|
||||
"tracked file matching .git/info/exclude must be classed unignored"
|
||||
);
|
||||
assert!(unignored.contains(&PathBuf::from("main.rs")));
|
||||
assert!(
|
||||
!unignored.contains(&PathBuf::from("build/out.o")),
|
||||
"a real .gitignore'd file must remain ignored (not unignored)"
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user