ChatSessionHandler now runs the root turn on the agent-loop kernel instead of run_agent_turn; sub-agents follow on the same kernel via DelegateTool. The old loop stays for resume/recovery until phase 3. agent-loop: - DelegateTool + AgentCatalog/AgentProfile (full toolset override, per-child selector/assembler, frame-scoped get), StaticCatalog, FilteredToolSet; sync flow with sticky child_token; batch via the generic fan-out - manager: start_loop skips the registry (children are not double-driving; they ride the parent's token tree); LoopParams gains selector/token overrides - store: get_frame, get_call, set_call_extras; HistoryStore result text aligned to raw-stored semantics (projection formats) - events: ApprovalRequired.request_id, AgentSpawned/Finished parent info; AskUserTool with_name + suggested_answers alias + Question.frame skald-core (loop_adapters + handler): - SkaldAssembler (byte-parity port of MessageBuilder's projection: scratchpad/summary/window, DTL Kimi/Anthropic injection, media, user coalescing, reasoning echo) + AgentSystemContext (prompt layers, substitutions, MCP list, shared folders, user profile) - SkaldAgentCatalog (build_sub_agent_config port), SkaldHumanChannel, scratchpad/todos tools, execute_task sync/async alias, LegacyInterfaceTool, PendingLiveInput - ApprovalGate: PendingWrite diffs via LoopEvent::Host (memory/disk routed like the fs-tools); SkaldWritePreviewHook for executed-write diffs; EventTranslator LoopEvent→ServerEvent (display meta, preview, FileChanged, AgentStart/Done, root-only Done/Truncated/Cancelled) - handle_message: builds TurnParams and drives the kernel; resume of pending tools runs first (results belong to the previous turn); ChatEvent publication stays handler-side; /stop cancels the live loop - ToolRegistry.get_tool/all_tools; def builders made pub(crate) Full workspace suite green (179 skald-core, 34 agent-loop, adapters incl.); two pre-existing doc-test failures fixed along the way.
26 lines
864 B
Rust
26 lines
864 B
Rust
use std::pin::Pin;
|
|
use std::sync::Arc;
|
|
|
|
use serde_json::Value;
|
|
|
|
/// Future returned by an [`InterfaceTool`] handler.
|
|
pub type ToolFuture = Pin<Box<dyn std::future::Future<Output = anyhow::Result<String>> + Send>>;
|
|
|
|
/// A single LLM-callable tool injected by a specific interface (Telegram, Web, Cron, …).
|
|
///
|
|
/// The handler closure captures interface-specific state (e.g. `Arc<Bot>` + `ChatId`).
|
|
#[derive(Clone)]
|
|
pub struct InterfaceTool {
|
|
/// OpenAI-format tool definition sent to the LLM in the tools array.
|
|
pub definition: Value,
|
|
/// Async handler invoked when the LLM calls this tool.
|
|
pub handler: Arc<dyn Fn(Value) -> ToolFuture + Send + Sync>,
|
|
}
|
|
|
|
impl InterfaceTool {
|
|
/// Returns the tool's name as declared in the definition.
|
|
pub fn name(&self) -> &str {
|
|
self.definition["function"]["name"].as_str().unwrap_or("")
|
|
}
|
|
}
|