Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/hook.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ fn session_start_message(agent: &str) -> String {
"Skills load on demand: before assuming a relevant skill doesn't exist, call skill_search(query) then skill_load(name) via the agentflare MCP tools."
.to_string(),
);
lines.push(
"Memory on-demand: gateway_search(query)->gateway_execute(server=\"engram\",tool,args). Not auto-loaded."
.to_string(),
);

lines.join("\n")
}
Expand Down Expand Up @@ -358,4 +362,14 @@ mod tests {
assert!(msg.contains("skill_load(name)"));
});
}

#[test]
fn session_start_message_nudges_engram_via_gateway() {
use crate::paths::test_support::with_temp_home;
with_temp_home(|| {
let msg = session_start_message("claude-code");
assert!(msg.contains("gateway_search(query)"));
assert!(msg.contains("gateway_execute(server=\"engram\""));
});
}
}
12 changes: 9 additions & 3 deletions src/mcp_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,14 @@ struct GatewayExecuteRequest {
server: String,
#[schemars(description = "Tool name from gateway_search")]
tool: String,
// A bare `serde_json::Value` here made schemars emit a typeless schema
// (Value can be anything), so callers had no signal to send a nested
// JSON object rather than a stringified one — gateway_execute couldn't
// actually be invoked with arguments. `Map` renders as `{"type":
// ["object", "null"]}`, a real hint.
#[schemars(description = "Arguments object matching the tool's input_schema")]
#[serde(default)]
args: serde_json::Value,
args: Option<serde_json::Map<String, serde_json::Value>>,
}

#[derive(Default)]
Expand Down Expand Up @@ -346,6 +351,7 @@ impl AgentflareMcp {
if server.trim().is_empty() || tool.trim().is_empty() {
return Err(ErrorData::invalid_params("server and tool are required", None));
}
let args = args.map(serde_json::Value::Object).unwrap_or(serde_json::Value::Null);
let guard = self.ensure_gateway_registry().await?;
let reg = guard.as_ref().expect("ensured above");
match reg.execute(&server, &tool, args).await {
Expand Down Expand Up @@ -696,7 +702,7 @@ mod tests {
.gateway_execute(Parameters(GatewayExecuteRequest {
server: "".into(),
tool: "x".into(),
args: serde_json::json!({}),
args: Some(serde_json::Map::new()),
}))
.await
.unwrap_err();
Expand All @@ -717,7 +723,7 @@ mod tests {
.gateway_execute(Parameters(GatewayExecuteRequest {
server: "definitely-not-a-configured-server".into(),
tool: "x".into(),
args: serde_json::json!({}),
args: Some(serde_json::Map::new()),
}))
.await
.unwrap_err();
Expand Down
Loading