metheus-governance-mcp-cli 0.2.18 → 0.2.20

package/cli.mjs

@@ -388,8 +388,13 @@ function extractStrongWorkspaceCandidateFromRequest(requestObj, toolArgs) {
 }
 
 function extractWorkspaceCandidateFromRequest(requestObj, toolArgs) {
-  const strongCandidate = extractStrongWorkspaceCandidateFromRequest(requestObj, toolArgs);
-  if (strongCandidate) return strongCandidate;
+  return firstNonEmptyString([
+    extractStrongWorkspaceCandidateFromRequest(requestObj, toolArgs),
+    extractWeakWorkspaceCandidateFromRequest(requestObj),
+  ]);
+}
+
+function extractWeakWorkspaceCandidateFromRequest(requestObj) {
   const params = safeObject(requestObj?.params);
   const meta = safeObject(params._meta);
   const rawCandidate = firstNonEmptyString([
@@ -421,8 +426,14 @@ function extractStrongWorkspaceCandidateFromEnv() {
 }
 
 function extractWorkspaceCandidateFromEnv() {
-  const rawCandidate = firstNonEmptyString([
+  return firstNonEmptyString([
     extractStrongWorkspaceCandidateFromEnv(),
+    extractWeakWorkspaceCandidateFromEnv(),
+  ]);
+}
+
+function extractWeakWorkspaceCandidateFromEnv() {
+  const rawCandidate = firstNonEmptyString([
     process.env.WORKSPACE_DIR,
     process.env.WORKSPACE_FOLDER,
     process.env.VSCODE_WORKSPACE_FOLDER,
@@ -434,10 +445,20 @@ function extractWorkspaceCandidateFromEnv() {
 }
 
 function resolveWorkspaceDirForRequest(defaultWorkspaceDir, requestObj, toolArgs) {
-  const requestCandidate = extractWorkspaceCandidateFromRequest(requestObj, toolArgs);
-  const envCandidate = extractWorkspaceCandidateFromEnv();
+  const strongRequestCandidate = extractStrongWorkspaceCandidateFromRequest(requestObj, toolArgs);
+  const strongEnvCandidate = extractStrongWorkspaceCandidateFromEnv();
+  const weakRequestCandidate = extractWeakWorkspaceCandidateFromRequest(requestObj);
+  const weakEnvCandidate = extractWeakWorkspaceCandidateFromEnv();
   const homeCandidate = firstNonEmptyString([process.env.USERPROFILE, process.env.HOME]);
-  for (const rawCandidate of [requestCandidate, envCandidate, defaultWorkspaceDir, process.cwd(), homeCandidate]) {
+  for (const rawCandidate of [
+    strongRequestCandidate,
+    strongEnvCandidate,
+    weakRequestCandidate,
+    weakEnvCandidate,
+    defaultWorkspaceDir,
+    process.cwd(),
+    homeCandidate,
+  ]) {
     const resolved = sanitizeWorkspaceCandidate(rawCandidate);
     if (resolved) return resolved;
   }
@@ -3793,30 +3814,25 @@ async function runProxy(flags) {
     }
 
     const { name: toolName, args: toolArgs } = extractToolCall(requestObj);
-    let requestWorkspaceCandidate = "";
     let strongRequestWorkspaceCandidate = "";
+    let weakRequestWorkspaceCandidate = "";
     let strongEnvWorkspaceCandidate = "";
+    let weakEnvWorkspaceCandidate = "";
     if (!args.explicitPinnedWorkspace) {
       strongRequestWorkspaceCandidate = extractStrongWorkspaceCandidateFromRequest(requestObj, toolArgs);
-      requestWorkspaceCandidate = firstNonEmptyString([
-        strongRequestWorkspaceCandidate,
-        extractWorkspaceCandidateFromRequest(requestObj, toolArgs),
-      ]);
+      weakRequestWorkspaceCandidate = extractWeakWorkspaceCandidateFromRequest(requestObj);
       strongEnvWorkspaceCandidate = extractStrongWorkspaceCandidateFromEnv();
-      const envWorkspaceCandidate = firstNonEmptyString([
-        strongEnvWorkspaceCandidate,
-        extractWorkspaceCandidateFromEnv(),
-      ]);
-      if (requestWorkspaceCandidate) {
-        sessionWorkspaceDir = requestWorkspaceCandidate;
-        if (strongRequestWorkspaceCandidate) {
-          sessionWorkspaceTrusted = true;
-        }
-      } else if (envWorkspaceCandidate) {
-        sessionWorkspaceDir = envWorkspaceCandidate;
-        if (strongEnvWorkspaceCandidate) {
-          sessionWorkspaceTrusted = true;
-        }
+      weakEnvWorkspaceCandidate = extractWeakWorkspaceCandidateFromEnv();
+      if (strongRequestWorkspaceCandidate) {
+        sessionWorkspaceDir = strongRequestWorkspaceCandidate;
+        sessionWorkspaceTrusted = true;
+      } else if (strongEnvWorkspaceCandidate) {
+        sessionWorkspaceDir = strongEnvWorkspaceCandidate;
+        sessionWorkspaceTrusted = true;
+      } else if (weakRequestWorkspaceCandidate) {
+        sessionWorkspaceDir = weakRequestWorkspaceCandidate;
+      } else if (weakEnvWorkspaceCandidate) {
+        sessionWorkspaceDir = weakEnvWorkspaceCandidate;
       }
     }
     const workspaceSignalTrusted =

package/package.json

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