metheus-governance-mcp-cli 0.2.38 → 0.2.40

package/cli.mjs

@@ -3563,16 +3563,33 @@ function buildToolAliasMaps(tools) {
   return { aliasToCanonical, canonicalToAlias };
 }
 
-function applyToolAliasesToToolsListResponse(responseObj, canonicalToAlias) {
+function appendToolAliasesToToolsListResponse(responseObj, canonicalToAlias) {
   const result = safeObject(responseObj.result);
   const tools = ensureArray(result.tools);
-  result.tools = tools.map((tool) => {
+  const outputTools = [];
+  const reservedNames = new Set();
+
+  for (const tool of tools) {
     const safeTool = safeObject(tool);
     const currentName = String(safeTool.name || "").trim();
-    const aliasName = canonicalToAlias.get(currentName);
-    if (!aliasName) return safeTool;
-    return { ...safeTool, name: aliasName };
-  });
+    if (currentName) {
+      reservedNames.add(currentName);
+    }
+    outputTools.push(safeTool);
+  }
+
+  for (const tool of tools) {
+    const safeTool = safeObject(tool);
+    const canonicalName = String(safeTool.name || "").trim();
+    if (!canonicalName) continue;
+    const aliasName = String(canonicalToAlias.get(canonicalName) || "").trim();
+    if (!aliasName || reservedNames.has(aliasName)) continue;
+    const aliasTool = { ...safeTool, name: aliasName };
+    outputTools.push(aliasTool);
+    reservedNames.add(aliasName);
+  }
+
+  result.tools = outputTools;
   responseObj.result = result;
   return responseObj;
 }
@@ -3603,6 +3620,14 @@ function shouldUseSafeToolAliasesForClient(initParamsRaw) {
   return name.includes("cursor") || name.includes("antigravity");
 }
 
+function displayToolNameForClient(canonicalName, useSafeToolAliases = false) {
+  const canonical = String(canonicalName || "").trim();
+  if (!canonical) return "";
+  if (!useSafeToolAliases) return canonical;
+  const alias = normalizeSafeToolAliasName(canonical);
+  return alias || canonical;
+}
+
 function injectWorkspaceDirIntoToolSchemas(tools) {
   const workspaceDirProp = {
     type: "string",
@@ -3633,14 +3658,25 @@ function appendLocalToolToToolsList(responseObj) {
   return responseObj;
 }
 
-function appendProjectHintToInitialize(responseObj, args) {
+function appendProjectHintToInitialize(responseObj, args, options = {}) {
+  const useSafeToolAliases = Boolean(options.useSafeToolAliases);
   const result = safeObject(responseObj.result);
+  const projectSummaryTool = displayToolNameForClient("project.summary", useSafeToolAliases);
+  const projectDescribeTool = displayToolNameForClient("project.describe", useSafeToolAliases);
+  const projectGetTool = displayToolNameForClient("project.get", useSafeToolAliases);
+  const ctxpackMergeBriefTool = displayToolNameForClient("ctxpack.merge.brief", useSafeToolAliases);
+  const ctxpackMergeExecuteTool = displayToolNameForClient("ctxpack.merge.execute", useSafeToolAliases);
   const hintLines = [
     "High-priority project bootstrap rule:",
-    "- MUST call `project.summary` first when the user provides only a Project ID or asks project overview/agenda.",
-    "- `project.describe` and `project.get` are aliases of `project.summary`.",
+    ...(useSafeToolAliases
+      ? [
+          "- This session uses safe MCP tool aliases (underscore format). Use `project_summary` / `ctxpack_ensure` / `workitem_list` style names, not dotted names.",
+        ]
+      : []),
+    `- MUST call \`${projectSummaryTool}\` first when the user provides only a Project ID or asks project overview/agenda.`,
+    `- \`${projectDescribeTool}\` and \`${projectGetTool}\` are aliases of \`${projectSummaryTool}\`.`,
     "- After project summary, use workitem/evidence/decision tools as follow-up.",
-    "- Before any ctxpack merge, call `ctxpack.merge.brief` first, share recommendation to owner, get explicit owner confirmation, then call `ctxpack.merge.execute`.",
+    `- Before any ctxpack merge, call \`${ctxpackMergeBriefTool}\` first, share recommendation to owner, get explicit owner confirmation, then call \`${ctxpackMergeExecuteTool}\`.`,
     "- IMPORTANT: When calling ANY tool, always include your current working directory / project folder path as the `workspace_dir` argument. This enables ctxpack files to be synced to the correct workspace location.",
   ];
   if (args.projectID) {
@@ -3767,7 +3803,16 @@ function appendAutoCtxpackSyncHint(responseObj, summary) {
   return responseObj;
 }
 
-async function appendWorkitemListHints(responseObj, args, toolArgs, token, workspaceSignalTrusted = true) {
+async function appendWorkitemListHints(
+  responseObj,
+  args,
+  toolArgs,
+  token,
+  workspaceSignalTrusted = true,
+  options = {},
+) {
+  const useSafeToolAliases = Boolean(options.useSafeToolAliases);
+  const projectSummaryTool = displayToolNameForClient("project.summary", useSafeToolAliases);
   const result = safeObject(responseObj.result);
   const content = ensureArray(result.content);
   if (!content.length) return responseObj;
@@ -3777,7 +3822,7 @@ async function appendWorkitemListHints(responseObj, args, toolArgs, token, works
 
   const text = String(first.text || "");
   if (!text) return responseObj;
-  if (text.includes("Call `project.summary`")) return responseObj;
+  if (text.includes(`Call \`${projectSummaryTool}\``) || text.includes("Call `project.summary`")) return responseObj;
 
   const parsed = parseGatewayResponseText(text);
   if (!parsed) return responseObj;
@@ -3794,7 +3839,7 @@ async function appendWorkitemListHints(responseObj, args, toolArgs, token, works
   const nextLines = [""];
   if (isEmptyBody) {
     nextLines.push("No work items found for this project.");
-    nextLines.push("- Call `project.summary` to confirm project context/agenda and access state first.");
+    nextLines.push(`- Call \`${projectSummaryTool}\` to confirm project context/agenda and access state first.`);
   }
 
   let responseProjectID = "";
@@ -4557,10 +4602,12 @@ async function runProxy(flags) {
               const aliasMaps = buildToolAliasMaps(tools);
               sessionToolAliasToCanonical = aliasMaps.aliasToCanonical;
               sessionToolCanonicalToAlias = aliasMaps.canonicalToAlias;
-              patched = applyToolAliasesToToolsListResponse(patched, sessionToolCanonicalToAlias);
+              patched = appendToolAliasesToToolsListResponse(patched, sessionToolCanonicalToAlias);
             }
           } else if (isJsonRpcMethod(requestObj, "initialize")) {
-            patched = appendProjectHintToInitialize(patched, args);
+            patched = appendProjectHintToInitialize(patched, args, {
+              useSafeToolAliases: sessionUseSafeToolAliases,
+            });
             // Log initialize params for workspace debugging.
             try {
               const _diagDir = path.join(String(process.env.USERPROFILE || process.env.HOME || "."), ".metheus");
@@ -4577,7 +4624,14 @@ async function runProxy(flags) {
               setImmediate(() => sendRootsListProbe());
             }
           } else if (isJsonRpcMethod(requestObj, "tools/call") && toolName === "workitem.list") {
-            patched = await appendWorkitemListHints(patched, args, toolArgs, token, workspaceSignalTrusted);
+            patched = await appendWorkitemListHints(
+              patched,
+              args,
+              toolArgs,
+              token,
+              workspaceSignalTrusted,
+              { useSafeToolAliases: sessionUseSafeToolAliases },
+            );
           } else if (isJsonRpcMethod(requestObj, "tools/call") && toolName === "ctxpack.ensure") {
             patched = appendCtxpackEnsureSyncHints(
               patched,
@@ -5019,7 +5073,7 @@ function resolveSetupContext(flags) {
   const workspaceMeta = loadWorkspaceMeta(process.cwd());
   const projectID = String(flags["project-id"] || workspaceMeta.project_id || "").trim();
   const ctxpackKey = String(flags["ctxpack-key"] || buildCtxpackKeyFromMeta(workspaceMeta) || "").trim();
-  const baseURL = String(flags["base-url"] || DEFAULT_SITE_URL).trim().replace(/\/+$/, "");
+  const baseURL = normalizeSiteBaseURL(flags["base-url"] || DEFAULT_SITE_URL);
   const workspaceDirRaw = String(flags["workspace-dir"] || "").trim();
   const workspaceFallbackDirRaw = String(flags["workspace-fallback-dir"] || "").trim();
   const hasWorkspaceDirFlag = Object.prototype.hasOwnProperty.call(flags, "workspace-dir");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metheus-governance-mcp-cli",
-  "version": "0.2.38",
+  "version": "0.2.40",
   "description": "Metheus Governance MCP CLI (setup + stdio proxy)",
   "type": "module",
   "files": [