metheus-governance-mcp-cli 0.2.29 → 0.2.31

package/README.md

@@ -60,6 +60,7 @@ metheus-governance-mcp-cli setup --project-id <project_uuid> --ctxpack-key "<ctx
 This sets fallback workspace context for clients that do not pass workspace metadata:
 - Codex/Antigravity/Cursor: `METHEUS_WORKSPACE_DIR` env
 - Gemini: pinned `--workspace-dir <fallback>` and `METHEUS_WORKSPACE_DIR` in MCP registration
+- fallback env is used only when workspace cannot be resolved (or resolves to home); when current `cwd` is a real project folder, sync uses that folder.
 
 Guardrail note:
 - By default, CLI blocks reading/writing ctxpack sync metadata when workspace root resolves to the home directory.

package/cli.mjs

@@ -639,18 +639,30 @@ function resolveWorkspaceDirForRequest(defaultWorkspaceDir, requestObj, toolArgs
   const weakRequestCandidate = extractWeakWorkspaceCandidateFromRequest(requestObj);
   const weakEnvCandidate = extractWeakWorkspaceCandidateFromEnv();
   const homeCandidate = firstNonEmptyString([process.env.USERPROFILE, process.env.HOME]);
-  for (const rawCandidate of [
+  const localPreferredCandidates = [
     strongRequestCandidate,
-    strongEnvCandidate,
     weakRequestCandidate,
-    weakEnvCandidate,
     defaultWorkspaceDir,
     process.cwd(),
-    homeCandidate,
-  ]) {
+  ];
+  for (const rawCandidate of localPreferredCandidates) {
+    const resolved = sanitizeWorkspaceCandidate(rawCandidate);
+    if (!resolved) continue;
+    // If local candidate points to home directory, prefer explicit fallback env when available.
+    if (isHomeWorkspaceRoot(resolved)) {
+      const strongEnvResolved = sanitizeWorkspaceCandidate(strongEnvCandidate);
+      if (strongEnvResolved && !isHomeWorkspaceRoot(strongEnvResolved)) {
+        return strongEnvResolved;
+      }
+    }
+    return resolved;
+  }
+
+  for (const rawCandidate of [strongEnvCandidate, weakEnvCandidate, homeCandidate]) {
     const resolved = sanitizeWorkspaceCandidate(rawCandidate);
     if (resolved) return resolved;
   }
+
   return resolveWorkspaceDir(process.cwd());
 }
 
@@ -3573,6 +3585,49 @@ async function maybeAutoSyncCtxpackForCall({
   }
 }
 
+async function maybeAutoSyncCtxpackForSessionRequest({
+  requestObj,
+  args,
+  token,
+  workspaceDir,
+  workspaceSignalTrusted = true,
+}) {
+  if (!token) return null;
+  const method = String(requestObj?.method || "").trim().toLowerCase();
+  if (method !== "initialize" && method !== "tools/list") return null;
+
+  const projectID = resolveProjectIDForRequest({
+    toolArgs: {},
+    args,
+    workspaceDir,
+  });
+  if (!isUUID(projectID)) return null;
+
+  const workspacePath = resolveWorkspaceDir(workspaceDir || process.cwd());
+  const trackerKey = `${workspacePath}::${projectID}::session-bootstrap`;
+  const now = Date.now();
+  const lastAt = Number(autoCtxpackSyncTracker.get(trackerKey) || 0);
+  if (lastAt > 0 && now - lastAt < AUTO_CTXPACK_SYNC_INTERVAL_MS) {
+    return null;
+  }
+  autoCtxpackSyncTracker.set(trackerKey, now);
+
+  try {
+    return await loadProjectSummaryForTool({
+      siteBaseURL: normalizeSiteBaseURL(args.baseURL),
+      projectID,
+      token,
+      timeoutSeconds: args.timeoutSeconds,
+      includeCtxpack: true,
+      syncCtxpackLocal: true,
+      workspaceDir: workspacePath,
+      workspaceSignalTrusted,
+    });
+  } catch {
+    return null;
+  }
+}
+
 function appendAutoCtxpackSyncHint(responseObj, summary) {
   const status = String(summary?.ctxpack_sync_status || "").trim();
   if (!status || status === "disabled" || status === "not_attempted" || status === "current") {
@@ -4042,14 +4097,23 @@ async function runProxy(flags) {
       if (strongRequestWorkspaceCandidate) {
         sessionWorkspaceDir = strongRequestWorkspaceCandidate;
         sessionWorkspaceTrusted = true;
-      } else if (strongEnvWorkspaceCandidate) {
-        sessionWorkspaceDir = strongEnvWorkspaceCandidate;
-        sessionWorkspaceTrusted = true;
       } else if (weakRequestWorkspaceCandidate) {
         sessionWorkspaceDir = weakRequestWorkspaceCandidate;
       } else if (weakEnvWorkspaceCandidate) {
         sessionWorkspaceDir = weakEnvWorkspaceCandidate;
       }
+      if (!sessionWorkspaceDir) {
+        const currentCwdCandidate = sanitizeWorkspaceCandidate(process.cwd());
+        if (currentCwdCandidate && !isHomeWorkspaceRoot(currentCwdCandidate)) {
+          sessionWorkspaceDir = currentCwdCandidate;
+        }
+      }
+      if (strongEnvWorkspaceCandidate) {
+        sessionWorkspaceTrusted = true;
+        if (!sessionWorkspaceDir || isHomeWorkspaceRoot(sessionWorkspaceDir)) {
+          sessionWorkspaceDir = strongEnvWorkspaceCandidate;
+        }
+      }
     }
     const workspaceSignalTrusted =
       args.explicitPinnedWorkspace ||
@@ -4074,6 +4138,15 @@ async function runProxy(flags) {
         workspaceSignalTrusted,
       });
     }
+    if (!autoSyncSummary) {
+      autoSyncSummary = await maybeAutoSyncCtxpackForSessionRequest({
+        requestObj,
+        args,
+        token,
+        workspaceDir: requestWorkspaceDir,
+        workspaceSignalTrusted,
+      });
+    }
     if (isJsonRpcMethod(requestObj, "tools/call") && LOCAL_PROJECT_TOOL_NAMES.includes(toolName)) {
       const projectID = String(
         resolveProjectIDForRequest({

package/package.json

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