@savvy-web/mcp 2.4.10 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/mcp",
-	"version": "2.4.10",
+	"version": "2.5.0",
 	"private": false,
 	"description": "The savvy MCP server — Silk Suite tooling and library knowledge for coding agents",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/mcp",

package/server.js

@@ -223,7 +223,7 @@ function buildServer(ctx) {
 			write: z.optional(z.boolean()).describe("Apply safe fixes (--write)."),
 			unsafe: z.optional(z.boolean()).describe("Apply unsafe fixes (--write --unsafe); implies write."),
 			strict: z.optional(z.boolean()).describe("Report project warnings as errors (marked with originalSeverity). Default: honor project config."),
-			cwd: z.optional(z.string()).describe("Directory to resolve the workspace root from.")
+			cwd: z.optional(z.string()).describe("Directory to run from. May be the server's workspace root, a directory inside it, or a git worktree of the SAME repository — a worktree contains the run to that worktree instead of the main checkout. Anything else is rejected.")
 		},
 		outputSchema: effectToZodSchema(BiomeCheckResult)
 	}, async (args) => {

package/tools/biome-check.js

@@ -69,8 +69,17 @@ const GitlabDiagnostic = Schema.Struct({
 });
 const GitlabArray = Schema.Array(GitlabDiagnostic);
 const decodeGitlab = Schema.decodeUnknownSync(GitlabArray);
-/** Map a gitlab severity onto our three-level scale. */
-const mapSeverity = (s) => s === "info" ? "info" : s === "minor" ? "warning" : "error";
+/**
+* Map a gitlab severity back onto the Biome severity it was produced from.
+*
+* @remarks Biome's gitlab reporter encodes its own `Severity` onto GitLab's
+* codequality scale (`crates/biome_cli/src/reporter/gitlab.rs`):
+* `Hint => info`, `Information => minor`, `Warning => major`, `Error => critical`,
+* `Fatal => blocker`. This function is the exact inverse. Reading `major` as an
+* error (as this did before systems#516) reports every diagnostic one step more
+* severe than the project's own `biome check` does, turning a green repo red.
+*/
+const mapSeverity = (s) => s === "info" || s === "minor" ? "info" : s === "major" ? "warning" : "error";
 /**
 * Parse Biome `--reporter=gitlab` stdout into normalized diagnostics. Returns []
 * for empty, non-JSON, or shape-mismatched input (never throws).
@@ -143,6 +152,63 @@ const BiomeCheckAsMarkdown = BiomeCheckResult.pipe(Schema.decodeTo(Schema.String
 	encode: SchemaGetter.forbidden(() => "BiomeCheckAsMarkdown is one-way: markdown cannot be parsed back.")
 }));
 /**
+* Canonicalize a path, falling back to lexical resolution when it does not exist
+* (a non-existent target cannot be a symlink pointing out of tree).
+*/
+const canonicalize = (p) => {
+	try {
+		return realpathSync(p);
+	} catch {
+		return resolve(p);
+	}
+};
+/** Real git probe. One `rev-parse` yielding both paths already absolute. */
+const gitWorktreeProbe = (dir) => {
+	const res = spawnSync("git", [
+		"-C",
+		dir,
+		"rev-parse",
+		"--path-format=absolute",
+		"--git-common-dir",
+		"--show-toplevel"
+	], {
+		encoding: "utf8",
+		timeout: 1e4
+	});
+	if (res.error || (res.status ?? 1) !== 0) return null;
+	const [commonDir, topLevel] = (res.stdout ?? "").trim().split("\n");
+	if (!commonDir || !topLevel) return null;
+	return {
+		commonDir: canonicalize(commonDir.trim()),
+		topLevel: canonicalize(topLevel.trim())
+	};
+};
+/**
+* Decide which directory tree this run may touch.
+*
+* @remarks A cwd inside the server's root keeps that root. A cwd OUTSIDE it is
+* accepted only when it belongs to a DIFFERENT worktree of the same repository —
+* a shared git common dir but a different top level — and containment then follows
+* that worktree rather than the server's start directory (systems#482). Binding to the start directory
+* meant a call from a sibling worktree silently mutated the main checkout, which in
+* a parallel multi-agent session is another agent's tree. Returns null to reject.
+*
+* @param root - the server's workspace root, already canonicalized
+* @param cwd - the requested working directory, already canonicalized
+* @param probe - git identity probe; injectable for tests
+* @returns the directory tree to contain to, or null if the cwd must be rejected
+*/
+const resolveContainmentRoot = (root, cwd, probe = gitWorktreeProbe) => {
+	if (cwd === root || cwd.startsWith(`${root}${sep}`)) return root;
+	const from = probe(cwd);
+	if (!from) return null;
+	const home = probe(root);
+	if (!home) return null;
+	if (from.commonDir !== home.commonDir) return null;
+	if (from.topLevel === home.topLevel) return null;
+	return from.topLevel;
+};
+/**
 * Run Biome and return structured diagnostics. When `write`/`unsafe` is set,
 * runs a fix pass first, then a read-only gitlab pass to report what remains.
 *
@@ -152,17 +218,11 @@ const BiomeCheckAsMarkdown = BiomeCheckResult.pipe(Schema.decodeTo(Schema.String
 */
 const runBiomeCheck = async (args, fallbackCwd) => {
 	const mode = args.mode ?? "check";
-	const canonicalize = (p) => {
-		try {
-			return realpathSync(p);
-		} catch {
-			return resolve(p);
-		}
-	};
 	const root = canonicalize(fallbackCwd);
-	const within = (abs) => abs === root || abs.startsWith(`${root}${sep}`);
 	const cwd = canonicalize(args.cwd ?? fallbackCwd);
-	if (!within(cwd)) throw new Error(`cwd escapes the workspace root: ${args.cwd}`);
+	const containmentRoot = resolveContainmentRoot(root, cwd);
+	if (containmentRoot === null) throw new Error(`cwd escapes the workspace root: ${args.cwd}`);
+	const within = (abs) => abs === containmentRoot || abs.startsWith(`${containmentRoot}${sep}`);
 	const paths = (args.paths && args.paths.length > 0 ? args.paths : ["."]).map((p) => {
 		const lexical = resolve(cwd, p);
 		if (!within(canonicalize(lexical))) throw new Error(`path escapes the workspace root: ${p}`);
@@ -222,4 +282,4 @@ const runBiomeCheck = async (args, fallbackCwd) => {
 };
 
 //#endregion
-export { BiomeCheckAsMarkdown, BiomeCheckResult, BiomeDiagnostic, BiomeSeverity, buildBiomeResult, parseBiomeGitlab, runBiomeCheck };
+export { BiomeCheckAsMarkdown, BiomeCheckResult, BiomeDiagnostic, BiomeSeverity, buildBiomeResult, parseBiomeGitlab, resolveContainmentRoot, runBiomeCheck };