Skip to content

fix(namespace): omitted namespace resolves to the connection namespace, never a hardcoded USER (fixes #96) #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PYDuquesnoy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(namespace): omitted namespace resolves to the connection namespace, never a hardcoded USER (fixes #96) #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 24 additions & 25 deletions crates/iris-agentic-dev-core/src/tools/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ fn err_json(code: &str, msg: &str) -> Result<rmcp::model::CallToolResult, rmcp::
ok_json(serde_json::json!({"success": false, "error_code": code, "error": msg}))
}

fn default_namespace() -> String {
"USER".to_string()
}

// ── Tool 1: resolve_dynamic_dispatch ─────────────────────────────────────────

#[derive(Debug, Deserialize, JsonSchema)]
Expand All @@ -59,9 +55,9 @@ pub struct ResolveDynamicDispatchParams {
pub method_name: String,
/// Optional package prefix to restrict search (e.g. "EnsLib", "HS").
pub package_prefix: Option<String>,
/// IRIS namespace. Defaults to "USER".
#[serde(default = "default_namespace")]
pub namespace: String,
/// IRIS namespace. Defaults to the connection namespace (IRIS_NAMESPACE).
#[serde(default)]
pub namespace: Option<String>,
/// Max candidates to return. Defaults to 50.
pub limit: Option<usize>,
/// Route this call to a named registered IRIS instance. If omitted, uses the default connection.
Expand All @@ -75,11 +71,12 @@ pub async fn handle_resolve_dynamic_dispatch(
p: ResolveDynamicDispatchParams,
cache: &MetadataCache,
) -> Result<rmcp::model::CallToolResult, rmcp::ErrorData> {
let namespace = crate::tools::resolve_namespace(p.namespace.as_deref(), &iris.namespace);
let prefix = p.package_prefix.as_deref().unwrap_or("");
let limit = p.limit.unwrap_or(50);
let cache_key = format!(
"resolve_dynamic_dispatch:{}:{}:{}",
p.method_name, prefix, p.namespace
p.method_name, prefix, namespace
);
if let Some(cached) = metadata_cache_get(cache, &cache_key) {
return ok_json(cached);
Expand Down Expand Up @@ -121,7 +118,7 @@ pub async fn handle_resolve_dynamic_dispatch(
let code = lines.join("\n");

let output = iris
.execute_via_generator(&code, &p.namespace, client)
.execute_via_generator(&code, namespace, client)
.await
.map_err(|e| rmcp::ErrorData::internal_error(format!("execute failed: {e}"), None))?;
let trimmed = output.trim();
Expand All @@ -146,7 +143,7 @@ pub async fn handle_resolve_dynamic_dispatch(
c
})
.collect();
let r = serde_json::json!({"success":true,"method_name":p.method_name,"package_prefix":p.package_prefix,"namespace":p.namespace,"candidates":annotated,"candidate_count":n,"confidence":confidence,"truncated":n==limit});
let r = serde_json::json!({"success":true,"method_name":p.method_name,"package_prefix":p.package_prefix,"namespace":namespace,"candidates":annotated,"candidate_count":n,"confidence":confidence,"truncated":n==limit});
metadata_cache_set(cache, cache_key, r.clone());
ok_json(r)
}
Expand All @@ -157,9 +154,9 @@ pub async fn handle_resolve_dynamic_dispatch(
pub struct ExtractMessageMapParams {
/// Fully qualified Ensemble class name (e.g. "HS.Flash.Router").
pub class_name: String,
/// IRIS namespace. Defaults to "USER".
#[serde(default = "default_namespace")]
pub namespace: String,
/// IRIS namespace. Defaults to the connection namespace (IRIS_NAMESPACE).
#[serde(default)]
pub namespace: Option<String>,
/// Route this call to a named registered IRIS instance. If omitted, uses the default connection.
#[serde(default)]
pub server: Option<String>,
Expand Down Expand Up @@ -204,20 +201,21 @@ pub async fn handle_extract_message_map_routing(
p: ExtractMessageMapParams,
cache: &MetadataCache,
) -> Result<rmcp::model::CallToolResult, rmcp::ErrorData> {
let cache_key = format!("extract_message_map:{}:{}", p.class_name, p.namespace);
let namespace = crate::tools::resolve_namespace(p.namespace.as_deref(), &iris.namespace);
let cache_key = format!("extract_message_map:{}:{}", p.class_name, namespace);
if let Some(cached) = metadata_cache_get(cache, &cache_key) {
return ok_json(cached);
}

// Check BPL/DTL first — these classes can't use the MessageMap generator path.
if let Some(flow) = detect_bpl_dtl_routing(iris, &p.class_name, &p.namespace, client).await {
if let Some(flow) = detect_bpl_dtl_routing(iris, &p.class_name, namespace, client).await {
metadata_cache_set(cache, cache_key, flow.clone());
return ok_json(flow);
}

let code = build_message_map_code(&p.class_name);
let output = iris
.execute_via_generator(&code, &p.namespace, client)
.execute_via_generator(&code, namespace, client)
.await
.map_err(|e| rmcp::ErrorData::internal_error(format!("execute failed: {e}"), None))?;
let trimmed = output.trim();
Expand Down Expand Up @@ -257,7 +255,7 @@ pub async fn handle_extract_message_map_routing(

let routes = inner["routes"].as_array().cloned().unwrap_or_default();
let route_count = routes.len();
let r = serde_json::json!({"success":true,"class_name":p.class_name,"namespace":p.namespace,"has_message_map":has_mm,"routes":routes,"route_count":route_count});
let r = serde_json::json!({"success":true,"class_name":p.class_name,"namespace":namespace,"has_message_map":has_mm,"routes":routes,"route_count":route_count});
metadata_cache_set(cache, cache_key, r.clone());
ok_json(r)
}
Expand Down Expand Up @@ -363,9 +361,9 @@ pub struct FindSubclassImplementationsParams {
pub method_name: String,
/// Base classes to expand — all descendants searched (e.g. ["Ens.BusinessProcess"]).
pub base_classes: Vec<String>,
/// IRIS namespace. Defaults to "USER".
#[serde(default = "default_namespace")]
pub namespace: String,
/// IRIS namespace. Defaults to the connection namespace (IRIS_NAMESPACE).
#[serde(default)]
pub namespace: Option<String>,
/// Max results. Defaults to 100.
pub limit: Option<usize>,
/// Route this call to a named registered IRIS instance. If omitted, uses the default connection.
Expand Down Expand Up @@ -409,13 +407,14 @@ pub async fn handle_find_subclass_implementations(
return err_json("INVALID_PARAMS", "base_classes must not be empty");
}

let namespace = crate::tools::resolve_namespace(p.namespace.as_deref(), &iris.namespace);
let mut sorted = p.base_classes.clone();
sorted.sort();
let cache_key = format!(
"find_subclass:{}:{}:{}",
p.method_name,
sorted.join(","),
p.namespace
namespace
);
if let Some(cached) = metadata_cache_get(cache, &cache_key) {
return ok_json(cached);
Expand All @@ -424,7 +423,7 @@ pub async fn handle_find_subclass_implementations(
let limit = p.limit.unwrap_or(100);
let expand_code = build_expand_hierarchy_code(&p.base_classes);
let desc_raw = iris
.execute_via_generator(&expand_code, &p.namespace, client)
.execute_via_generator(&expand_code, namespace, client)
.await
.map_err(|e| {
rmcp::ErrorData::internal_error(format!("hierarchy expansion failed: {e}"), None)
Expand All @@ -437,7 +436,7 @@ pub async fn handle_find_subclass_implementations(
.map(|s| s.to_string())
.collect();
if descendants.is_empty() {
let r = serde_json::json!({"success":true,"method_name":p.method_name,"base_classes":p.base_classes,"namespace":p.namespace,"implementations":[],"implementation_count":0,"confidence":0.0});
let r = serde_json::json!({"success":true,"method_name":p.method_name,"base_classes":p.base_classes,"namespace":namespace,"implementations":[],"implementation_count":0,"confidence":0.0});
metadata_cache_set(cache, cache_key, r.clone());
return ok_json(r);
}
Expand All @@ -464,7 +463,7 @@ pub async fn handle_find_subclass_implementations(
let code = lines.join("\n");

let output = iris
.execute_via_generator(&code, &p.namespace, client)
.execute_via_generator(&code, namespace, client)
.await
.map_err(|e| rmcp::ErrorData::internal_error(format!("method query failed: {e}"), None))?;
let trimmed = output.trim();
Expand All @@ -483,7 +482,7 @@ pub async fn handle_find_subclass_implementations(
i
})
.collect();
let r = serde_json::json!({"success":true,"method_name":p.method_name,"base_classes":p.base_classes,"namespace":p.namespace,"implementations":annotated,"implementation_count":n,"confidence":confidence});
let r = serde_json::json!({"success":true,"method_name":p.method_name,"base_classes":p.base_classes,"namespace":namespace,"implementations":annotated,"implementation_count":n,"confidence":confidence});
metadata_cache_set(cache, cache_key, r.clone());
ok_json(r)
}
Expand Down
Loading
Loading