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,331 @@
|
||||
//! Minimal-mode sign-in rendering for the live region.
|
||||
//!
|
||||
//! Before any agent session exists (unauthenticated / folder-trust pending) the
|
||||
//! minimal live region shows the sign-in flow itself — device or external-command
|
||||
//! flow, a sign-in error, or a brief "starting" transient once authenticated —
|
||||
//! since minimal has no welcome screen. [`draw_live`](super::live::draw_live)
|
||||
//! computes a [`MinimalAuthHint`] from the app's [`AuthState`] and renders it via
|
||||
//! [`render_auth`].
|
||||
|
||||
use ratatui::buffer::Buffer;
|
||||
use ratatui::layout::Rect;
|
||||
use ratatui::style::{Color, Modifier, Style};
|
||||
use ratatui::text::{Line, Span};
|
||||
|
||||
use kigi_tui::app::app_view::AuthState;
|
||||
use kigi_tui::theme::Theme;
|
||||
|
||||
/// What the minimal live region shows when there is no active agent yet: the
|
||||
/// in-region sign-in flow (device or external-command), a sign-in error, or a
|
||||
/// brief "starting" transient once authenticated. Computed from [`AuthState`]
|
||||
/// before the draw closure so the closure can own it.
|
||||
pub(super) enum MinimalAuthHint {
|
||||
/// Interactive sign-in underway — show the URL (when known) and the device
|
||||
/// code (when the URL carries one). Covers device flow and the external
|
||||
/// command flow (where the provider opens its own browser; `url` may be
|
||||
/// `None`).
|
||||
SigningIn {
|
||||
url: Option<String>,
|
||||
code: Option<String>,
|
||||
},
|
||||
/// The last sign-in attempt failed; show the error.
|
||||
Failed(String),
|
||||
/// Authenticated — the session is being created (brief transient).
|
||||
Starting,
|
||||
}
|
||||
|
||||
/// Map the app's [`AuthState`] to what the no-agent live region should show.
|
||||
pub(super) fn minimal_auth_hint(auth: &AuthState) -> MinimalAuthHint {
|
||||
match auth {
|
||||
AuthState::Authenticating { auth_url, .. } => MinimalAuthHint::SigningIn {
|
||||
url: auth_url.clone(),
|
||||
code: auth_url
|
||||
.as_deref()
|
||||
.and_then(device_user_code)
|
||||
.map(str::to_owned),
|
||||
},
|
||||
AuthState::Pending { error: Some(err) } => MinimalAuthHint::Failed(err.clone()),
|
||||
// Login is starting (auto-triggered at startup) — the URL arrives via
|
||||
// AuthUrlReady, which flips us to `Authenticating`.
|
||||
AuthState::Pending { error: None } => MinimalAuthHint::SigningIn {
|
||||
url: None,
|
||||
code: None,
|
||||
},
|
||||
AuthState::Done => MinimalAuthHint::Starting,
|
||||
}
|
||||
}
|
||||
|
||||
/// Parse the device-flow `user_code` from a verification URL (`None` if absent
|
||||
/// or malformed). Mirrors `views::welcome::extract_user_code`, kept local so
|
||||
/// minimal does not depend on welcome-screen internals.
|
||||
fn device_user_code(url: &str) -> Option<&str> {
|
||||
let code = url
|
||||
.split('?')
|
||||
.nth(1)?
|
||||
.split('&')
|
||||
.find_map(|kv| kv.strip_prefix("user_code="))?;
|
||||
(!code.is_empty() && code.chars().all(|c| c.is_ascii_alphanumeric() || c == '-'))
|
||||
.then_some(code)
|
||||
}
|
||||
|
||||
/// Write `line` at row `y` (when it fits) and return the next row.
|
||||
fn put_line(buf: &mut Buffer, area: Rect, y: u16, bottom: u16, line: Line<'_>) -> u16 {
|
||||
if y < bottom {
|
||||
buf.set_line(area.x, y, &line, area.width);
|
||||
y + 1
|
||||
} else {
|
||||
y
|
||||
}
|
||||
}
|
||||
|
||||
/// Write `url` character-by-character across as many rows as it needs (no
|
||||
/// wrap-inserted spaces), so the terminal's native selection copies it verbatim
|
||||
/// — minimal has no mouse capture, so copy is the terminal's job. Returns the
|
||||
/// next free row.
|
||||
fn render_url(
|
||||
buf: &mut Buffer,
|
||||
area: Rect,
|
||||
start_y: u16,
|
||||
bottom: u16,
|
||||
url: &str,
|
||||
style: Style,
|
||||
) -> u16 {
|
||||
let width = area.width.max(1);
|
||||
// Snapshot the buffer bounds as values so the `&Rect` borrow doesn't outlive
|
||||
// the mutable cell writes below.
|
||||
let (max_x, max_y) = {
|
||||
let a = buf.area();
|
||||
(a.right(), a.bottom())
|
||||
};
|
||||
let mut col = 0u16;
|
||||
let mut y = start_y;
|
||||
for ch in url.chars() {
|
||||
// Skip control chars to prevent terminal escape injection.
|
||||
if ch.is_control() {
|
||||
continue;
|
||||
}
|
||||
if col >= width {
|
||||
col = 0;
|
||||
y = y.saturating_add(1);
|
||||
}
|
||||
if y >= bottom {
|
||||
return bottom;
|
||||
}
|
||||
let x = area.x + col;
|
||||
if x < max_x && y < max_y {
|
||||
buf[(x, y)].set_char(ch).set_style(style);
|
||||
}
|
||||
col += 1;
|
||||
}
|
||||
y.saturating_add(1)
|
||||
}
|
||||
|
||||
/// Render the sign-in flow (or transient status) in the live region when no
|
||||
/// agent exists yet. Top-aligned in `area`; clips to its height.
|
||||
pub(super) fn render_auth(buf: &mut Buffer, area: Rect, theme: &Theme, hint: &MinimalAuthHint) {
|
||||
if area.width == 0 || area.height == 0 {
|
||||
return;
|
||||
}
|
||||
let bottom = area.y + area.height;
|
||||
let mut y = area.y;
|
||||
let gray = theme.muted().bg(Color::Reset);
|
||||
let bold = Style::default()
|
||||
.fg(theme.text_primary)
|
||||
.add_modifier(Modifier::BOLD)
|
||||
.bg(Color::Reset);
|
||||
|
||||
match hint {
|
||||
MinimalAuthHint::SigningIn { url, code } => {
|
||||
y = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(Span::styled("Sign in to Grok", bold)),
|
||||
);
|
||||
y = put_line(buf, area, y, bottom, Line::default());
|
||||
match url {
|
||||
Some(url) => {
|
||||
y = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(Span::styled(
|
||||
"Open this URL in your browser to approve:",
|
||||
gray,
|
||||
)),
|
||||
);
|
||||
y = render_url(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
url,
|
||||
Style::default().fg(theme.accent_user).bg(Color::Reset),
|
||||
);
|
||||
if let Some(code) = code {
|
||||
y = put_line(buf, area, y, bottom, Line::default());
|
||||
y = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(vec![
|
||||
Span::styled("Code: ", gray),
|
||||
Span::styled(code.clone(), bold),
|
||||
]),
|
||||
);
|
||||
}
|
||||
y = put_line(buf, area, y, bottom, Line::default());
|
||||
let _ = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(Span::styled("Waiting for approval\u{2026}", gray)),
|
||||
);
|
||||
}
|
||||
None => {
|
||||
let _ = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(Span::styled(
|
||||
"Opening your browser to sign in\u{2026}",
|
||||
gray,
|
||||
)),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
MinimalAuthHint::Failed(err) => {
|
||||
let warn = Style::default()
|
||||
.fg(theme.warning)
|
||||
.add_modifier(Modifier::BOLD)
|
||||
.bg(Color::Reset);
|
||||
y = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(Span::styled("Sign-in failed", warn)),
|
||||
);
|
||||
y = put_line(buf, area, y, bottom, Line::default());
|
||||
let _ = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(Span::styled(err.clone(), gray)),
|
||||
);
|
||||
}
|
||||
MinimalAuthHint::Starting => {
|
||||
let _ = put_line(
|
||||
buf,
|
||||
area,
|
||||
y,
|
||||
bottom,
|
||||
Line::from(Span::styled(
|
||||
"Signing in\u{2026} starting your session.",
|
||||
gray,
|
||||
)),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn device_user_code_parses_verification_url() {
|
||||
assert_eq!(
|
||||
device_user_code("https://accounts.x.ai/oauth2/device?user_code=ABCD-EFGH"),
|
||||
Some("ABCD-EFGH")
|
||||
);
|
||||
assert_eq!(
|
||||
device_user_code("https://accounts.x.ai/oauth2/device"),
|
||||
None
|
||||
);
|
||||
assert_eq!(device_user_code("https://x/device?other=1"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn auth_hint_maps_auth_state() {
|
||||
use kigi_tui::app::app_view::AuthMode;
|
||||
|
||||
// Device flow → SigningIn carrying the URL and the parsed code.
|
||||
let st = AuthState::Authenticating {
|
||||
request_seq: 1,
|
||||
handle: None,
|
||||
auth_url: Some("https://accounts.x.ai/device?user_code=ABCD-EFGH".into()),
|
||||
mode: AuthMode::Device,
|
||||
};
|
||||
match minimal_auth_hint(&st) {
|
||||
MinimalAuthHint::SigningIn { url, code } => {
|
||||
assert_eq!(
|
||||
url.as_deref(),
|
||||
Some("https://accounts.x.ai/device?user_code=ABCD-EFGH")
|
||||
);
|
||||
assert_eq!(code.as_deref(), Some("ABCD-EFGH"));
|
||||
}
|
||||
_ => panic!("expected SigningIn"),
|
||||
}
|
||||
|
||||
// External command flow with no code → SigningIn, URL but no code.
|
||||
let st = AuthState::Authenticating {
|
||||
request_seq: 2,
|
||||
handle: None,
|
||||
auth_url: Some("https://provider.example/login".into()),
|
||||
mode: AuthMode::Command,
|
||||
};
|
||||
match minimal_auth_hint(&st) {
|
||||
MinimalAuthHint::SigningIn { url, code } => {
|
||||
assert_eq!(url.as_deref(), Some("https://provider.example/login"));
|
||||
assert!(code.is_none());
|
||||
}
|
||||
_ => panic!("expected SigningIn"),
|
||||
}
|
||||
|
||||
assert!(matches!(
|
||||
minimal_auth_hint(&AuthState::Done),
|
||||
MinimalAuthHint::Starting
|
||||
));
|
||||
assert!(matches!(
|
||||
minimal_auth_hint(&AuthState::Pending {
|
||||
error: Some("nope".into())
|
||||
}),
|
||||
MinimalAuthHint::Failed(_)
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn render_auth_shows_url_and_code() {
|
||||
let theme = Theme::current();
|
||||
let area = Rect::new(0, 0, 80, 12);
|
||||
let mut buf = Buffer::empty(area);
|
||||
let hint = MinimalAuthHint::SigningIn {
|
||||
url: Some("https://accounts.x.ai/device?user_code=ABCD-EFGH".into()),
|
||||
code: Some("ABCD-EFGH".into()),
|
||||
};
|
||||
render_auth(&mut buf, area, &theme, &hint);
|
||||
let mut text = String::new();
|
||||
for y in 0..area.height {
|
||||
for x in 0..area.width {
|
||||
if let Some(c) = buf.cell((x, y)) {
|
||||
text.push_str(c.symbol());
|
||||
}
|
||||
}
|
||||
}
|
||||
assert!(text.contains("Sign in to Grok"), "header: {text:?}");
|
||||
assert!(text.contains("accounts.x.ai/device"), "url: {text:?}");
|
||||
assert!(text.contains("ABCD-EFGH"), "device code: {text:?}");
|
||||
assert!(
|
||||
text.contains("Waiting for approval"),
|
||||
"waiting line: {text:?}"
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user