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,259 @@
|
||||
//! Wire-shape parsers for ext-notification params handled by `MvpAgent`.
|
||||
//!
|
||||
//! Pure parsing only (params JSON → `SessionCommand`); session lookup and
|
||||
//! command dispatch stay in `mvp_agent::ext_notification`.
|
||||
|
||||
use crate::session::SessionCommand;
|
||||
|
||||
/// Parse a `x.ai/queue/{remove,reorder,clear,edit,interject}` ext-notification's
|
||||
/// params into the corresponding [`SessionCommand`].
|
||||
/// `owner` is the resolved attribution (params `owner`/`clientIdentifier`) used
|
||||
/// to scope remove/clear to the requesting client's own items, and recorded as
|
||||
/// `last_editor` for in-place text edits. Returns `None` for unrecognized
|
||||
/// methods or for `edit` when `newText` is missing.
|
||||
pub(super) fn parse_queue_edit_command(
|
||||
method: &str,
|
||||
params: &serde_json::Value,
|
||||
owner: Option<String>,
|
||||
) -> Option<SessionCommand> {
|
||||
match method {
|
||||
"x.ai/queue/remove" => {
|
||||
let id = params.get("id").and_then(|v| v.as_str())?.to_string();
|
||||
// The client supplies the version it last saw; the handler removes
|
||||
// only on an exact match (stale = benign no-op + rebroadcast).
|
||||
// Default 0 covers never-edited prompts (the common case).
|
||||
let expected_version = params
|
||||
.get("expectedVersion")
|
||||
.and_then(|v| v.as_u64())
|
||||
.unwrap_or(0);
|
||||
Some(SessionCommand::RemoveQueuedPrompt {
|
||||
id,
|
||||
expected_version,
|
||||
owner,
|
||||
})
|
||||
}
|
||||
"x.ai/queue/reorder" => {
|
||||
let ordered_ids = params
|
||||
.get("orderedIds")
|
||||
.and_then(|v| v.as_array())
|
||||
.map(|arr| {
|
||||
arr.iter()
|
||||
.filter_map(|v| v.as_str().map(|s| s.to_string()))
|
||||
.collect::<Vec<_>>()
|
||||
})
|
||||
.unwrap_or_default();
|
||||
Some(SessionCommand::ReorderQueue { ordered_ids })
|
||||
}
|
||||
"x.ai/queue/clear" => Some(SessionCommand::ClearQueue { owner }),
|
||||
"x.ai/queue/interject" => {
|
||||
let id = params.get("id").and_then(|v| v.as_str())?.to_string();
|
||||
// The client supplies the version it last saw; the handler acts
|
||||
// only on an exact match (stale = benign no-op + rebroadcast).
|
||||
let expected_version = params
|
||||
.get("expectedVersion")
|
||||
.and_then(|v| v.as_u64())
|
||||
.unwrap_or(0);
|
||||
// Optional client-edited replacement text (atomic edit+interject).
|
||||
// Blank overrides are dropped (degrade to the stored queue text) —
|
||||
// never interject an empty prompt on a malformed client param.
|
||||
let new_text = params
|
||||
.get("newText")
|
||||
.and_then(|v| v.as_str())
|
||||
.filter(|s| !s.trim().is_empty())
|
||||
.map(str::to_string);
|
||||
Some(SessionCommand::InterjectQueuedPrompt {
|
||||
id,
|
||||
expected_version,
|
||||
owner,
|
||||
new_text,
|
||||
})
|
||||
}
|
||||
"x.ai/queue/edit" => {
|
||||
let id = params.get("id").and_then(|v| v.as_str())?.to_string();
|
||||
let new_text = params.get("newText").and_then(|v| v.as_str())?.to_string();
|
||||
// `owner` is the resolved attribution; for edit it represents the
|
||||
// most recent editor (recorded as `last_editor`), not the original
|
||||
// enqueuer.
|
||||
Some(SessionCommand::EditQueuedPrompt {
|
||||
id,
|
||||
new_text,
|
||||
editor: owner,
|
||||
})
|
||||
}
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// Each `x.ai/queue/*` ext-notification maps to the
|
||||
/// correct versioned/idempotent `SessionCommand`.
|
||||
#[test]
|
||||
fn parse_queue_edit_command_maps_each_method() {
|
||||
// remove: id + expectedVersion + owner.
|
||||
let p = serde_json::json!({
|
||||
"sessionId": "s1", "id": "p7", "expectedVersion": 3
|
||||
});
|
||||
match parse_queue_edit_command("x.ai/queue/remove", &p, Some("grok-tui".into())) {
|
||||
Some(SessionCommand::RemoveQueuedPrompt {
|
||||
id,
|
||||
expected_version,
|
||||
owner,
|
||||
}) => {
|
||||
assert_eq!(id, "p7");
|
||||
assert_eq!(expected_version, 3);
|
||||
assert_eq!(owner.as_deref(), Some("grok-tui"));
|
||||
}
|
||||
_ => panic!("expected RemoveQueuedPrompt"),
|
||||
}
|
||||
|
||||
// remove without expectedVersion defaults to 0.
|
||||
let p = serde_json::json!({ "sessionId": "s1", "id": "p8" });
|
||||
match parse_queue_edit_command("x.ai/queue/remove", &p, None) {
|
||||
Some(SessionCommand::RemoveQueuedPrompt {
|
||||
expected_version, ..
|
||||
}) => assert_eq!(expected_version, 0),
|
||||
_ => panic!("expected RemoveQueuedPrompt"),
|
||||
}
|
||||
|
||||
// reorder: orderedIds array.
|
||||
let p = serde_json::json!({ "sessionId": "s1", "orderedIds": ["a", "b", "c"] });
|
||||
match parse_queue_edit_command("x.ai/queue/reorder", &p, None) {
|
||||
Some(SessionCommand::ReorderQueue { ordered_ids }) => {
|
||||
assert_eq!(ordered_ids, vec!["a", "b", "c"]);
|
||||
}
|
||||
_ => panic!("expected ReorderQueue"),
|
||||
}
|
||||
|
||||
// clear: owner-scoped.
|
||||
match parse_queue_edit_command(
|
||||
"x.ai/queue/clear",
|
||||
&serde_json::json!({ "sessionId": "s1" }),
|
||||
Some("grok-tui".into()),
|
||||
) {
|
||||
Some(SessionCommand::ClearQueue { owner }) => {
|
||||
assert_eq!(owner.as_deref(), Some("grok-tui"));
|
||||
}
|
||||
_ => panic!("expected ClearQueue"),
|
||||
}
|
||||
|
||||
// edit: id + newText + editor (resolved via owner/clientIdentifier).
|
||||
let p = serde_json::json!({
|
||||
"sessionId": "s1", "id": "p9", "newText": "replacement text"
|
||||
});
|
||||
match parse_queue_edit_command("x.ai/queue/edit", &p, Some("grok-vscode".into())) {
|
||||
Some(SessionCommand::EditQueuedPrompt {
|
||||
id,
|
||||
new_text,
|
||||
editor,
|
||||
}) => {
|
||||
assert_eq!(id, "p9");
|
||||
assert_eq!(new_text, "replacement text");
|
||||
assert_eq!(editor.as_deref(), Some("grok-vscode"));
|
||||
}
|
||||
_ => panic!("expected EditQueuedPrompt"),
|
||||
}
|
||||
|
||||
// edit without editor (no owner/clientIdentifier) → editor: None.
|
||||
match parse_queue_edit_command(
|
||||
"x.ai/queue/edit",
|
||||
&serde_json::json!({ "sessionId": "s1", "id": "p9", "newText": "x" }),
|
||||
None,
|
||||
) {
|
||||
Some(SessionCommand::EditQueuedPrompt { editor, .. }) => {
|
||||
assert!(editor.is_none());
|
||||
}
|
||||
_ => panic!("expected EditQueuedPrompt"),
|
||||
}
|
||||
|
||||
// edit without newText → None (can't replace text we don't have).
|
||||
assert!(
|
||||
parse_queue_edit_command(
|
||||
"x.ai/queue/edit",
|
||||
&serde_json::json!({ "sessionId": "s1", "id": "p9" }),
|
||||
None,
|
||||
)
|
||||
.is_none()
|
||||
);
|
||||
|
||||
// edit without id → None (can't target an entry).
|
||||
assert!(
|
||||
parse_queue_edit_command(
|
||||
"x.ai/queue/edit",
|
||||
&serde_json::json!({ "sessionId": "s1", "newText": "x" }),
|
||||
None,
|
||||
)
|
||||
.is_none()
|
||||
);
|
||||
|
||||
// interject: id + expectedVersion + owner (mirrors remove).
|
||||
let p = serde_json::json!({
|
||||
"sessionId": "s1", "id": "p10", "expectedVersion": 2
|
||||
});
|
||||
match parse_queue_edit_command("x.ai/queue/interject", &p, Some("grok-tui".into())) {
|
||||
Some(SessionCommand::InterjectQueuedPrompt {
|
||||
id,
|
||||
expected_version,
|
||||
owner,
|
||||
new_text,
|
||||
}) => {
|
||||
assert_eq!(id, "p10");
|
||||
assert_eq!(expected_version, 2);
|
||||
assert_eq!(owner.as_deref(), Some("grok-tui"));
|
||||
assert_eq!(new_text, None, "newText absent → None");
|
||||
}
|
||||
_ => panic!("expected InterjectQueuedPrompt"),
|
||||
}
|
||||
|
||||
// interject with newText (client-edited row) carries the override.
|
||||
let p = serde_json::json!({
|
||||
"sessionId": "s1", "id": "p10", "expectedVersion": 2, "newText": "edited"
|
||||
});
|
||||
match parse_queue_edit_command("x.ai/queue/interject", &p, None) {
|
||||
Some(SessionCommand::InterjectQueuedPrompt { new_text, .. }) => {
|
||||
assert_eq!(new_text.as_deref(), Some("edited"));
|
||||
}
|
||||
_ => panic!("expected InterjectQueuedPrompt"),
|
||||
}
|
||||
|
||||
// Blank newText is dropped → degrades to the stored queue text.
|
||||
let p = serde_json::json!({
|
||||
"sessionId": "s1", "id": "p10", "expectedVersion": 2, "newText": " "
|
||||
});
|
||||
match parse_queue_edit_command("x.ai/queue/interject", &p, None) {
|
||||
Some(SessionCommand::InterjectQueuedPrompt { new_text, .. }) => {
|
||||
assert_eq!(new_text, None, "blank override must be dropped");
|
||||
}
|
||||
_ => panic!("expected InterjectQueuedPrompt"),
|
||||
}
|
||||
|
||||
// interject without expectedVersion defaults to 0.
|
||||
match parse_queue_edit_command(
|
||||
"x.ai/queue/interject",
|
||||
&serde_json::json!({ "sessionId": "s1", "id": "p11" }),
|
||||
None,
|
||||
) {
|
||||
Some(SessionCommand::InterjectQueuedPrompt {
|
||||
expected_version, ..
|
||||
}) => assert_eq!(expected_version, 0),
|
||||
_ => panic!("expected InterjectQueuedPrompt"),
|
||||
}
|
||||
|
||||
// interject without id → None (can't target an entry).
|
||||
assert!(
|
||||
parse_queue_edit_command("x.ai/queue/interject", &serde_json::json!({}), None)
|
||||
.is_none()
|
||||
);
|
||||
|
||||
// unknown method → None.
|
||||
assert!(
|
||||
parse_queue_edit_command("x.ai/queue/bogus", &serde_json::json!({}), None).is_none()
|
||||
);
|
||||
// remove without id → None (can't target an entry).
|
||||
assert!(
|
||||
parse_queue_edit_command("x.ai/queue/remove", &serde_json::json!({}), None).is_none()
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user