The PRD's first acceptance gate now holds: grep -RinE '\bx\.ai\b|grok' crates/ --include='*.rs' → 0 matches (exempt: NOTICE and third-party license archives, README provenance, and the required 'Based on Grok Build Open Source' attribution, now sourced from version_attribution.txt). Wire-visible renames (both sides in this repo, changed in lockstep): - Auth method id 'grok.com' → 'kimi-code' (AuthMethodKind::KimiCode). - Every x.ai/* and _x.ai/* ACP ext method and meta key → kigi/* / _kigi/* (~200 names; grokShell → kigiShell). Session-file replay keeps a read-side alias for the legacy '_x.ai/session/update' method so existing updates.jsonl histories load; writes emit only the new name (both directions test-pinned). - Agent types grok-build* → kigi* with a documented legacy-prefix alias at resolution time so persisted sessions keep resolving. - ToolNamespace/BuiltinAgentName GrokBuild* → Kigi* (wire snake_case kigi/kigi_concise/kigi_hashline; schema regenerated); grok_build implementation dirs renamed to kigi*. - x-grok-* headers → x-kigi-*, __GROK_* sentinels → __KIGI_*, themes grokday/groknight → kigiday/kiginight (old persisted values fall back to the default theme), web_fetch allowlist xAI hosts → kimi.com + moonshot platforms, changelog CDN → this repo, grok-build changelog archives deleted. - BYOK default endpoint removed: [endpoints] api_base_url is now truly optional with NO default — consumers fail fast with the flag name when unset (no silent x.ai egress). Mock harnesses inject it explicitly. - System-prompt identity fixed: 'released by xAI' → 'an unofficial community CLI for Kimi' (template + regenerated encrypted form). Also repaired pre-existing grok-era test debt found by the sweep: the stale trace_classify default-model pin, the grok-pager UA label test, pty-harness stale-binary reuse and non-hermetic moonshot routing (a PTY test could previously reach the real api.moonshot.cn), and the outdated oauth fixture scope key. Gates: §9 grep 0; fmt clean; workspace check/clippy 0/0 (-D warnings); FULL cargo test --workspace: 234 suites, 21,961 passed, 0 failed; deny advisories ok.
184 lines
7.6 KiB
Rust
184 lines
7.6 KiB
Rust
//! Data abstraction — the `CompactionItem` seam.
|
|
//!
|
|
//! The shared compaction algorithms operate over a sequence of *items*
|
|
//! (turns/messages) without knowing the concrete harness type. The chat
|
|
//! harness implements [`CompactionItem`] for its `KigiTurn`;
|
|
//! kigi implements it for `kigi_sampling_types::ConversationItem`.
|
|
//!
|
|
//! Keeping the contract minimal is deliberate: the algorithms only need
|
|
//! enough structure to (a) classify roles, (b) read text, and (c) preserve
|
|
//! the tool-request/tool-result pairing invariant when selecting a split
|
|
//! point (an `Assistant(tool_request)` and the `Tool` results that satisfy
|
|
//! it must never be separated, or the model API rejects the orphaned tool
|
|
//! results with a 400).
|
|
//!
|
|
//! [`CompactionItemBuilder`] is the *constructive* extension used by the
|
|
//! history-compaction algorithms that need to rebuild items (strip prior
|
|
//! `<kigi_user_queries>` blocks, drop tool content from assistant turns,
|
|
//! wrap an LLM summary into a carrier item).
|
|
|
|
/// Harness-agnostic role of a single conversation item.
|
|
///
|
|
/// This is the common denominator of `KigiRole` (Kigi chat) and the
|
|
/// `ConversationItem` variants (kigi).
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum CompactionRole {
|
|
/// System prompt.
|
|
System,
|
|
/// Developer prompt (Kigi chat) — maps to System on harnesses without a
|
|
/// distinct developer role.
|
|
Developer,
|
|
/// A user message.
|
|
User,
|
|
/// An assistant output (may carry tool requests).
|
|
Assistant,
|
|
/// A tool result.
|
|
Tool,
|
|
}
|
|
|
|
/// A file attached to a user item, as seen by the shared user-query
|
|
/// extraction (`<kigi_file id=".." name=".." />` lines in the
|
|
/// `<kigi_user_queries>` preamble).
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct CompactionFileRef {
|
|
/// Stable unique id of the attachment source.
|
|
pub id: String,
|
|
/// Human-readable file name.
|
|
pub name: String,
|
|
}
|
|
|
|
/// Contract: one turn/item in a conversation, as seen by the shared
|
|
/// compaction algorithms.
|
|
///
|
|
/// Implementors:
|
|
/// - Kigi chat: `KigiTurn`
|
|
/// - kigi: `ConversationItem`
|
|
pub trait CompactionItem {
|
|
/// The harness-agnostic role of this item.
|
|
fn role(&self) -> CompactionRole;
|
|
|
|
/// The item's text content, if any. Tool results and assistant tool-only
|
|
/// turns may have no text.
|
|
///
|
|
/// Returns an owned `String` because some harnesses (Kigi chat's
|
|
/// `KigiTurn`) compute the flattened text on demand rather than storing a
|
|
/// borrowable slice.
|
|
fn text(&self) -> Option<String>;
|
|
|
|
/// Whether this item is a tool result. Used by the split-point selector to
|
|
/// avoid orphaning tool results from their originating assistant turn.
|
|
fn is_tool_result(&self) -> bool {
|
|
matches!(self.role(), CompactionRole::Tool)
|
|
}
|
|
|
|
/// Whether this (assistant) item carries at least one tool request.
|
|
/// `false` for all non-assistant items.
|
|
fn has_tool_requests(&self) -> bool;
|
|
|
|
/// Whether this item carries a *prior compaction summary* (Kigi chat: a
|
|
/// `Developer` turn with `DeveloperPromptCategory::ConversationCompaction`).
|
|
///
|
|
/// The basic history filter keeps such items so earlier summaries get
|
|
/// re-summarised instead of dropped, and `separate_prior_user_queries`
|
|
/// strips their `<kigi_user_queries>` blocks before sampling.
|
|
///
|
|
/// Required (no default) on purpose: a forgotten implementation or a
|
|
/// missed `Arc` forwarding would silently drop prior summaries on
|
|
/// re-compaction.
|
|
fn is_compaction_summary(&self) -> bool;
|
|
|
|
/// File attachments on a (user) item, for the `<kigi_file>` lines in the
|
|
/// `<kigi_user_queries>` preamble. Empty for items without attachments.
|
|
///
|
|
/// Required (no default) for the same reason as
|
|
/// [`Self::is_compaction_summary`]: silent attachment loss on compaction
|
|
/// must be a compile error, not a runtime surprise.
|
|
fn attachment_refs(&self) -> Vec<CompactionFileRef>;
|
|
}
|
|
|
|
/// Constructive extension of [`CompactionItem`] for algorithms that rebuild
|
|
/// items (history filtering and summary-carrier construction).
|
|
///
|
|
/// Not object-safe (`compaction_summary_item` has no receiver) — always used
|
|
/// through generics, never as `dyn`.
|
|
pub trait CompactionItemBuilder: CompactionItem + Clone {
|
|
/// Construct the item that carries a compaction summary back into the
|
|
/// conversation (Kigi chat: a `Developer` turn with category
|
|
/// `ConversationCompaction`). The result must satisfy
|
|
/// `is_compaction_summary() == true`.
|
|
fn compaction_summary_item(text: String) -> Self;
|
|
|
|
/// Rebuild this item keeping only user-visible content, dropping tool
|
|
/// requests/results (Kigi chat: keep only `Channel` contents of an
|
|
/// assistant turn). Returns `None` when nothing visible remains.
|
|
///
|
|
/// Only meaningful for `Assistant` items; the shared filters never call
|
|
/// it for other roles, but implementations should return
|
|
/// `Some(self.clone())` for them to keep the contract total.
|
|
fn strip_tool_content(&self) -> Option<Self>;
|
|
}
|
|
|
|
/// Write seam for the full-replace **assembler**
|
|
/// ([`crate::code_compaction::assemble::assemble_compacted_history`]):
|
|
/// constructs the typed harness items that make up kigi's rebuilt
|
|
/// history.
|
|
///
|
|
/// This is a sibling of [`CompactionItemBuilder`], not a part of it, on
|
|
/// purpose. `CompactionItemBuilder` is already implemented by Kigi chat's
|
|
/// `KigiTurn`; adding these constructors to it as required methods would break
|
|
/// that impl. They are also kigi-specific (Kigi chat's tail-keep path
|
|
/// has no `user_meta` / `project_instructions` / `system_reminder` carrier
|
|
/// concept), so they live in their own seam that only the full-replace
|
|
/// assembler depends on.
|
|
///
|
|
/// The kigi implementor (`ConversationItem`) maps each constructor to the
|
|
/// matching factory so the `SyntheticReason` tags the replay / spawn-time
|
|
/// idempotence guards rely on are preserved.
|
|
pub trait CompactionItemFactory: Sized {
|
|
/// A real user message (used for the last user query).
|
|
fn new_user(text: String) -> Self;
|
|
/// A synthetic user message carrying compaction metadata (user-info
|
|
/// prefix, summary carrier).
|
|
fn new_user_meta(text: String) -> Self;
|
|
/// A user message carrying project instructions (AGENTS.md), tagged so
|
|
/// spawn-time idempotence guards recognize it on resume.
|
|
fn new_project_instructions(text: String) -> Self;
|
|
/// A synthetic user message carrying a `<system-reminder>` block.
|
|
fn new_system_reminder(text: String) -> Self;
|
|
}
|
|
|
|
/// Forward [`CompactionItem`] through shared references so the algorithms can
|
|
/// operate over `&[Arc<T>]` (Kigi chat stores turns as `Arc<KigiTurn>`).
|
|
impl<T: CompactionItem + ?Sized> CompactionItem for std::sync::Arc<T> {
|
|
fn role(&self) -> CompactionRole {
|
|
(**self).role()
|
|
}
|
|
fn text(&self) -> Option<String> {
|
|
(**self).text()
|
|
}
|
|
fn is_tool_result(&self) -> bool {
|
|
(**self).is_tool_result()
|
|
}
|
|
fn has_tool_requests(&self) -> bool {
|
|
(**self).has_tool_requests()
|
|
}
|
|
fn is_compaction_summary(&self) -> bool {
|
|
(**self).is_compaction_summary()
|
|
}
|
|
fn attachment_refs(&self) -> Vec<CompactionFileRef> {
|
|
(**self).attachment_refs()
|
|
}
|
|
}
|
|
|
|
/// Forward [`CompactionItemBuilder`] through `Arc` — rebuilt items are
|
|
/// wrapped in a fresh `Arc`, untouched items are *not* deep-cloned (the
|
|
/// shared filters clone the `Arc` pointer directly).
|
|
impl<T: CompactionItemBuilder> CompactionItemBuilder for std::sync::Arc<T> {
|
|
fn compaction_summary_item(text: String) -> Self {
|
|
std::sync::Arc::new(T::compaction_summary_item(text))
|
|
}
|
|
fn strip_tool_content(&self) -> Option<Self> {
|
|
(**self).strip_tool_content().map(std::sync::Arc::new)
|
|
}
|
|
}
|