Skip to content

Commit d0fa3e8

Browse files
Darth-Hidiousclaude
andcommitted
fix: cargo fmt and CI version check for v2.6.1
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 35c8f57 commit d0fa3e8

5 files changed

Lines changed: 56 additions & 29 deletions

File tree

.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
grep -q "Fe" /tmp/graph.out
155155
156156
- name: Test version flag
157-
run: ./target/debug/prism --version 2>&1 | grep "prism 2.6.0"
157+
run: ./target/debug/prism --version 2>&1 | grep "prism 2.6.1"
158158

159159
- name: Test node probe
160160
run: |

crates/agent/src/agent_loop.rs

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -215,26 +215,32 @@ fn summarize_tool_result(
215215
.unwrap_or("deployment");
216216
return format!("{tool_name}: {deployment_id} ({status})");
217217
}
218-
if let Some(healthy) =
219-
parsed_stdout.get("healthy").and_then(|value| value.as_bool())
218+
if let Some(healthy) = parsed_stdout
219+
.get("healthy")
220+
.and_then(|value| value.as_bool())
220221
{
221222
return format!("{tool_name}: healthy={healthy}");
222223
}
223224
}
224225
"discourse" => {
225-
if let Some(items) =
226-
parsed_stdout.get("specs").and_then(|value| value.as_array())
226+
if let Some(items) = parsed_stdout
227+
.get("specs")
228+
.and_then(|value| value.as_array())
227229
{
228230
return format!("{tool_name}: {} specs", items.len());
229231
}
230-
if let Some(events) =
231-
parsed_stdout.get("events").and_then(|value| value.as_array())
232+
if let Some(events) = parsed_stdout
233+
.get("events")
234+
.and_then(|value| value.as_array())
232235
{
233236
let instance_id = parsed_stdout
234237
.get("instance_id")
235238
.and_then(|value| value.as_str())
236239
.unwrap_or("instance");
237-
return format!("{tool_name}: {instance_id} ({} events)", events.len());
240+
return format!(
241+
"{tool_name}: {instance_id} ({} events)",
242+
events.len()
243+
);
238244
}
239245
if let Some(status) =
240246
parsed_stdout.get("status").and_then(|value| value.as_str())
@@ -245,8 +251,9 @@ fn summarize_tool_result(
245251
.unwrap_or("instance");
246252
return format!("{tool_name}: {instance_id} ({status})");
247253
}
248-
if let Some(turns) =
249-
parsed_stdout.get("turns").and_then(|value| value.as_array())
254+
if let Some(turns) = parsed_stdout
255+
.get("turns")
256+
.and_then(|value| value.as_array())
250257
{
251258
return format!("{tool_name}: {} turns", turns.len());
252259
}
@@ -574,7 +581,9 @@ pub async fn run_turn(
574581
tool_args: args.clone(),
575582
call_id: call_id.clone(),
576583
tool_description: tool_meta.map(|tool| tool.description.clone()),
577-
requires_approval: tool_meta.map(|tool| tool.requires_approval).unwrap_or(false),
584+
requires_approval: tool_meta
585+
.map(|tool| tool.requires_approval)
586+
.unwrap_or(false),
578587
permission_mode: tool_meta
579588
.map(|tool| tool.permission_mode.as_str().to_string())
580589
.unwrap_or_else(|| "workspace-write".to_string()),
@@ -626,10 +635,13 @@ pub async fn run_turn(
626635
&args,
627636
policy.as_deref_mut(),
628637
)
629-
.await
630-
.map(|value| serde_json::json!({ "result": value }))
638+
.await
639+
.map(|value| serde_json::json!({ "result": value }))
631640
} else {
632-
tool_server.call_tool(tool_name, args.clone()).await.map_err(Into::into)
641+
tool_server
642+
.call_tool(tool_name, args.clone())
643+
.await
644+
.map_err(Into::into)
633645
};
634646
let elapsed_ms = start.elapsed().as_millis() as u64;
635647

crates/agent/src/prompts.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,10 @@ pub fn append_runtime_tool_guidance(base_prompt: &str, tools: &ToolCatalog) -> S
180180
);
181181
}
182182

183-
if tools.iter().any(|tool| tool.source.as_deref() == Some("mcp")) {
183+
if tools
184+
.iter()
185+
.any(|tool| tool.source.as_deref() == Some("mcp"))
186+
{
184187
bullets.push(
185188
"Some loaded tools come from external MCP servers. Treat them as remote capabilities: inspect their descriptions carefully, prefer read-only discovery first, and expect approval before mutation or execution."
186189
.to_string(),

crates/agent/src/protocol.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2027,7 +2027,12 @@ fn format_tool_entry(tool_name: &str, tools: &ToolCatalog) -> String {
20272027
}
20282028
}
20292029

2030-
format!("{} · {}\n {}", tool.name, meta.join(" · "), tool.description)
2030+
format!(
2031+
"{} · {}\n {}",
2032+
tool.name,
2033+
meta.join(" · "),
2034+
tool.description
2035+
)
20312036
}
20322037
None => tool_name.to_string(),
20332038
}

crates/core/src/config.rs

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,23 @@ impl LlmSection {
176176
/// Resolve the ingest/search model, allowing platform-backed providers to
177177
/// fall back to the hosted Gemini default when no explicit model is set.
178178
pub fn resolve_model_or_platform_default(&self) -> Result<String> {
179-
self.model.clone().or_else(|| {
180-
if is_platform_llm_provider(&self.provider) {
181-
Some(PLATFORM_INGEST_MODEL.to_string())
182-
} else {
183-
None
184-
}
185-
}).ok_or_else(|| {
186-
anyhow::anyhow!(
187-
"No LLM model configured. Set one with:\n \
179+
self.model
180+
.clone()
181+
.or_else(|| {
182+
if is_platform_llm_provider(&self.provider) {
183+
Some(PLATFORM_INGEST_MODEL.to_string())
184+
} else {
185+
None
186+
}
187+
})
188+
.ok_or_else(|| {
189+
anyhow::anyhow!(
190+
"No LLM model configured. Set one with:\n \
188191
prism configure --model <name>\n\
189192
Or pass --model explicitly for this command.\n\
190193
Example: prism configure --model gemma-4-E4B-it --url http://localhost:8080"
191-
)
192-
})
194+
)
195+
})
193196
}
194197

195198
/// Resolve the embedding model, defaulting platform-backed flows to the
@@ -629,7 +632,9 @@ api_key_env = "ANTHROPIC_API_KEY"
629632
"gemini-3.1-flash-preview"
630633
);
631634
assert_eq!(
632-
section.resolve_embedding_model_or_platform_default().as_deref(),
635+
section
636+
.resolve_embedding_model_or_platform_default()
637+
.as_deref(),
633638
Some("gemini-embedding-2")
634639
);
635640
}
@@ -645,7 +650,9 @@ api_key_env = "ANTHROPIC_API_KEY"
645650
Some("gemini-3.1-flash-preview")
646651
);
647652
assert_eq!(
648-
section.resolve_embedding_model_or_platform_default().as_deref(),
653+
section
654+
.resolve_embedding_model_or_platform_default()
655+
.as_deref(),
649656
Some("gemini-embedding-2")
650657
);
651658
}

0 commit comments

Comments
 (0)