1e9ce21c2a
Three atomics finish phase 3 of kei-buddy contacts integration:
## kei-buddy: contact-sync glue + slash commands (+5 tests)
New src/contacts_sync.rs (146 LOC):
* SyncReport { fetched, added, skipped, errors }
* sync_from_google(access_token, contacts) — builds GooglePeopleClient,
list_connections, dedups by (name+email) via search_contacts,
add_contact in loop
* sync_from_apple(apple_id, app_pw, addressbook_url, contacts) — same
pattern over ICloudCardDavClient.list_contacts
* All errors collected into report.errors; never panics, never propagates
New slash commands in commands.rs / command_exec.rs:
* /sync-google — reads GOOGLE_OAUTH_ACCESS_TOKEN env, calls sync_from_google,
Russian-formatted summary "Google: загружено N, добавлено M, пропущено K"
* /sync-apple — reads APPLE_ID + APPLE_APP_PASSWORD + APPLE_CARDDAV_URL,
calls sync_from_apple
* Missing env → human-readable "не настроено: …" response
* /help text updated
Deps added: kei-contacts-google + kei-contacts-apple as path deps.
## kei-contacts-google: pagination via nextPageToken (+1 test)
Refactor: client.rs 182→56 LOC; pagination logic + deserialization moved
to new src/pagination.rs (188 LOC). list_connections unchanged
(back-compat, returns first page only). New list_all_connections loops
via fetch_page(Some(token)) until token=None; hard cap 50 pages with
tracing::warn on cap.
Test list_all_connections_two_pages: wiremock returns page 1 with
nextPageToken="abc" + page 2 without; assert len = sum AND second
request carries pageToken=abc query.
## kei-contacts-apple: vCard line-folding + CardDAV auto-discovery (+2 tests)
vcard.rs +unfold() helper applied in parse_vcard per RFC 6350 §3.2:
continuation lines starting with space/tab strip the prefix and append
to previous line. Test parse_folded_vcard.
New src/discovery.rs (199 LOC): discover_addressbook() walks
.well-known/carddav → current-user-principal → addressbook-home-set →
first addressbook with C:addressbook resourcetype. Three PROPFIND
requests with canned XML bodies. Regex-based extract_first_href_under +
extract_addressbook_href helpers. Test discover_walks_three_propfinds
against 3-step wiremock fixture.
client.rs adds discover_addressbook_url() method calling discovery.
## Verify-before-commit
* cargo check --workspace: PASS
* cargo test -p kei-buddy --lib: 46/0 (was 41)
* cargo test -p kei-contacts-google: 5/0 (was 4, +1 pagination)
* cargo test -p kei-contacts-apple: 9/0 (was 7, +1 folding +1 discovery)
NOT deployed — user still in live conversation with bot.
Follow-up (deferred, non-blocking):
* Real iCloud smoke test for discover_addressbook_url — regex parser
may need adjustment for deeply-nested namespace prefixes
* Wiremock-backed integration test for sync_from_google glue (HTTP
layer already covered in kei-contacts-google tests)
50 lines
1.6 KiB
Rust
50 lines
1.6 KiB
Rust
// SPDX-License-Identifier: Apache-2.0
|
|
//! kei-buddy — KeiBuddy personal-assistant Telegram bot scaffold.
|
|
//!
|
|
//! Module layout (Constructor Pattern — one file, one responsibility):
|
|
//! * `state` — `OnboardState` enum
|
|
//! * `transition` — `StepOutput` output struct
|
|
//! * `extractor` — `LlmExtractor` trait + `MockExtractor` + `OpenAiExtractor` (feature-gated)
|
|
//! * `machine` — `handle_step` — the 11-arm onboarding FSM
|
|
//! * `error` — `BuddyError` error type
|
|
//! * `schema` — buddy-specific SQLite DDL
|
|
//! * `store` — `BuddyStore` trait + `SqliteBuddyStore` impl
|
|
|
|
pub mod chat_log;
|
|
pub(crate) mod command_exec;
|
|
pub mod commands;
|
|
pub mod contacts;
|
|
pub mod contacts_sync;
|
|
pub mod error;
|
|
pub mod extractor;
|
|
pub mod machine;
|
|
pub(crate) mod machine_helpers;
|
|
pub mod persona_merge;
|
|
pub mod schema;
|
|
pub mod state;
|
|
pub mod store;
|
|
pub(crate) mod store_ops;
|
|
pub mod tick;
|
|
pub mod topic_classify;
|
|
pub mod topics;
|
|
pub mod transition;
|
|
|
|
#[cfg(feature = "serve")]
|
|
pub mod serve;
|
|
#[cfg(feature = "serve")]
|
|
pub(crate) mod serve_runner;
|
|
#[cfg(feature = "serve")]
|
|
pub mod serve_telegram;
|
|
|
|
pub use chat_log::ChatLog;
|
|
pub use commands::{parse_command, execute_command, Command, CommandStores};
|
|
pub use contacts_sync::{sync_from_apple, sync_from_google, SyncReport};
|
|
pub use contacts::Contacts;
|
|
pub use error::BuddyError;
|
|
pub use extractor::LlmExtractor;
|
|
pub use machine::handle_step;
|
|
pub use state::OnboardState;
|
|
pub use store::{BuddyStore, SqliteBuddyStore};
|
|
pub use tick::{run_tick, run_tick_with, TickConfig, TickReport};
|
|
pub use topics::Topics;
|
|
pub use transition::StepOutput;
|