metheus-governance-mcp-cli 0.2.10 → 0.2.11

package/cli.mjs

@@ -140,12 +140,33 @@ function firstNonEmptyString(values) {
   return "";
 }
 
+function isEditorInstallDirectory(candidatePath) {
+  const normalized = String(candidatePath || "").replace(/\//g, "\\").toLowerCase();
+  if (!normalized) return false;
+  // Guard against runtime cwd/env resolving to editor installation directory
+  // instead of the actual opened workspace.
+  if (normalized.includes("\\appdata\\local\\programs\\microsoft vs code")) return true;
+  if (normalized.includes("\\program files\\microsoft vs code")) return true;
+  if (normalized.includes("\\program files (x86)\\microsoft vs code")) return true;
+  return false;
+}
+
+function sanitizeWorkspaceCandidate(rawCandidate) {
+  const fileCandidate = fileURIToLocalPath(rawCandidate);
+  const candidate = firstNonEmptyString([fileCandidate, rawCandidate]);
+  if (!candidate) return "";
+  const resolved = resolveWorkspaceDir(candidate);
+  if (!resolved) return "";
+  if (isEditorInstallDirectory(resolved)) return "";
+  return resolved;
+}
+
 function extractWorkspaceCandidateFromFolders(rawFolders) {
   if (!Array.isArray(rawFolders)) return "";
   for (const folder of rawFolders) {
     if (typeof folder === "string") {
-      const direct = firstNonEmptyString([fileURIToLocalPath(folder), folder]);
-      if (direct) return resolveWorkspaceDir(direct);
+      const direct = sanitizeWorkspaceCandidate(folder);
+      if (direct) return direct;
       continue;
     }
     if (!folder || typeof folder !== "object" || Array.isArray(folder)) continue;
@@ -157,8 +178,8 @@ function extractWorkspaceCandidateFromFolders(rawFolders) {
       folder.root_path,
       folder.rootPath,
     ]);
-    const candidate = firstNonEmptyString([fileURIToLocalPath(uriValue), uriValue]);
-    if (candidate) return resolveWorkspaceDir(candidate);
+    const candidate = sanitizeWorkspaceCandidate(uriValue);
+    if (candidate) return candidate;
   }
   return "";
 }
@@ -192,10 +213,7 @@ function extractWorkspaceCandidateFromRequest(requestObj, toolArgs) {
     meta.root_uri,
     meta.rootUri,
   ]);
-  const fileCandidate = fileURIToLocalPath(rawCandidate);
-  const candidate = firstNonEmptyString([fileCandidate, rawCandidate]);
-  if (!candidate) return "";
-  return resolveWorkspaceDir(candidate);
+  return sanitizeWorkspaceCandidate(rawCandidate);
 }
 
 function extractWorkspaceCandidateFromEnv() {
@@ -208,26 +226,22 @@ function extractWorkspaceCandidateFromEnv() {
     process.env.WORKSPACE_DIR,
     process.env.WORKSPACE_FOLDER,
     process.env.VSCODE_WORKSPACE_FOLDER,
-    process.env.VSCODE_CWD,
     process.env.PWD,
     process.env.INIT_CWD,
+    process.env.VSCODE_CWD,
   ]);
-  const fileCandidate = fileURIToLocalPath(rawCandidate);
-  const candidate = firstNonEmptyString([fileCandidate, rawCandidate]);
-  if (!candidate) return "";
-  return resolveWorkspaceDir(candidate);
+  return sanitizeWorkspaceCandidate(rawCandidate);
 }
 
 function resolveWorkspaceDirForRequest(defaultWorkspaceDir, requestObj, toolArgs) {
   const requestCandidate = extractWorkspaceCandidateFromRequest(requestObj, toolArgs);
   const envCandidate = extractWorkspaceCandidateFromEnv();
-  const candidate = firstNonEmptyString([
-    requestCandidate,
-    envCandidate,
-    defaultWorkspaceDir,
-    process.cwd(),
-  ]);
-  return resolveWorkspaceDir(candidate);
+  const homeCandidate = firstNonEmptyString([process.env.USERPROFILE, process.env.HOME]);
+  for (const rawCandidate of [requestCandidate, envCandidate, defaultWorkspaceDir, process.cwd(), homeCandidate]) {
+    const resolved = sanitizeWorkspaceCandidate(rawCandidate);
+    if (resolved) return resolved;
+  }
+  return resolveWorkspaceDir(process.cwd());
 }
 
 function resolveProjectIDForRequest({
@@ -3508,14 +3522,10 @@ async function runProxy(flags) {
     } else if (envWorkspaceCandidate) {
       sessionWorkspaceDir = envWorkspaceCandidate;
     }
-    const requestWorkspaceDir = resolveWorkspaceDir(
-      firstNonEmptyString([
-        requestWorkspaceCandidate,
-        envWorkspaceCandidate,
-        sessionWorkspaceDir,
-        args.workspaceDir,
-        process.cwd(),
-      ]),
+    const requestWorkspaceDir = resolveWorkspaceDirForRequest(
+      firstNonEmptyString([sessionWorkspaceDir, args.workspaceDir, process.cwd()]),
+      requestObj,
+      toolArgs,
     );
     let autoSyncSummary = null;
     if (isJsonRpcMethod(requestObj, "tools/call")) {

package/package.json

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