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).
336 lines
11 KiB
Rust
336 lines
11 KiB
Rust
//! `CompoundResolver` and `ResolvedTool` coverage. Exercises local-only,
|
|
//! local-shadows-remote, remote-fallback, and cross-session scenarios.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use dashmap::DashMap;
|
|
|
|
use async_trait::async_trait;
|
|
|
|
use futures::StreamExt;
|
|
use kigi_computer_hub_core::{
|
|
CompoundResolver, ConnectionCleanupReport, ErasedTool, ResolvedTool, SessionCleanupReport,
|
|
ToolHandle, ToolRegistry, ToolSessionBindOutcome, ToolSessionUnbindOutcome,
|
|
};
|
|
use kigi_tool_protocol::{
|
|
ConnectionId, RegistrationOutcome, ServerId, SessionId, ToolDefinitionMode, ToolId,
|
|
ToolRegistration, ToolServerRegistration, TransportKind, UserId,
|
|
};
|
|
use kigi_tool_runtime::{
|
|
SearchSnapshot, ServerSummary, Tool, ToolCallContext, ToolError, ToolStreamItem,
|
|
};
|
|
use kigi_tool_types::ToolDescription;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
#[derive(Debug, Default, Clone, Serialize, Deserialize, schemars::JsonSchema)]
|
|
struct EmptyArgs {}
|
|
|
|
#[derive(Debug)]
|
|
struct StubTool {
|
|
id: ToolId,
|
|
}
|
|
|
|
impl Tool for StubTool {
|
|
type Args = EmptyArgs;
|
|
type Output = serde_json::Value;
|
|
|
|
fn id(&self) -> ToolId {
|
|
self.id.clone()
|
|
}
|
|
|
|
fn description(&self, _ctx: &::kigi_tool_runtime::ListToolsContext) -> ToolDescription {
|
|
ToolDescription::new(self.id.as_str(), format!("stub for {}", self.id))
|
|
}
|
|
|
|
async fn run(
|
|
&self,
|
|
_ctx: ToolCallContext,
|
|
_args: Self::Args,
|
|
) -> Result<Self::Output, ToolError> {
|
|
Ok(serde_json::json!({"id": self.id.as_str()}))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
struct PlaneRegistry {
|
|
// Set once at construction; `TransportKind` is `Copy` so a direct
|
|
// field is the obvious choice — no interior mutability required.
|
|
transport_kind: TransportKind,
|
|
entries: DashMap<(SessionId, ToolId), ToolRegistration>,
|
|
handles: DashMap<ToolId, Arc<dyn ToolHandle>>,
|
|
}
|
|
|
|
impl PlaneRegistry {
|
|
fn new(kind: TransportKind) -> Self {
|
|
Self {
|
|
transport_kind: kind,
|
|
entries: DashMap::new(),
|
|
handles: DashMap::new(),
|
|
}
|
|
}
|
|
|
|
fn install(&self, session: &SessionId, id: &ToolId) {
|
|
let reg = ToolRegistration {
|
|
tool_id: id.clone(),
|
|
sessions: Some(vec![session.clone()]),
|
|
user_id: UserId::new("alice").expect("user id"),
|
|
server_id: None,
|
|
description: ToolDescription::new(id.as_str(), format!("stub for {id}")),
|
|
input_schema: None,
|
|
capabilities: None,
|
|
notification_schemas: None,
|
|
transport_kind: self.transport_kind,
|
|
if_match_generation: None,
|
|
metadata: None,
|
|
};
|
|
self.entries.insert((session.clone(), id.clone()), reg);
|
|
self.handles.insert(
|
|
id.clone(),
|
|
Arc::new(ErasedTool::new(StubTool { id: id.clone() })),
|
|
);
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl ToolRegistry for PlaneRegistry {
|
|
async fn register_tool(
|
|
&self,
|
|
_connection_id: ConnectionId,
|
|
_reg: ToolRegistration,
|
|
) -> RegistrationOutcome {
|
|
unreachable!("resolver tests pre-populate via install()")
|
|
}
|
|
async fn register_server(
|
|
&self,
|
|
_connection_id: ConnectionId,
|
|
_reg: ToolServerRegistration,
|
|
) -> Vec<RegistrationOutcome> {
|
|
unreachable!()
|
|
}
|
|
async fn unregister_tool(&self, _connection_id: &ConnectionId, _tool: &ToolId) -> bool {
|
|
unreachable!()
|
|
}
|
|
async fn unregister_server(&self, _connection_id: &ConnectionId, _server: &ServerId) -> usize {
|
|
unreachable!()
|
|
}
|
|
async fn bind_tool_session(
|
|
&self,
|
|
_connection_id: &ConnectionId,
|
|
_tool: &ToolId,
|
|
_session_id: &SessionId,
|
|
) -> ToolSessionBindOutcome {
|
|
unreachable!()
|
|
}
|
|
async fn unbind_tool_session(
|
|
&self,
|
|
_connection_id: &ConnectionId,
|
|
_tool: &ToolId,
|
|
_session_id: &SessionId,
|
|
) -> ToolSessionUnbindOutcome {
|
|
unreachable!()
|
|
}
|
|
async fn drop_connection(&self, _connection_id: &ConnectionId) -> ConnectionCleanupReport {
|
|
ConnectionCleanupReport::default()
|
|
}
|
|
|
|
fn find_tool(&self, session: &SessionId, tool: &ToolId) -> Option<ResolvedTool> {
|
|
let registration = self
|
|
.entries
|
|
.get(&(session.clone(), tool.clone()))?
|
|
.value()
|
|
.clone();
|
|
let handle = self.handles.get(tool)?.value().clone();
|
|
match registration.transport_kind {
|
|
TransportKind::Local => Some(ResolvedTool::Local {
|
|
tool: handle,
|
|
registration,
|
|
}),
|
|
TransportKind::Remote => Some(ResolvedTool::Remote {
|
|
proxy: handle,
|
|
registration,
|
|
}),
|
|
}
|
|
}
|
|
|
|
fn list_tools(&self, _session: &SessionId, _mode: &ToolDefinitionMode) -> Vec<ToolDescription> {
|
|
vec![]
|
|
}
|
|
fn list_servers(&self, _session: &SessionId) -> Vec<ServerSummary> {
|
|
vec![]
|
|
}
|
|
fn search(&self, _session: &SessionId, _query: &str, _limit: usize) -> SearchSnapshot {
|
|
SearchSnapshot {
|
|
results: vec![],
|
|
total_hidden_tools: 0,
|
|
is_ready: true,
|
|
}
|
|
}
|
|
async fn unregister_session(&self, _session: &SessionId) -> SessionCleanupReport {
|
|
SessionCleanupReport::default()
|
|
}
|
|
fn tool_sessions(
|
|
&self,
|
|
_connection_id: &ConnectionId,
|
|
_tool: &ToolId,
|
|
) -> std::collections::HashSet<SessionId> {
|
|
std::collections::HashSet::new()
|
|
}
|
|
|
|
fn list_servers_for_user(
|
|
&self,
|
|
_user_id: &kigi_tool_protocol::UserId,
|
|
) -> Vec<kigi_computer_hub_core::registry::ServerRecord> {
|
|
Vec::new()
|
|
}
|
|
|
|
fn get_server_record(
|
|
&self,
|
|
_connection_id: &ConnectionId,
|
|
) -> Option<kigi_computer_hub_core::registry::ServerRecord> {
|
|
None
|
|
}
|
|
}
|
|
|
|
fn sid(s: &str) -> SessionId {
|
|
SessionId::new(s).expect("session id")
|
|
}
|
|
|
|
fn tid(s: &str) -> ToolId {
|
|
ToolId::new(s).expect("tool id")
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn local_only_resolves_local_hits() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
local.install(&sid("sess-1"), &tid("foo"));
|
|
let resolver = CompoundResolver::local_only(local as Arc<dyn ToolRegistry>);
|
|
match resolver.resolve(&sid("sess-1"), &tid("foo")) {
|
|
Some(ResolvedTool::Local { registration, .. }) => {
|
|
assert_eq!(registration.tool_id, tid("foo"));
|
|
}
|
|
other => panic!("expected Local, got {other:?}"),
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn local_only_returns_none_for_unknown() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
let resolver = CompoundResolver::local_only(local as Arc<dyn ToolRegistry>);
|
|
assert!(resolver.resolve(&sid("sess-1"), &tid("missing")).is_none());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn compound_falls_through_to_remote_when_local_misses() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
let remote = Arc::new(PlaneRegistry::new(TransportKind::Remote));
|
|
remote.install(&sid("sess-1"), &tid("foo"));
|
|
let resolver = CompoundResolver::compound(
|
|
local as Arc<dyn ToolRegistry>,
|
|
remote as Arc<dyn ToolRegistry>,
|
|
);
|
|
match resolver.resolve(&sid("sess-1"), &tid("foo")) {
|
|
Some(ResolvedTool::Remote { registration, .. }) => {
|
|
assert_eq!(registration.tool_id, tid("foo"));
|
|
assert_eq!(registration.transport_kind, TransportKind::Remote);
|
|
}
|
|
other => panic!("expected Remote, got {other:?}"),
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn local_shadows_same_id_remote() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
local.install(&sid("sess-1"), &tid("foo"));
|
|
let remote = Arc::new(PlaneRegistry::new(TransportKind::Remote));
|
|
remote.install(&sid("sess-1"), &tid("foo"));
|
|
let resolver = CompoundResolver::compound(
|
|
local as Arc<dyn ToolRegistry>,
|
|
remote as Arc<dyn ToolRegistry>,
|
|
);
|
|
match resolver.resolve(&sid("sess-1"), &tid("foo")) {
|
|
Some(ResolvedTool::Local { registration, .. }) => {
|
|
assert_eq!(registration.transport_kind, TransportKind::Local);
|
|
}
|
|
other => panic!("expected local resolution to shadow remote, got {other:?}"),
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn cross_session_lookup_returns_none() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
local.install(&sid("sess-1"), &tid("foo"));
|
|
let resolver = CompoundResolver::local_only(local as Arc<dyn ToolRegistry>);
|
|
assert!(resolver.resolve(&sid("sess-other"), &tid("foo")).is_none());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn compound_returns_none_when_neither_plane_holds_id() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
let remote = Arc::new(PlaneRegistry::new(TransportKind::Remote));
|
|
let resolver = CompoundResolver::compound(
|
|
local as Arc<dyn ToolRegistry>,
|
|
remote as Arc<dyn ToolRegistry>,
|
|
);
|
|
assert!(resolver.resolve(&sid("sess-1"), &tid("foo")).is_none());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn resolved_tool_helpers_borrow_active_handle_and_registration() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
local.install(&sid("sess-1"), &tid("foo"));
|
|
let resolver = CompoundResolver::local_only(local as Arc<dyn ToolRegistry>);
|
|
let resolved = resolver.resolve(&sid("sess-1"), &tid("foo")).expect("hit");
|
|
assert_eq!(resolved.registration().tool_id, tid("foo"));
|
|
assert_eq!(resolved.handle().id(), tid("foo"));
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn resolve_and_dispatch_drives_the_resolved_handle() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
local.install(&sid("sess-1"), &tid("foo"));
|
|
let resolver = CompoundResolver::local_only(local as Arc<dyn ToolRegistry>);
|
|
let mut stream = resolver
|
|
.resolve_and_dispatch(
|
|
&sid("sess-1"),
|
|
tid("foo"),
|
|
serde_json::json!({}),
|
|
ToolCallContext::default(),
|
|
)
|
|
.await;
|
|
let item = stream.next().await.expect("terminal");
|
|
match item {
|
|
ToolStreamItem::Terminal(Ok(typed)) => {
|
|
assert_eq!(typed.value, serde_json::json!({"id": "foo"}));
|
|
}
|
|
other => panic!("expected Terminal(Ok), got {other:?}"),
|
|
}
|
|
assert!(stream.next().await.is_none());
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn resolve_and_dispatch_misses_yield_terminal_not_found() {
|
|
let local = Arc::new(PlaneRegistry::new(TransportKind::Local));
|
|
let resolver = CompoundResolver::local_only(local as Arc<dyn ToolRegistry>);
|
|
let mut stream = resolver
|
|
.resolve_and_dispatch(
|
|
&sid("sess-1"),
|
|
tid("missing"),
|
|
serde_json::json!(null),
|
|
ToolCallContext::default(),
|
|
)
|
|
.await;
|
|
let item = stream.next().await.expect("terminal");
|
|
match item {
|
|
ToolStreamItem::Terminal(Err(ref e))
|
|
if e.kind == kigi_tool_runtime::ToolErrorKind::NotFound =>
|
|
{
|
|
assert!(
|
|
e.detail.contains("missing"),
|
|
"detail should mention tool id: {}",
|
|
e.detail
|
|
);
|
|
}
|
|
other => panic!("expected Terminal(Err(NotFound)), got {other:?}"),
|
|
}
|
|
}
|