mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-25 14:53:34 +00:00
* feat: port NPA psychographic profiling system into IronClaw
Port the complete psychographic profiling system from NPA into IronClaw,
including enriched profile schema, conversational onboarding, profile
evolution, and three-tier prompt augmentation.
Personal onboarding moved from wizard Step 9 to first assistant
interaction per maintainer feedback — the First Contact system prompt
block now instructs the LLM to conduct a natural onboarding conversation
that builds the psychographic profile via memory_write.
Changes:
- Enrich profile.rs with 5 new structs, 9-dimension analysis framework,
custom deserializers for backward compatibility, and rendering methods
- Add conversational onboarding engine with one-step-removed questioning
technique, personality framework, and confidence-scored profile generation
- Add profile evolution with confidence gating, analysis metadata tracking,
and weekly update routine
- Replace thin interaction style injection with three-tier system gated on
confidence > 0.6 and profile recency
- Replace wizard Step 9 with First Contact system prompt block that drives
conversational onboarding during the user's first interaction
- Add autonomy progression to SOUL.md seed and personality framework to
AGENTS.md seed
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat: replace chat-based onboarding with bootstrap greeting and workspace seeds
Remove the interactive onboarding_chat.rs engine in favor of a simpler
bootstrap flow: fresh workspaces get a proactive LLM greeting that
naturally profiles the user. Identity files are now seeded from
src/workspace/seeds/ instead of being hardcoded. Also removes the
identity-file write protection (seeds are now managed), adds routine
advisor integration, and includes an e2e trace for bootstrap greeting.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(safety): sanitize identity file writes via Sanitizer to prevent prompt injection
Identity files (SOUL.md, AGENTS.md, USER.md, IDENTITY.md) are injected into
every system prompt. Rather than hard-blocking writes (which broke onboarding),
scan content through the existing Sanitizer and reject writes with High/Critical
severity injection patterns. Medium/Low warnings are logged but allowed.
Also clarifies AGENTS.md identity file roles (USER.md = user info, IDENTITY.md =
agent identity) and adds IDENTITY.md setup as an explicit bootstrap step.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* docs: update profile_onboarding_completed comment to reflect current wiring
The field is now actively used by the agent loop to suppress BOOTSTRAP.md
injection — remove the stale "not yet wired" TODO.
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(setup): use env_or_override for NEARAI_API_KEY in model fetch config
When the user authenticates via NEAR AI Cloud API key (option 4),
api_key_login() stores the key via set_runtime_env(). But
build_nearai_model_fetch_config() was using std::env::var() which
doesn't check the runtime overlay — so model listing fell back to
session-token auth and re-triggered the interactive NEAR AI
authentication menu.
Switch to env_or_override() which checks both real env vars and the
runtime overlay.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(agent): correct channel/user_id in bootstrap greeting persist call
persist_assistant_response was called with channel="default",
user_id="system" but the assistant thread was created via
get_or_create_assistant_conversation("default", "gateway") which owns
the conversation as user_id="default", channel="gateway". The mismatch
caused ensure_writable_conversation to reject the write with:
WARN Rejected write for unavailable thread id user=system channel=default
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(web): remove all inline event handlers for CSP compliance
The Content-Security-Policy header (added in f48fe95) blocks inline JS
via script-src 'self'. All onclick/onchange attributes in index.html
are replaced with getElementById().addEventListener() calls. Dynamic
inline handlers in app.js (jobs, routines, memory breadcrumb, code
blocks, TEE report) are replaced with data-action attributes and a
single delegated click handler on document.
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(agent): align bootstrap message user/channel and update fixture schema field
- Bootstrap IncomingMessage now uses ("default", "gateway") consistently
with persist and session registration calls
- Update bootstrap_greeting.json fixture: schema_version → version to
match current PROFILE_JSON_SCHEMA
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* style: cargo fmt
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(safety): address PR review — expand injection scanning and harden profile sync
- BOOTSTRAP.md: fix target "profile" → "context/profile.json" so the
write hits the correct path and triggers profile sync
- IDENTITY_FILES: add context/assistant-directives.md to the scanned
set since it is also injected into the system prompt
- sync_profile_documents(): scan derived USER.md and assistant-directives
content through Sanitizer before writing, rejecting High/Critical
injection patterns
- profile_evolution_prompt(): wrap recent_messages_summary in <user_data>
delimiters with untrusted-data instruction to mitigate indirect
prompt injection
- routine-advisor skill: update cron examples from 6-field to standard
5-field format for consistency with routine_create tool docs
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* style: cargo fmt
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(setup): detect env-provided LLM keys during quick-mode onboarding
Quick-mode wizard now checks LLM_BACKEND, NEARAI_API_KEY,
ANTHROPIC_API_KEY, and OPENAI_API_KEY env vars to pre-populate
the provider setting, so users aren't re-prompted for credentials
they already supplied. Also teaches setup_nearai() to recognize
NEARAI_API_KEY from env (previously only checked session tokens).
Includes web UI cleanup (remove duplicate event listeners) and
e2e test response count adjustment.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix(test): update routine_create_list to expect 7-field normalized cron
The cron normalizer now always expands to 7-field format, so the
stored schedule is "0 0 9 * * * *" not "0 0 9 * * *".
[skip-regression-check]
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* feat(setup): skip LLM provider prompts when NEARAI_API_KEY is present
In quick mode, if NEARAI_API_KEY is set in the environment and the
backend was auto-detected as nearai, skip the interactive inference
provider and model selection steps. The API key is persisted to the
secrets store and a default model is set automatically.
Also simplify the static fallback model list for nearai to a single
default entry.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: unify default model, static bootstrap greeting, and web UI cleanup
- Add DEFAULT_MODEL const and default_models() fallback list in
llm/nearai_chat.rs; use from config, wizard, and .env.example so the
default model is defined in one place
- Restore multi-model fallback list in setup wizard (was reduced to 1)
- Move BOOTSTRAP_GREETING to module-level const (out of run() body)
- Replace LLM-based bootstrap with static greeting (persist to DB before
channels start, then broadcast — eliminates startup LLM call and race)
- Fix double env::var read for NEARAI_API_KEY in quick setup path
- Move thread sidebar buttons into threads-section-header (web UI)
- Remove orphaned .thread-sidebar-header CSS and fix double blank line
- Update bootstrap e2e test for static greeting (no LLM trace needed)
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix(safety): move prompt injection scanning into Workspace write/append
Addresses PR #927 review comments (#1, #3) — identity file write
protection and unsanitized profile fields in system prompt.
Instead of scanning at the tool layer (memory.rs) or the sync layer
(sync_profile_documents), injection scanning now lives in
Workspace::write() and Workspace::append() for all files that are
injected into the system prompt. This ensures every code path that
writes to these files is protected, including future ones.
- Add SYSTEM_PROMPT_FILES const and reject_if_injected() in workspace
- Add WorkspaceError::InjectionRejected variant
- Add map_write_err() in memory.rs to convert InjectionRejected to
ToolError::NotAuthorized
- Remove redundant IDENTITY_FILES/Sanitizer from memory.rs
- Remove redundant sanitizer calls from sync_profile_documents()
- Move sanitization tests to workspace::tests
- Existing integration test (test_memory_write_rejects_injection)
continues to pass through the new path
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* style: cargo fmt
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: address Copilot review — merge marker order, orphan thread, stale fixture
- merge_profile_section: search for END marker after BEGIN position to
avoid matching a stray END earlier in the file
- Bootstrap phase 2: use get_or_create_session + Thread::with_id instead
of resolve_thread(None) to avoid creating an orphan thread
- setup_nearai: use env_or_override for NEARAI_API_KEY consistency with
runtime overlay
- Delete orphaned bootstrap_greeting.json fixture (no test references it)
- Add test_merge_end_marker_must_follow_begin regression test
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* style: cargo fmt
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* style: fmt agent_loop.rs (CI stable rustfmt)
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: lazy-init sanitizer, check profile non-empty before skipping bootstrap
Address Copilot review:
- Use LazyLock<Sanitizer> to avoid rebuilding Aho-Corasick + regexes
on every workspace write
- has_profile check now requires non-empty content, not just file
existence, to prevent empty profile.json from suppressing onboarding
- Add seed_tests integration tests (libsql-backed) verifying:
- Empty profile.json does not suppress BOOTSTRAP.md seeding
- Non-empty profile.json correctly suppresses bootstrap for upgrades
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* style: cargo fmt
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: duplicate language handler, empty LLM_BACKEND, test_rig style
Address Copilot review on PR #927:
- Remove duplicate language-option click listeners (delegated
data-action handler already covers them)
- Guard LLM_BACKEND env prefill against empty string to prevent
suppressing API-key-based auto-detection
- Use destructured local `keep_bootstrap` instead of `self.keep_bootstrap`
in test_rig for consistency after destructure
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: update stale BOOTSTRAP.md write-protection comment [skip-regression-check]
BOOTSTRAP.md is now in SYSTEM_PROMPT_FILES and gets injection scanning
on write. The old comment incorrectly stated it was not write-protected.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: replace debug_assert panics with graceful error returns [skip-regression-check]
debug_assert! in execute_tool_with_safety and JobContext::transition_to
panicked in test builds before the graceful error path could run.
Existing tests (test_cancel_job_completed, test_execute_empty_tool_name_returns_not_found)
already cover these paths — they were the ones failing.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: address Copilot review — schema label, env var check, path normalization, profile validation
1. Label ANALYSIS_FRAMEWORK and PROFILE_JSON_SCHEMA sections separately
in bootstrap prompt so the LLM knows which blob is the target structure.
2. Wizard quick-mode backend auto-detection now rejects empty env vars
(std::env::var().is_ok_and(|v| !v.is_empty())) to avoid selecting the
wrong backend when e.g. NEARAI_API_KEY="" is set.
3. Normalize the target path before comparing with paths::PROFILE in
memory_write so non-canonical variants like "context//profile.json"
still trigger profile sync.
4. seed_if_empty now requires valid JSON parse of context/profile.json
before treating it as a populated profile. Corrupted content no longer
permanently suppresses bootstrap seeding.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* style: cargo fmt
* fix: address Copilot review — append scan, profile validation, env_or_override
1. Workspace::append() now scans the combined content (existing + new)
for prompt injection, not just the appended chunk. Prevents split-
injection evasion across multiple appends.
2. seed_if_empty() now deserializes into PsychographicProfile instead of
serde_json::Value for profile validation. Stray/legacy JSON that
doesn't match the expected schema no longer suppresses bootstrap.
3. Wizard quick-mode backend auto-detection now uses env_or_override()
to honor runtime overlays and injected secrets. LLM_BACKEND value
is trimmed before storage.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* test: add bootstrap_onboarding_clears_bootstrap E2E trace test
Exercises the full onboarding flow end-to-end:
1. Bootstrap greeting fires automatically on fresh workspace
2. User converses for 3 turns (name, tools, work style)
3. Agent writes psychographic profile to context/profile.json
4. Profile sync generates USER.md and assistant-directives.md
5. Agent writes IDENTITY.md (chosen persona)
6. Agent clears BOOTSTRAP.md via memory_write(target: "bootstrap")
Verifies:
- BOOTSTRAP.md is non-empty before onboarding, empty after
- bootstrap_completed flag is set
- Profile contains expected user data (name, profession, interests)
- USER.md contains profile-derived content (name, tone, profession)
- Assistant-directives.md references user and communication style
- IDENTITY.md contains agent's chosen persona name
- All memory_write calls succeed
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
* fix: address Copilot review — slash collapse, env_or_override, cron trim [skip-regression-check]
1. memory.rs path normalization now uses the same char-by-char loop as
Workspace::normalize_path() to fully collapse consecutive slashes
(e.g. "context///profile.json" → "context/profile.json").
2. Quick-mode NEARAI_API_KEY check (line 239) now uses env_or_override()
consistently with the backend auto-detection block above it.
3. normalize_cron_expression() trims input before field counting so the
passthrough branch (7+ fields) also strips whitespace.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
---------
Co-authored-by: Jay Zalowitz <[email protected]>
Co-authored-by: Claude Opus 4.6 <[email protected]>
375 lines
13 KiB
Rust
375 lines
13 KiB
Rust
//! TestChannel -- an in-process Channel for E2E testing.
|
|
//!
|
|
//! Injects messages into the agent loop via an mpsc sender and captures
|
|
//! responses and status events for assertion in tests.
|
|
|
|
#![allow(dead_code)] // Public API consumed by later test modules (Task 3+).
|
|
|
|
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
use std::sync::atomic::{AtomicBool, Ordering};
|
|
use std::time::{Duration, Instant};
|
|
|
|
use async_trait::async_trait;
|
|
use futures::StreamExt;
|
|
use tokio::sync::{Mutex, mpsc, oneshot};
|
|
use tokio_stream::wrappers::ReceiverStream;
|
|
|
|
use ironclaw::channels::{Channel, IncomingMessage, MessageStream, OutgoingResponse, StatusUpdate};
|
|
use ironclaw::error::ChannelError;
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// TestChannel
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/// A `Channel` implementation for injecting messages and capturing responses
|
|
/// in integration tests.
|
|
pub struct TestChannel {
|
|
/// Channel name returned by `Channel::name()`.
|
|
channel_name: String,
|
|
/// Sender half for injecting `IncomingMessage`s into the stream.
|
|
tx: mpsc::Sender<IncomingMessage>,
|
|
/// Receiver half, wrapped in Option so `start()` can take it exactly once.
|
|
rx: Mutex<Option<mpsc::Receiver<IncomingMessage>>>,
|
|
/// Captured outgoing responses.
|
|
pub responses: Arc<Mutex<Vec<OutgoingResponse>>>,
|
|
/// Captured status events.
|
|
status_events: Arc<Mutex<Vec<StatusUpdate>>>,
|
|
/// Tracks when each tool started (by name). Supports nested/overlapping tools
|
|
/// by using a Vec of start times per tool name.
|
|
tool_start_times: Arc<Mutex<HashMap<String, Vec<Instant>>>>,
|
|
/// Completed tool timings: (name, duration_ms).
|
|
tool_timings: Arc<Mutex<Vec<(String, u64)>>>,
|
|
/// Default user ID for injected messages.
|
|
user_id: String,
|
|
/// Shutdown signal: when set to `true`, signals the agent to stop.
|
|
shutdown: Arc<AtomicBool>,
|
|
/// Sender half of the ready signal, fired when `start()` is called.
|
|
ready_tx: Arc<Mutex<Option<oneshot::Sender<()>>>>,
|
|
/// Receiver half of the ready signal, taken by the test rig before awaiting.
|
|
ready_rx: Arc<Mutex<Option<oneshot::Receiver<()>>>>,
|
|
}
|
|
|
|
impl TestChannel {
|
|
/// Create a new TestChannel with the default user ID "test-user".
|
|
pub fn new() -> Self {
|
|
Self::with_user_id("test-user")
|
|
}
|
|
|
|
/// Create a new TestChannel with a custom user ID.
|
|
pub fn with_user_id(user_id: impl Into<String>) -> Self {
|
|
let (tx, rx) = mpsc::channel(256);
|
|
let (ready_tx, ready_rx) = oneshot::channel();
|
|
Self {
|
|
channel_name: "test".to_string(),
|
|
tx,
|
|
rx: Mutex::new(Some(rx)),
|
|
responses: Arc::new(Mutex::new(Vec::new())),
|
|
status_events: Arc::new(Mutex::new(Vec::new())),
|
|
tool_start_times: Arc::new(Mutex::new(HashMap::new())),
|
|
tool_timings: Arc::new(Mutex::new(Vec::new())),
|
|
user_id: user_id.into(),
|
|
shutdown: Arc::new(AtomicBool::new(false)),
|
|
ready_tx: Arc::new(Mutex::new(Some(ready_tx))),
|
|
ready_rx: Arc::new(Mutex::new(Some(ready_rx))),
|
|
}
|
|
}
|
|
|
|
/// Override the channel name (default: "test").
|
|
pub fn with_name(mut self, name: impl Into<String>) -> Self {
|
|
self.channel_name = name.into();
|
|
self
|
|
}
|
|
|
|
/// Signal the channel (and any listening agent) to shut down.
|
|
pub fn signal_shutdown(&self) {
|
|
self.shutdown.store(true, Ordering::SeqCst);
|
|
}
|
|
|
|
/// Take the ready signal receiver. Returns `None` if already taken.
|
|
///
|
|
/// The receiver resolves when the agent calls `start()` on this channel,
|
|
/// providing a race-free alternative to sleep-based startup waits.
|
|
pub async fn take_ready_rx(&self) -> Option<oneshot::Receiver<()>> {
|
|
self.ready_rx.lock().await.take()
|
|
}
|
|
|
|
/// Inject a user message into the channel stream.
|
|
pub async fn send_message(&self, content: &str) {
|
|
let msg = IncomingMessage::new(&self.channel_name, &self.user_id, content);
|
|
self.tx.send(msg).await.expect("TestChannel tx closed");
|
|
}
|
|
|
|
/// Inject a raw `IncomingMessage` (for tests that need attachments, etc.).
|
|
pub async fn send_incoming(&self, msg: IncomingMessage) {
|
|
self.tx.send(msg).await.expect("TestChannel tx closed");
|
|
}
|
|
|
|
/// Inject a user message with a specific thread ID.
|
|
pub async fn send_message_in_thread(&self, content: &str, thread_id: &str) {
|
|
let msg =
|
|
IncomingMessage::new(&self.channel_name, &self.user_id, content).with_thread(thread_id);
|
|
self.tx.send(msg).await.expect("TestChannel tx closed");
|
|
}
|
|
|
|
/// Return a snapshot of all captured responses.
|
|
///
|
|
/// Uses `try_lock` so it can be called from sync contexts in tests.
|
|
pub fn captured_responses(&self) -> Vec<OutgoingResponse> {
|
|
self.responses
|
|
.try_lock()
|
|
.expect("captured_responses lock contention")
|
|
.clone()
|
|
}
|
|
|
|
/// Wait until at least `n` responses have been captured, or `timeout` elapses.
|
|
///
|
|
/// Returns whatever responses have been collected when the condition is met
|
|
/// or the timeout expires. Uses exponential backoff (50ms -> 100ms -> 200ms,
|
|
/// capped at 500ms) to reduce lock contention while staying responsive.
|
|
pub async fn wait_for_responses(&self, n: usize, timeout: Duration) -> Vec<OutgoingResponse> {
|
|
let deadline = tokio::time::Instant::now() + timeout;
|
|
let mut interval = Duration::from_millis(50);
|
|
let max_interval = Duration::from_millis(500);
|
|
loop {
|
|
{
|
|
let guard = self.responses.lock().await;
|
|
if guard.len() >= n {
|
|
return guard.clone();
|
|
}
|
|
}
|
|
if tokio::time::Instant::now() >= deadline {
|
|
return self.responses.lock().await.clone();
|
|
}
|
|
tokio::time::sleep(interval).await;
|
|
interval = (interval * 2).min(max_interval);
|
|
}
|
|
}
|
|
|
|
/// Return a snapshot of all captured status events.
|
|
///
|
|
/// Uses `try_lock` so it can be called from sync contexts in tests.
|
|
pub fn captured_status_events(&self) -> Vec<StatusUpdate> {
|
|
self.status_events
|
|
.try_lock()
|
|
.expect("captured_status_events lock contention")
|
|
.clone()
|
|
}
|
|
|
|
/// Return the names of all `ToolStarted` events captured so far.
|
|
pub fn tool_calls_started(&self) -> Vec<String> {
|
|
self.captured_status_events()
|
|
.iter()
|
|
.filter_map(|s| match s {
|
|
StatusUpdate::ToolStarted { name } => Some(name.clone()),
|
|
_ => None,
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Return `(name, success)` for all `ToolCompleted` events captured so far.
|
|
pub fn tool_calls_completed(&self) -> Vec<(String, bool)> {
|
|
self.captured_status_events()
|
|
.iter()
|
|
.filter_map(|s| match s {
|
|
StatusUpdate::ToolCompleted { name, success, .. } => Some((name.clone(), *success)),
|
|
_ => None,
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Return `(name, preview)` for all `ToolResult` events captured so far.
|
|
pub fn tool_results(&self) -> Vec<(String, String)> {
|
|
self.captured_status_events()
|
|
.iter()
|
|
.filter_map(|s| match s {
|
|
StatusUpdate::ToolResult { name, preview } => Some((name.clone(), preview.clone())),
|
|
_ => None,
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Return `(name, duration_ms)` for all completed tools with timing data.
|
|
///
|
|
/// Uses `try_lock` so it can be called from sync contexts in tests.
|
|
pub fn tool_timings(&self) -> Vec<(String, u64)> {
|
|
self.tool_timings
|
|
.try_lock()
|
|
.expect("tool_timings lock contention")
|
|
.clone()
|
|
}
|
|
|
|
/// Clear all captured responses and status events.
|
|
pub async fn clear(&self) {
|
|
self.responses.lock().await.clear();
|
|
self.status_events.lock().await.clear();
|
|
self.tool_start_times.lock().await.clear();
|
|
self.tool_timings.lock().await.clear();
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// TestChannelHandle -- wraps Arc<TestChannel> as Box<dyn Channel>
|
|
// ---------------------------------------------------------------------------
|
|
|
|
/// A thin wrapper around `Arc<TestChannel>` that implements `Channel`.
|
|
///
|
|
/// This lets us hand a `Box<dyn Channel>` to `ChannelManager::add()` while
|
|
/// keeping an `Arc<TestChannel>` in the test rig for sending messages and
|
|
/// reading captures. The `name_override` allows different test harnesses
|
|
/// to present the channel under different names (e.g. "gateway" vs "test").
|
|
pub struct TestChannelHandle {
|
|
inner: Arc<TestChannel>,
|
|
name: String,
|
|
}
|
|
|
|
impl TestChannelHandle {
|
|
/// Create a handle that delegates `name()` to the inner `TestChannel`.
|
|
pub fn new(inner: Arc<TestChannel>) -> Self {
|
|
Self {
|
|
name: inner.name().to_string(),
|
|
inner,
|
|
}
|
|
}
|
|
|
|
/// Create a handle with a custom channel name.
|
|
pub fn with_name(inner: Arc<TestChannel>, name: impl Into<String>) -> Self {
|
|
Self {
|
|
inner,
|
|
name: name.into(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl Channel for TestChannelHandle {
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
|
|
async fn start(&self) -> Result<MessageStream, ChannelError> {
|
|
self.inner.start().await
|
|
}
|
|
|
|
async fn respond(
|
|
&self,
|
|
msg: &IncomingMessage,
|
|
response: OutgoingResponse,
|
|
) -> Result<(), ChannelError> {
|
|
self.inner.respond(msg, response).await
|
|
}
|
|
|
|
async fn send_status(
|
|
&self,
|
|
status: StatusUpdate,
|
|
metadata: &serde_json::Value,
|
|
) -> Result<(), ChannelError> {
|
|
self.inner.send_status(status, metadata).await
|
|
}
|
|
|
|
async fn broadcast(
|
|
&self,
|
|
user_id: &str,
|
|
response: OutgoingResponse,
|
|
) -> Result<(), ChannelError> {
|
|
self.inner.broadcast(user_id, response).await
|
|
}
|
|
|
|
async fn health_check(&self) -> Result<(), ChannelError> {
|
|
self.inner.health_check().await
|
|
}
|
|
|
|
fn conversation_context(&self, metadata: &serde_json::Value) -> HashMap<String, String> {
|
|
self.inner.conversation_context(metadata)
|
|
}
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Channel trait implementation
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#[async_trait]
|
|
impl Channel for TestChannel {
|
|
fn name(&self) -> &str {
|
|
&self.channel_name
|
|
}
|
|
|
|
async fn start(&self) -> Result<MessageStream, ChannelError> {
|
|
let rx = self
|
|
.rx
|
|
.lock()
|
|
.await
|
|
.take()
|
|
.ok_or_else(|| ChannelError::StartupFailed {
|
|
name: self.channel_name.clone(),
|
|
reason: "start() already called".to_string(),
|
|
})?;
|
|
|
|
let stream = ReceiverStream::new(rx).boxed();
|
|
|
|
// Signal that the channel has started and the agent is ready.
|
|
if let Some(tx) = self.ready_tx.lock().await.take() {
|
|
let _ = tx.send(());
|
|
}
|
|
|
|
Ok(stream)
|
|
}
|
|
|
|
async fn respond(
|
|
&self,
|
|
_msg: &IncomingMessage,
|
|
response: OutgoingResponse,
|
|
) -> Result<(), ChannelError> {
|
|
self.responses.lock().await.push(response);
|
|
Ok(())
|
|
}
|
|
|
|
async fn send_status(
|
|
&self,
|
|
status: StatusUpdate,
|
|
_metadata: &serde_json::Value,
|
|
) -> Result<(), ChannelError> {
|
|
// Capture timing before pushing to events.
|
|
match &status {
|
|
StatusUpdate::ToolStarted { name } => {
|
|
self.tool_start_times
|
|
.lock()
|
|
.await
|
|
.entry(name.clone())
|
|
.or_default()
|
|
.push(Instant::now());
|
|
}
|
|
StatusUpdate::ToolCompleted { name, .. } => {
|
|
if let Some(starts) = self.tool_start_times.lock().await.get_mut(name)
|
|
&& let Some(start) = starts.pop()
|
|
{
|
|
self.tool_timings
|
|
.lock()
|
|
.await
|
|
.push((name.clone(), start.elapsed().as_millis() as u64));
|
|
}
|
|
}
|
|
_ => {}
|
|
}
|
|
self.status_events.lock().await.push(status);
|
|
Ok(())
|
|
}
|
|
|
|
async fn broadcast(
|
|
&self,
|
|
_user_id: &str,
|
|
response: OutgoingResponse,
|
|
) -> Result<(), ChannelError> {
|
|
self.responses.lock().await.push(response);
|
|
Ok(())
|
|
}
|
|
|
|
async fn health_check(&self) -> Result<(), ChannelError> {
|
|
Ok(())
|
|
}
|
|
|
|
fn conversation_context(&self, _metadata: &serde_json::Value) -> HashMap<String, String> {
|
|
HashMap::new()
|
|
}
|
|
}
|