Parallel agent batch. All five tasks delivered functional + tested.
NOT deployed — user is in live conversation with the bot.
## Crates added (2 new)
### kei-contacts-google (466 LOC, 5 tests)
Thin Google People API client. Takes pre-acquired access_token from
kei-auth-google's OAuth flow; calls /v1/people/me/connections?personFields=...,
parses 200-entry first page (TODO: pagination via nextPageToken), maps
to kei_social_store::Person. Errors: Http / Auth(401) / Parse.
### kei-contacts-apple (593 LOC, 7 tests + 1 doc-test)
CardDAV client for iCloud Contacts using Basic Auth (Apple ID +
app-specific password). Sends REPORT with addressbook-query XML body,
parses multistatus → embedded vCards → AppleContact. Tiny vCard
parser (~150 LOC) handles FN/N/EMAIL/TEL/ORG/NOTE/UID, single-line
only (no line-folding for MVP). Discovery (PROPFIND .well-known/carddav
→ principal → addressbook-home-set) deferred — user supplies
addressbook URL via with_addressbook_url().
Both crates registered in workspace members.
## kei-buddy crate additions
### src/topic_classify.rs (116 LOC, 3 tests)
Free fn classify_and_store_topic(extractor, topics, chat_id, text)
called from process_text when state == OnboardState::Ready. Builds
classifier prompt → LLM → parses {slug, title} → validates slug
shape (kebab-case, ascii) → Topics::add_topic + add_digest. All
failure paths log + return; conversation never blocks.
### src/tick.rs (188 LOC, 3 integration tests) + src/bin/kei-buddy-tick.rs (67 LOC)
Second binary. Oneshot CLI for systemd timer: walks all known
chat_ids in BuddyStore → lists topics → searches recent chat
messages per topic (configurable window/limit) → LLM digest →
Topics::add_digest. Outputs JSON TickReport to stdout. Env-driven
config. NoOpExtractor fallback when no LLM creds (graceful degradation).
### src/commands.rs (146 LOC) + src/command_exec.rs (111 LOC, 7 tests)
Slash-commands intercepted BEFORE handle_step in process_text:
/whois <name> contacts.search_contacts + common_connections for hits
/find <q> chat_log.search scoped to chat_id
/topics topics.list_topics
/contacts contacts.search_contacts("", 10)
/help static usage text (Russian)
If command parsed, response built from stores, sent, logged to
chat_log — FSM skipped for that turn.
### src/serve_runner.rs (69 LOC) — refactor
run_serve + start_listener + init_tracing extracted out of serve.rs
to bring serve.rs back to 189 LOC (was 248 after previous wave).
### Wiring
BuddyContext gains `contacts: Arc<Contacts>` and `topics: Arc<Topics>`.
ServeConfig gains contacts_db_path + topics_db_path. Binary reads
KEI_BUDDY_CONTACTS_DB_PATH + KEI_BUDDY_TOPICS_DB_PATH env (defaults
./kei-buddy-contacts.db, ./kei-buddy-topics.db). cmd_migrate applies
schema for all three side-stores (chat_log + contacts + topics).
## Verify-before-commit (RULE 0.13 §)
* cargo check -p kei-buddy (default + extractor-openai): PASS
* cargo test -p kei-buddy --lib: 41 passed / 0 failed (was 31)
* cargo test -p kei-buddy --tests: 3 passed (tick integration)
* cargo build -p kei-buddy --features extractor-openai: PASS
(builds both kei-buddy + kei-buddy-tick binaries)
* cargo check -p kei-contacts-google: PASS (5 tests)
* cargo check -p kei-contacts-apple: PASS (7 + 1 doc)
* cargo check --workspace: PASS
## STATUS-TRUTH from all 5 agents: shipped=functional, behaviour-verified=yes
## Follow-up (deferred, non-blocking)
* Google People API pagination (nextPageToken loop) — first 200 only
* CardDAV auto-discovery (PROPFIND .well-known/carddav)
* vCard line-folding (RFC 6350 §3.2)
* Wire kei-contacts-google + kei-contacts-apple → Contacts.add_contact
sync command (no glue yet)
* systemd timer file for kei-buddy-tick (not shipped here — config only)
69 lines
2.5 KiB
Rust
69 lines
2.5 KiB
Rust
// SPDX-License-Identifier: Apache-2.0
|
|
//! `run_serve` — store construction + HTTP listener bootstrap.
|
|
//! Extracted from serve.rs to keep both files ≤ 200 LOC.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use serde_json::json;
|
|
use tracing::warn;
|
|
|
|
use crate::{
|
|
chat_log::ChatLog,
|
|
contacts::Contacts,
|
|
extractor::LlmExtractor,
|
|
serve::{BuddyContext, ServeConfig},
|
|
store::SqliteBuddyStore,
|
|
topics::Topics,
|
|
};
|
|
|
|
/// Start the HTTP server (entry-point called from the binary).
|
|
pub async fn run_serve(cfg: ServeConfig) -> anyhow::Result<()> {
|
|
init_tracing();
|
|
let store = Arc::new(SqliteBuddyStore::from_path(&cfg.db_path)?);
|
|
let allowed_chat_ids = Arc::new(cfg.allowed_chat_ids);
|
|
let http = reqwest::Client::new();
|
|
let chat_log = Arc::new(ChatLog::from_path(&cfg.chat_log_db_path)?);
|
|
let topics = Arc::new(Topics::from_path(&cfg.topics_db_path)?);
|
|
let contacts = Arc::new(Contacts::from_path(&cfg.contacts_db_path)?);
|
|
|
|
#[cfg(feature = "extractor-openai")]
|
|
{
|
|
if let (Some(proxy), Some(key)) = (cfg.llm_proxy_url, cfg.llm_api_key) {
|
|
let model = cfg.llm_model.unwrap_or_else(|| "gpt-4o-mini".to_string());
|
|
tracing::info!(model = %model, "using OpenAiExtractor (LiteLLM-compatible)");
|
|
let extractor = Arc::new(crate::extractor::openai::OpenAiExtractor::new_with_model(
|
|
proxy, key, model,
|
|
));
|
|
return start_listener(cfg.port, BuddyContext {
|
|
secret: cfg.webhook_secret,
|
|
bot_token: cfg.bot_token,
|
|
store, extractor, http, allowed_chat_ids, chat_log, topics, contacts,
|
|
}).await;
|
|
}
|
|
}
|
|
|
|
warn!("no LLM extractor configured — using MockExtractor");
|
|
let extractor = Arc::new(crate::extractor::MockExtractor::new(json!({})));
|
|
start_listener(cfg.port, BuddyContext {
|
|
secret: cfg.webhook_secret,
|
|
bot_token: cfg.bot_token,
|
|
store, extractor, http, allowed_chat_ids, chat_log, topics, contacts,
|
|
}).await
|
|
}
|
|
|
|
async fn start_listener<E>(port: u16, ctx: BuddyContext<E>) -> anyhow::Result<()>
|
|
where
|
|
E: LlmExtractor + Send + Sync + 'static,
|
|
{
|
|
let router = crate::serve::build_router(ctx);
|
|
let addr = format!("0.0.0.0:{}", port);
|
|
let listener = tokio::net::TcpListener::bind(&addr).await?;
|
|
tracing::info!(addr = %addr, "kei-buddy listening");
|
|
axum::serve(listener, router).await?;
|
|
Ok(())
|
|
}
|
|
|
|
fn init_tracing() {
|
|
use tracing_subscriber::{fmt, EnvFilter};
|
|
let _ = fmt().with_env_filter(EnvFilter::from_default_env()).try_init();
|
|
}
|