metheus-governance-mcp-cli 0.2.41 → 0.2.43

package/cli.mjs

@@ -676,9 +676,27 @@ function resolveWorkspaceDirForRequest(defaultWorkspaceDir, requestObj, toolArgs
   const weakRequestCandidate = extractWeakWorkspaceCandidateFromRequest(requestObj);
   const weakEnvCandidate = extractWeakWorkspaceCandidateFromEnv();
   const homeCandidate = firstNonEmptyString([process.env.USERPROFILE, process.env.HOME]);
+  const strongEnvResolved = sanitizeWorkspaceCandidate(strongEnvCandidate);
+  const strongRequestResolved = sanitizeWorkspaceCandidate(strongRequestCandidate);
+  const weakRequestResolved = sanitizeWorkspaceCandidate(weakRequestCandidate);
+
+  if (strongRequestResolved) {
+    return strongRequestResolved;
+  }
+  if (weakRequestResolved) {
+    // Prefer client-provided current workspace over fallback env, unless request resolves to home.
+    if (isHomeWorkspaceRoot(weakRequestResolved)) {
+      if (strongEnvResolved && !isHomeWorkspaceRoot(strongEnvResolved)) {
+        return strongEnvResolved;
+      }
+    }
+    return weakRequestResolved;
+  }
+  if (strongEnvResolved) {
+    return strongEnvResolved;
+  }
+
   const localPreferredCandidates = [
-    strongRequestCandidate,
-    weakRequestCandidate,
     defaultWorkspaceDir,
     process.cwd(),
   ];
@@ -5250,6 +5268,44 @@ function runSelftest(flags = {}) {
       keptExistingOk,
       `input=${suspicious} recovered=${keptExisting || "(none)"}`,
     );
+
+    const originalWorkspaceEnv = process.env.METHEUS_WORKSPACE_DIR;
+    const forcedEnvWorkspace = path.join(tempRoot, "forced-workspace");
+    const defaultWorkspace = path.join(tempRoot, "default-workspace");
+    const weakRequestWorkspace = path.join(tempRoot, "weak-request-workspace");
+    fs.mkdirSync(forcedEnvWorkspace, { recursive: true });
+    fs.mkdirSync(defaultWorkspace, { recursive: true });
+    fs.mkdirSync(weakRequestWorkspace, { recursive: true });
+    process.env.METHEUS_WORKSPACE_DIR = forcedEnvWorkspace;
+    const resolvedByEnvPriority = resolveWorkspaceDirForRequest(defaultWorkspace, {}, {});
+    const resolvedByWeakRequestPriority = resolveWorkspaceDirForRequest(
+      defaultWorkspace,
+      {
+        params: {
+          cwd: weakRequestWorkspace,
+        },
+      },
+      {},
+    );
+    if (typeof originalWorkspaceEnv === "string") {
+      process.env.METHEUS_WORKSPACE_DIR = originalWorkspaceEnv;
+    } else {
+      delete process.env.METHEUS_WORKSPACE_DIR;
+    }
+    const envPriorityOk =
+      normalizedPathForCompare(resolvedByEnvPriority) === normalizedPathForCompare(forcedEnvWorkspace);
+    push(
+      "workspace_env_priority_over_default",
+      envPriorityOk,
+      `env=${forcedEnvWorkspace} default=${defaultWorkspace} resolved=${resolvedByEnvPriority || "(none)"}`,
+    );
+    const weakRequestPriorityOk =
+      normalizedPathForCompare(resolvedByWeakRequestPriority) === normalizedPathForCompare(weakRequestWorkspace);
+    push(
+      "workspace_weak_request_priority_over_env",
+      weakRequestPriorityOk,
+      `request=${weakRequestWorkspace} env=${forcedEnvWorkspace} resolved=${resolvedByWeakRequestPriority || "(none)"}`,
+    );
   } catch (err) {
     push("workspace_env_guard_test_setup", false, String(err?.message || err));
   } finally {

package/package.json

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