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,193 @@
|
||||
//! Resume identity validation: ensures that a resumed subagent matches the
|
||||
//! source's identity fields (type, persona).
|
||||
//!
|
||||
//! Model is not an identity gate on resume: the shell always inherits/pins the
|
||||
//! source model, and any caller-provided model override is soft-ignored.
|
||||
//!
|
||||
//! Extracted from `kigi-shell/src/agent/subagent/` resume validation block.
|
||||
|
||||
use crate::types::ResumeSourceData;
|
||||
|
||||
/// Error type for resume validation failures.
|
||||
///
|
||||
/// Each variant describes a specific identity mismatch between the resume
|
||||
/// request and the source subagent's recorded identity fields.
|
||||
#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
|
||||
pub enum ResumeValidationError {
|
||||
/// The requested subagent_type differs from the source's type.
|
||||
#[error(
|
||||
"Cannot resume with subagent_type '{requested}': source subagent was '{source_value}'. \
|
||||
Resumed sessions must use the same subagent type as the source."
|
||||
)]
|
||||
TypeMismatch {
|
||||
requested: String,
|
||||
source_value: String,
|
||||
},
|
||||
|
||||
/// The requested persona differs from the source's persona.
|
||||
#[error(
|
||||
"Cannot resume with persona '{requested}': source subagent used {source_value:?}. \
|
||||
Resumed sessions must use the same persona as the source."
|
||||
)]
|
||||
PersonaMismatch {
|
||||
requested: String,
|
||||
source_value: Option<String>,
|
||||
},
|
||||
}
|
||||
|
||||
/// Validate that a resume request's identity fields match the source subagent.
|
||||
///
|
||||
/// Resume contract: the resumed child inherits the source's raw transcript,
|
||||
/// tool state, and model. System prompt and prompt context are freshly
|
||||
/// rendered from the current agent definition. Reject type/persona overrides
|
||||
/// that conflict with the inherited identity fields. Model overrides are not
|
||||
/// validated here — callers soft-ignore them and pin the source model.
|
||||
///
|
||||
/// Returns `Ok(())` if identity fields match, or `Err(ResumeValidationError)`
|
||||
/// describing the first mismatch found.
|
||||
pub fn validate_resume_identity(
|
||||
requested_type: &str,
|
||||
requested_persona: Option<&str>,
|
||||
source: &ResumeSourceData,
|
||||
) -> Result<(), ResumeValidationError> {
|
||||
// Check subagent type match
|
||||
if requested_type != source.subagent_type {
|
||||
return Err(ResumeValidationError::TypeMismatch {
|
||||
requested: requested_type.to_string(),
|
||||
source_value: source.subagent_type.clone(),
|
||||
});
|
||||
}
|
||||
|
||||
// Check persona match (only if explicitly requested)
|
||||
if let Some(persona) = requested_persona
|
||||
&& source.persona.as_deref() != Some(persona)
|
||||
{
|
||||
return Err(ResumeValidationError::PersonaMismatch {
|
||||
requested: persona.to_string(),
|
||||
source_value: source.persona.clone(),
|
||||
});
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn make_source(
|
||||
subagent_type: &str,
|
||||
persona: Option<&str>,
|
||||
model_id: Option<&str>,
|
||||
) -> ResumeSourceData {
|
||||
ResumeSourceData {
|
||||
subagent_id: "source-id".into(),
|
||||
subagent_type: subagent_type.into(),
|
||||
persona: persona.map(String::from),
|
||||
model_id: model_id.map(String::from),
|
||||
child_cwd: "/workspace".into(),
|
||||
worktree_path: None,
|
||||
snapshot_ref: None,
|
||||
child_session_id: "child-session".into(),
|
||||
}
|
||||
}
|
||||
|
||||
// ── Matching cases ───────────────────────────────────────────
|
||||
|
||||
#[test]
|
||||
fn matching_type_no_persona() {
|
||||
let source = make_source("general-purpose", None, None);
|
||||
let result = validate_resume_identity("general-purpose", None, &source);
|
||||
assert!(result.is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn matching_type_and_persona() {
|
||||
let source = make_source("general-purpose", Some("implementer"), None);
|
||||
let result = validate_resume_identity("general-purpose", Some("implementer"), &source);
|
||||
assert!(result.is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn matching_type_and_persona_source_has_model() {
|
||||
let source = make_source("general-purpose", Some("impl"), Some("grok-3"));
|
||||
let result = validate_resume_identity("general-purpose", Some("impl"), &source);
|
||||
assert!(result.is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn no_persona_requested_source_has_persona() {
|
||||
// Not requesting a persona is always valid (no override = inherit)
|
||||
let source = make_source("general-purpose", Some("implementer"), None);
|
||||
let result = validate_resume_identity("general-purpose", None, &source);
|
||||
assert!(result.is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn source_model_is_not_validated() {
|
||||
// Model is not an identity gate; source model is used only for pinning.
|
||||
let source = make_source("general-purpose", None, Some("grok-3"));
|
||||
let result = validate_resume_identity("general-purpose", None, &source);
|
||||
assert!(result.is_ok());
|
||||
}
|
||||
|
||||
// ── Mismatching cases ────────────────────────────────────────
|
||||
|
||||
#[test]
|
||||
fn type_mismatch_rejected() {
|
||||
let source = make_source("general-purpose", None, None);
|
||||
let result = validate_resume_identity("explore", None, &source);
|
||||
assert!(matches!(
|
||||
result,
|
||||
Err(ResumeValidationError::TypeMismatch { .. })
|
||||
));
|
||||
let err = result.unwrap_err();
|
||||
assert!(err.to_string().contains("explore"));
|
||||
assert!(err.to_string().contains("general-purpose"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn persona_mismatch_rejected() {
|
||||
let source = make_source("general-purpose", Some("implementer"), None);
|
||||
let result = validate_resume_identity("general-purpose", Some("reviewer"), &source);
|
||||
assert!(matches!(
|
||||
result,
|
||||
Err(ResumeValidationError::PersonaMismatch { .. })
|
||||
));
|
||||
let err = result.unwrap_err();
|
||||
assert!(err.to_string().contains("reviewer"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn persona_requested_but_source_had_none() {
|
||||
let source = make_source("general-purpose", None, None);
|
||||
let result = validate_resume_identity("general-purpose", Some("implementer"), &source);
|
||||
assert!(matches!(
|
||||
result,
|
||||
Err(ResumeValidationError::PersonaMismatch { .. })
|
||||
));
|
||||
}
|
||||
|
||||
// ── Validation order ─────────────────────────────────────────
|
||||
|
||||
#[test]
|
||||
fn type_mismatch_checked_before_persona() {
|
||||
let source = make_source("general-purpose", Some("impl"), None);
|
||||
let result = validate_resume_identity("explore", Some("reviewer"), &source);
|
||||
// Should be TypeMismatch, not PersonaMismatch
|
||||
assert!(matches!(
|
||||
result,
|
||||
Err(ResumeValidationError::TypeMismatch { .. })
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn persona_mismatch_still_rejected_when_source_has_model() {
|
||||
let source = make_source("general-purpose", Some("impl"), Some("grok-3"));
|
||||
let result = validate_resume_identity("general-purpose", Some("reviewer"), &source);
|
||||
assert!(matches!(
|
||||
result,
|
||||
Err(ResumeValidationError::PersonaMismatch { .. })
|
||||
));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user