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,144 @@
|
||||
//! In-process SDK MCP servers over the ACP reverse channel (`x.ai/mcp/sdk_call`).
|
||||
//!
|
||||
//! The official `grok-agent-sdk` lets a host define in-process tools (`@tool` /
|
||||
//! `create_sdk_mcp_server`). When `transport="acp"`, the SDK registers them in
|
||||
//! `session/new` `_meta["x.ai/mcp/servers"] = [{ "name", "serverId" }]` and the agent
|
||||
//! invokes their tools by sending each MCP JSON-RPC message back to the client as a
|
||||
//! reverse `x.ai/mcp/sdk_call` request — handled here by [`GatewayAcpInvoker`].
|
||||
//!
|
||||
//! NOTE: the *reverse* route (agent -> client, `x.ai/mcp/sdk_call`) invokes a tool that
|
||||
//! lives in the SDK's process. It is the zero-IPC mirror of the *forward* route (client
|
||||
//! -> agent, `x.ai/mcp/call` in `extensions::mcp`), which invokes a tool on a server the
|
||||
//! AGENT is connected to. They use distinct method strings and sit on opposite request
|
||||
//! handlers, so they never collide.
|
||||
|
||||
use std::time::Duration;
|
||||
|
||||
use agent_client_protocol as acp;
|
||||
use kigi_acp_lib::AcpAgentGatewaySender;
|
||||
use kigi_mcp::acp_transport::AcpReverseInvoker;
|
||||
use kigi_mcp::servers::AcpServerEntry;
|
||||
use kigi_mcp::wire;
|
||||
|
||||
/// Parse `_meta["x.ai/mcp/servers"]` into [`AcpServerEntry`] registrations. Each entry
|
||||
/// is deserialized directly into the canonical type (so the `serverId` wire field is
|
||||
/// serde-checked, not hand-read); entries missing `name`/`serverId` are skipped with a
|
||||
/// warning. A name seen twice keeps the first (server names are the tool namespace, so a
|
||||
/// duplicate would otherwise silently shadow). Absent meta yields none.
|
||||
pub fn parse_acp_mcp_servers(meta: Option<&acp::Meta>) -> Vec<AcpServerEntry> {
|
||||
let Some(array) = meta
|
||||
.and_then(|m| m.get(wire::MCP_SERVERS))
|
||||
.and_then(|v| v.as_array())
|
||||
else {
|
||||
return Vec::new();
|
||||
};
|
||||
let mut seen = std::collections::HashSet::new();
|
||||
let mut servers = Vec::new();
|
||||
for entry in array {
|
||||
let server: AcpServerEntry = match serde_json::from_value(entry.clone()) {
|
||||
Ok(server) => server,
|
||||
Err(err) => {
|
||||
tracing::warn!(entry = %entry, %err, "ignoring malformed x.ai/mcp/servers entry");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
if !seen.insert(server.name.clone()) {
|
||||
tracing::warn!(name = %server.name, "ignoring duplicate x.ai/mcp/servers entry");
|
||||
continue;
|
||||
}
|
||||
servers.push(server);
|
||||
}
|
||||
servers
|
||||
}
|
||||
|
||||
/// Reverse-RPC invoker for in-process SDK MCP servers.
|
||||
///
|
||||
/// Each [`invoke`](AcpReverseInvoker::invoke) sends one `x.ai/mcp/sdk_call` reverse request
|
||||
/// straight through the gateway. `AcpAgentGatewaySender::send` returns a `Send` future
|
||||
/// (unlike the `?Send` `acp::Client::ext_method` trait method), so the rmcp transport's
|
||||
/// `Send` invoker bound is satisfied with no relay task. Calls are independent and may
|
||||
/// run concurrently — the gateway serializes them onto the session's message channel.
|
||||
pub struct GatewayAcpInvoker {
|
||||
gateway: AcpAgentGatewaySender,
|
||||
}
|
||||
|
||||
impl GatewayAcpInvoker {
|
||||
pub fn new(gateway: AcpAgentGatewaySender) -> Self {
|
||||
Self { gateway }
|
||||
}
|
||||
}
|
||||
|
||||
/// Reverse `x.ai/mcp/sdk_call` params. Declares the on-wire field names once (mirrors
|
||||
/// the forward side's typed `McpCallRequest`) so the `serverId` literal isn't hand-spelled.
|
||||
#[derive(serde::Serialize)]
|
||||
struct SdkCallParams<'a> {
|
||||
#[serde(rename = "serverId")]
|
||||
server_id: &'a str,
|
||||
message: serde_json::Value,
|
||||
}
|
||||
|
||||
#[async_trait::async_trait]
|
||||
impl AcpReverseInvoker for GatewayAcpInvoker {
|
||||
async fn invoke(
|
||||
&self,
|
||||
server_id: &str,
|
||||
message: serde_json::Value,
|
||||
timeout: Duration,
|
||||
) -> Result<serde_json::Value, String> {
|
||||
let params = serde_json::value::to_raw_value(&SdkCallParams { server_id, message })
|
||||
.map_err(|err| err.to_string())?;
|
||||
let request = acp::ExtRequest::new(wire::MCP_SDK_CALL, params.into());
|
||||
// Bound the round trip so a missing or hung client fails this reverse call at
|
||||
// the configured per-server tool timeout rather than stalling the tool loop.
|
||||
let response = tokio::time::timeout(timeout, self.gateway.send(request))
|
||||
.await
|
||||
.map_err(|_| {
|
||||
format!(
|
||||
"{} to server {server_id} timed out after {}ms",
|
||||
wire::MCP_SDK_CALL,
|
||||
timeout.as_millis()
|
||||
)
|
||||
})?
|
||||
.map_err(|err| err.to_string())?;
|
||||
serde_json::from_str(response.0.get()).map_err(|err| err.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn parses_valid_entries_and_skips_malformed() {
|
||||
let meta = serde_json::json!({
|
||||
"x.ai/mcp/servers": [
|
||||
{ "name": "harness-tools", "serverId": "srv_0" },
|
||||
{ "name": "missing-id" },
|
||||
{ "serverId": "no_name" },
|
||||
]
|
||||
});
|
||||
let servers = parse_acp_mcp_servers(meta.as_object());
|
||||
assert_eq!(servers.len(), 1);
|
||||
assert_eq!(servers[0].name, "harness-tools");
|
||||
assert_eq!(servers[0].server_id, "srv_0");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duplicate_names_keep_the_first() {
|
||||
let meta = serde_json::json!({
|
||||
"x.ai/mcp/servers": [
|
||||
{ "name": "tools", "serverId": "srv_0" },
|
||||
{ "name": "tools", "serverId": "srv_1" },
|
||||
]
|
||||
});
|
||||
let servers = parse_acp_mcp_servers(meta.as_object());
|
||||
assert_eq!(servers.len(), 1);
|
||||
assert_eq!(servers[0].server_id, "srv_0");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn absent_meta_yields_none() {
|
||||
assert!(parse_acp_mcp_servers(None).is_empty());
|
||||
assert!(parse_acp_mcp_servers(serde_json::json!({}).as_object()).is_empty());
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user