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,103 @@
|
||||
use std::fmt;
|
||||
|
||||
use tokio::sync::{mpsc, oneshot};
|
||||
|
||||
use crate::{
|
||||
common::{AcpChannelFailure, AcpResult, acp_channel_failure_error},
|
||||
message::{AcpAgentMessage, AcpArgs, AcpClientMessage, AcpMethod, AcpRequest},
|
||||
};
|
||||
|
||||
/// Receiver/sender pair, either for client/agent or agent/client message types.
|
||||
pub struct AcpChannel<I, O> {
|
||||
pub rx: mpsc::UnboundedReceiver<I>,
|
||||
pub tx: mpsc::UnboundedSender<O>,
|
||||
}
|
||||
|
||||
impl<I: AcpMethod, O: AcpMethod> AcpChannel<I, O> {
|
||||
pub fn new(rx: mpsc::UnboundedReceiver<I>, tx: mpsc::UnboundedSender<O>) -> Self {
|
||||
Self { rx, tx }
|
||||
}
|
||||
}
|
||||
|
||||
/// Client channel: receive client messages from agent, send agent messages to agent.
|
||||
pub type AcpClientChannel = AcpChannel<AcpClientMessage, AcpAgentMessage>;
|
||||
/// Agent channel: receive agent messages from client, send client messages to client.
|
||||
pub type AcpAgentChannel = AcpChannel<AcpAgentMessage, AcpClientMessage>;
|
||||
|
||||
/// Create a linked pair of client/agent channels.
|
||||
pub fn acp_channels() -> (AcpClientChannel, AcpAgentChannel) {
|
||||
let (tx1, rx1) = mpsc::unbounded_channel();
|
||||
let (tx2, rx2) = mpsc::unbounded_channel();
|
||||
(AcpChannel::new(rx1, tx2), AcpChannel::new(rx2, tx1))
|
||||
}
|
||||
|
||||
pub async fn acp_send<R, T>(request: T, tx: &mpsc::UnboundedSender<R>) -> AcpResult<T::Response>
|
||||
where
|
||||
T: AcpRequest,
|
||||
R: From<AcpArgs<T>> + fmt::Debug,
|
||||
{
|
||||
let (response_tx, response_rx) = oneshot::channel();
|
||||
let method = request.method_name();
|
||||
let args = AcpArgs {
|
||||
request,
|
||||
response_tx,
|
||||
};
|
||||
|
||||
tx.send(args.into()).map_err(|_| {
|
||||
acp_channel_failure_error(
|
||||
format!("unable to send '{method}' request, channel closed"),
|
||||
AcpChannelFailure::SendFailed,
|
||||
)
|
||||
})?;
|
||||
|
||||
response_rx.await.map_err(|_| {
|
||||
acp_channel_failure_error(
|
||||
format!("unable to receive '{method}' response, channel closed"),
|
||||
AcpChannelFailure::RecvFailed,
|
||||
)
|
||||
})?
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod acp_send_failure_tests {
|
||||
use super::acp_send;
|
||||
use crate::common::{AcpChannelFailure, acp_channel_failure};
|
||||
use crate::message::AcpAgentMessage;
|
||||
use agent_client_protocol as acp;
|
||||
use tokio::sync::mpsc;
|
||||
|
||||
fn ext_request() -> acp::ExtRequest {
|
||||
acp::ExtRequest::new(
|
||||
"x.ai/test",
|
||||
serde_json::value::to_raw_value(&serde_json::json!({}))
|
||||
.unwrap()
|
||||
.into(),
|
||||
)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn send_failed_when_receiver_dropped_before_send() {
|
||||
let (tx, rx) = mpsc::unbounded_channel::<AcpAgentMessage>();
|
||||
drop(rx); // no peer listening -> enqueue fails
|
||||
let err = acp_send(ext_request(), &tx).await.unwrap_err();
|
||||
assert_eq!(
|
||||
acp_channel_failure(&err),
|
||||
Some(AcpChannelFailure::SendFailed)
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn recv_failed_when_response_channel_dropped_after_send() {
|
||||
let (tx, mut rx) = mpsc::unbounded_channel::<AcpAgentMessage>();
|
||||
let mut send_fut = Box::pin(acp_send(ext_request(), &tx));
|
||||
// First poll enqueues the request, then parks on the response channel.
|
||||
assert!(futures::poll!(send_fut.as_mut()).is_pending());
|
||||
// The peer "receives" the request then drops it (dropping response_tx).
|
||||
drop(rx.try_recv().expect("request should be enqueued"));
|
||||
let err = send_fut.await.unwrap_err();
|
||||
assert_eq!(
|
||||
acp_channel_failure(&err),
|
||||
Some(AcpChannelFailure::RecvFailed)
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user