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,93 @@
|
||||
//! Linux system sleep/wake via systemd-logind's `PrepareForSleep` D-Bus
|
||||
//! signal, with a `delay` inhibitor lock so we get a short window to react
|
||||
//! before the system actually sleeps.
|
||||
//!
|
||||
//! Uses the `zbus` blocking API on a dedicated thread so we don't require the
|
||||
//! caller to run any particular async runtime. If the system bus or logind is
|
||||
//! unavailable (non-systemd distro, container, permission error), `start`
|
||||
//! returns `None` and the caller degrades gracefully.
|
||||
|
||||
use std::thread;
|
||||
|
||||
use super::{PowerCallback, PowerEvent};
|
||||
|
||||
const DEST: &str = "org.freedesktop.login1";
|
||||
const PATH: &str = "/org/freedesktop/login1";
|
||||
const IFACE: &str = "org.freedesktop.login1.Manager";
|
||||
|
||||
/// Linux listener handle.
|
||||
///
|
||||
/// There is intentionally no clean stop: the worker thread parks on a blocking
|
||||
/// logind signal iterator, which cannot be interrupted without a signal
|
||||
/// arriving, so dropping this neither joins nor cancels it. The thread (and its
|
||||
/// D-Bus connection + sleep-delay inhibitor fd) live until process exit. That
|
||||
/// is acceptable for the only intended use — a single process-lifetime listener
|
||||
/// whose callback holds a `Weak` ref and no-ops once the owner is gone. (macOS
|
||||
/// can `CFRunLoopStop` from `Drop` and so joins; Linux cannot — hence the
|
||||
/// asymmetry, and why there is no `Drop` impl here.)
|
||||
pub(crate) struct Listener;
|
||||
|
||||
impl Listener {
|
||||
pub(crate) fn start(callback: PowerCallback) -> Option<Self> {
|
||||
// Probe synchronously so registration failures return `None` to the
|
||||
// caller rather than dying silently on the worker thread.
|
||||
let conn = zbus::blocking::Connection::system().ok()?;
|
||||
let proxy = zbus::blocking::Proxy::new(&conn, DEST, PATH, IFACE).ok()?;
|
||||
let signals = proxy.receive_signal("PrepareForSleep").ok()?;
|
||||
|
||||
thread::Builder::new()
|
||||
.name("xai-power-listener".into())
|
||||
.spawn(move || run_thread(proxy, signals, callback))
|
||||
.ok()?;
|
||||
|
||||
Some(Self)
|
||||
}
|
||||
}
|
||||
|
||||
/// Take a `delay` sleep inhibitor: logind holds off sleep until the returned fd
|
||||
/// drops. `None` if unavailable — we then react without a pre-sleep window.
|
||||
fn take_inhibitor(proxy: &zbus::blocking::Proxy<'_>) -> Option<zbus::zvariant::OwnedFd> {
|
||||
proxy
|
||||
.call(
|
||||
"Inhibit",
|
||||
&("sleep", "grok", "Pause token refresh across sleep", "delay"),
|
||||
)
|
||||
.ok()
|
||||
}
|
||||
|
||||
fn run_thread(
|
||||
proxy: zbus::blocking::Proxy<'static>,
|
||||
signals: zbus::blocking::proxy::SignalIterator<'static>,
|
||||
callback: PowerCallback,
|
||||
) {
|
||||
// Hold the delay lock so the first PrepareForSleep(true) gives us a window.
|
||||
let mut inhibitor = take_inhibitor(&proxy);
|
||||
|
||||
for msg in signals {
|
||||
let Ok(about_to_sleep) = msg.body().deserialize::<bool>() else {
|
||||
continue;
|
||||
};
|
||||
if about_to_sleep {
|
||||
// The callback may block (bounded) waiting for an in-flight token
|
||||
// refresh to finish; the `delay` inhibitor is still held across it,
|
||||
// so that wait holds off the suspend (up to logind's
|
||||
// `InhibitDelayMaxSec`, default 5 s). Release it only once the
|
||||
// callback returns so the system can then proceed to sleep.
|
||||
callback(PowerEvent::WillSleep);
|
||||
inhibitor = None;
|
||||
} else {
|
||||
callback(PowerEvent::DidWake);
|
||||
// Re-acquire the delay lock for the next sleep cycle.
|
||||
inhibitor = take_inhibitor(&proxy);
|
||||
}
|
||||
}
|
||||
|
||||
drop(inhibitor);
|
||||
}
|
||||
|
||||
pub(crate) fn current_power_state() -> crate::PowerState {
|
||||
// Linux has no "dark wake" equivalent to query (the system is either
|
||||
// suspended or fully awake); report Unknown so callers fall back to the
|
||||
// logind `PrepareForSleep` path.
|
||||
crate::PowerState::Unknown
|
||||
}
|
||||
Reference in New Issue
Block a user