cargo fmt

This commit is contained in:
2026-04-29 23:20:25 +09:00
parent 3fc65e6f6b
commit f31c58dccd
18 changed files with 96 additions and 104 deletions
+2 -2
View File
@@ -12,22 +12,22 @@ use std::sync::{Arc, Mutex};
use async_trait::async_trait;
use llm_worker::Item;
use llm_worker::UsageRecord;
use llm_worker::interceptor::{
Interceptor, PostToolAction, PreRequestAction, PreToolAction, PromptAction, ToolCallInfo,
ToolResultInfo, TurnEndAction,
};
use llm_worker::UsageRecord;
use llm_worker::tool::ToolOutput;
use tracing::info;
use crate::compact::state::CompactState;
use llm_worker::token_counter::total_tokens;
use crate::hook::{
AbortInfo, HookRegistry, PreRequestInfo, PromptSubmitInfo, ToolCallSummary, ToolResultSummary,
TurnEndInfo,
};
use crate::ipc::notify_buffer::{NotifyBuffer, format_notify};
use crate::prompt::catalog::PromptCatalog;
use llm_worker::token_counter::total_tokens;
use tracing::warn;
/// Maximum number of bytes copied into `TurnEndInfo::final_text_preview`.
+18 -13
View File
@@ -1207,10 +1207,7 @@ impl<C: LlmClient, St: Store> Pod<C, St> {
// segments; only the user_messages surviving in retained_items
// keep them. They are always the trailing K entries of
// `self.user_segments` because submissions are appended in order.
let drop_n = self
.user_segments
.len()
.saturating_sub(retained_user_msgs);
let drop_n = self.user_segments.len().saturating_sub(retained_user_msgs);
if drop_n > 0 {
self.user_segments.drain(..drop_n);
}
@@ -1371,7 +1368,12 @@ impl<C: LlmClient, St: Store> Pod<C, St> {
return Ok(ExtractDecision::Skipped);
}
let current_history_len = self.worker.as_ref().expect("worker present").history().len();
let current_history_len = self
.worker
.as_ref()
.expect("worker present")
.history()
.len();
if current_history_len <= processed_history_len {
return Ok(ExtractDecision::Skipped);
}
@@ -1392,11 +1394,8 @@ impl<C: LlmClient, St: Store> Pod<C, St> {
return Ok(ExtractDecision::Skipped);
}
let items_to_extract = self
.worker
.as_ref()
.expect("worker present")
.history()[processed_history_len..current_history_len]
let items_to_extract = self.worker.as_ref().expect("worker present").history()
[processed_history_len..current_history_len]
.to_vec();
let layout = memory::WorkspaceLayout::resolve(memory_cfg, &self.pwd);
@@ -1428,7 +1427,10 @@ impl<C: LlmClient, St: Store> Pod<C, St> {
extract_worker.register_tool(extract::write_extracted_tool(ctx.clone()));
let input_text = extract::build_extract_input(&items_to_extract);
extract_worker.run(input_text).await.map_err(PodError::Worker)?;
extract_worker
.run(input_text)
.await
.map_err(PodError::Worker)?;
let payload = ctx.take_payload().unwrap_or_else(|| {
tracing::warn!(
@@ -1602,8 +1604,11 @@ impl<St: Store> Pod<Box<dyn LlmClient>, St> {
let common = prepare_pod_common(&manifest, &loader, /* parse_template */ true)?;
let session_id = session_store::new_session_id();
let scope_allocation =
pod_registry::adopt_allocation(manifest.pod.name.clone(), std::process::id(), session_id)?;
let scope_allocation = pod_registry::adopt_allocation(
manifest.pod.name.clone(),
std::process::id(),
session_id,
)?;
let mut worker = Worker::new(common.client);
apply_worker_manifest(&mut worker, &manifest.worker);
+3 -7
View File
@@ -43,13 +43,9 @@ async fn restore_from_manifest_rejects_unknown_session() {
// NotFound, which `Pod::restore_from_manifest` surfaces verbatim
// as `PodError::Store`.
let unknown = session_store::new_session_id();
let result = Pod::restore_from_manifest(
unknown,
manifest,
store,
pod::PromptLoader::builtins_only(),
)
.await;
let result =
Pod::restore_from_manifest(unknown, manifest, store, pod::PromptLoader::builtins_only())
.await;
match result {
Err(PodError::Store(StoreError::NotFound(id))) => assert_eq!(id, unknown),