@master/css-mcp 2.0.0-rc.85 → 2.0.0-rc.86

package/README.md

@@ -43,7 +43,7 @@ Use an absolute `--root` path so the server resolves the intended workspace.
 | `mastercss_inspect_directives` | Inspect CSS-first directives and report manifest, dependency, warning, and CSS effects. |
 | `mastercss_render_css` | Generate CSS from HTML or a class list. |
 | `mastercss_scan_project` | Scan sources, check optional classes, and report scanner state, stylesheet entries, generated CSS metadata, and missing CSS diagnostics. |
-| `mastercss_manifest_query` | Query active manifest tokens, utilities, variants, modes, at-rules, and aliases. |
+| `mastercss_manifest_query` | Query active manifest tokens, utilities, variants, modes, conditions, and aliases. |
 | `mastercss_css_compare` | Compare generated CSS for before/after class lists, HTML fragments, or source buffers. |
 | `mastercss_lint_project` | Run class-list diagnostics for workspace files without writing files. |
 | `mastercss_lint_content` | Run class-list diagnostics on an in-memory source buffer without writing files. |

package/dist/classes.d.ts

@@ -1,5 +1,4 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/classes.d.ts
 interface ExtractClassesOptions {
   content?: string;
@@ -17,9 +16,9 @@ declare function extractClasses(context: MasterCSSMCPContext, options?: ExtractC
   version: number;
   root: string;
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
+    error?: string | undefined;
   };
   inputs: {
     mode: string;
@@ -58,15 +57,15 @@ declare function extractClasses(context: MasterCSSMCPContext, options?: ExtractC
         valueToken: string | undefined;
         stateToken: string | undefined;
         important: boolean | undefined;
-        matcherTypes: ("static" | "pattern" | "key" | "variable" | "value")[];
+        matcherTypes: ("key" | "pattern" | "static" | "value" | "variable")[];
         variables: {
           key: string;
-          variable: import("@master/css-language").Variable;
+          variable: import("~/packages/language/src").Variable;
         }[];
         rules: {
           className: string;
           layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName;
-          type: import("@master/css-language").UtilityType;
+          type: import("~/packages/language/src").UtilityType;
         }[];
       };
     }[];
@@ -84,15 +83,15 @@ declare function extractClasses(context: MasterCSSMCPContext, options?: ExtractC
   version: number;
   root: string;
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
+    error?: string | undefined;
   };
   inputs: {
+    filePath?: undefined;
     mode: string;
     patterns: string[];
     files: string[];
-    filePath?: undefined;
   };
   files: {
     filePath: string;
@@ -125,15 +124,15 @@ declare function extractClasses(context: MasterCSSMCPContext, options?: ExtractC
         valueToken: string | undefined;
         stateToken: string | undefined;
         important: boolean | undefined;
-        matcherTypes: ("static" | "pattern" | "key" | "variable" | "value")[];
+        matcherTypes: ("key" | "pattern" | "static" | "value" | "variable")[];
         variables: {
           key: string;
-          variable: import("@master/css-language").Variable;
+          variable: import("~/packages/language/src").Variable;
         }[];
         rules: {
           className: string;
           layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName;
-          type: import("@master/css-language").UtilityType;
+          type: import("~/packages/language/src").UtilityType;
         }[];
       };
     }[];
@@ -149,7 +148,7 @@ declare function extractClasses(context: MasterCSSMCPContext, options?: ExtractC
       blocklist: number;
     };
   };
-  diagnostics: import("@master/css-diagnostics").MasterCSSInspectionDiagnostic[];
+  diagnostics: import("~/packages/diagnostics/src").MasterCSSInspectionDiagnostic[];
   summary: {
     files: number;
     classes: number;
@@ -162,9 +161,9 @@ declare function traceClass(context: MasterCSSMCPContext, options: TraceClassOpt
   version: number;
   root: string;
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
+    error?: string | undefined;
   };
   inputs: {
     className: string;
@@ -172,8 +171,8 @@ declare function traceClass(context: MasterCSSMCPContext, options: TraceClassOpt
     mode: string | undefined;
   };
   className: string;
-  status: "present" | "missing";
-  reason: "generated" | "native-css" | "invalid" | "safelist" | "blocklisted" | "not-detected";
+  status: "missing" | "present";
+  reason: "blocklisted" | "generated" | "invalid" | "native-css" | "not-detected" | "safelist";
   detected: boolean;
   occurrences: {
     filePath: string;
@@ -190,15 +189,15 @@ declare function traceClass(context: MasterCSSMCPContext, options: TraceClassOpt
     valueToken: string | undefined;
     stateToken: string | undefined;
     important: boolean | undefined;
-    matcherTypes: ("static" | "pattern" | "key" | "variable" | "value")[];
+    matcherTypes: ("key" | "pattern" | "static" | "value" | "variable")[];
     variables: {
       key: string;
-      variable: import("@master/css-language").Variable;
+      variable: import("~/packages/language/src").Variable;
     }[];
     rules: {
       className: string;
       layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName;
-      type: import("@master/css-language").UtilityType;
+      type: import("~/packages/language/src").UtilityType;
     }[];
   };
   scanner: {
@@ -215,18 +214,18 @@ declare function traceClass(context: MasterCSSMCPContext, options: TraceClassOpt
     blocklist: boolean;
   };
   css: {
-    text?: string | undefined;
     included: boolean;
     bytes: number;
     emittedGlobals: {
       variables: number;
       animations: number;
     };
+    text?: string | undefined;
   };
-  diagnostics: import("@master/css-diagnostics").MasterCSSInspectionDiagnostic[];
+  diagnostics: import("~/packages/diagnostics/src").MasterCSSInspectionDiagnostic[];
   summary: {
-    status: "present" | "missing";
-    reason: "generated" | "native-css" | "invalid" | "safelist" | "blocklisted" | "not-detected";
+    status: "missing" | "present";
+    reason: "blocklisted" | "generated" | "invalid" | "native-css" | "not-detected" | "safelist";
     detected: boolean;
     valid: boolean;
     rules: number;

package/dist/compare.d.ts

@@ -1,5 +1,4 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/compare.d.ts
 interface CompareCSSOptions {
   beforeClassList?: string;
@@ -14,9 +13,9 @@ declare function compareCSS(context: MasterCSSMCPContext, options: CompareCSSOpt
   version: number;
   root: string;
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
+    error?: string | undefined;
   };
   inputs: {
     filePath: string;

package/dist/contributor.d.ts

@@ -1,5 +1,4 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/contributor.d.ts
 interface ContributorInput {
   paths?: string[];
@@ -28,31 +27,36 @@ interface Risk {
   paths: string[];
 }
 declare function getPackageGraph(context: MasterCSSMCPContext, input?: PackageGraphInput): Promise<{
+  status: "limited" | "loaded";
+  reason: string;
+  version: number;
+  audience: string;
+  root: string;
   packages: WorkspacePackage[];
   summary: {
     packages: number;
     workspacePackages: number;
     examples: number;
   };
-  status: "loaded" | "limited";
+}>;
+declare function getRepoContext(context: MasterCSSMCPContext, input?: ContributorInput): Promise<{
+  status: "limited" | "loaded";
   reason: string;
   version: number;
   audience: string;
   root: string;
-}>;
-declare function getRepoContext(context: MasterCSSMCPContext, input?: ContributorInput): Promise<{
   inputs: {
     task: string | null;
     paths: string[];
     hasDiff: boolean;
   };
   affectedPackages: {
-    matchedPaths: string[];
     name: string;
     path: string;
-    kind: WorkspacePackage["kind"] | "agent-docs" | "repo-root";
+    kind: WorkspacePackage['kind'] | 'agent-docs' | 'repo-root';
     packageJSON?: string;
     aiNotes?: string | null;
+    matchedPaths: string[];
   }[];
   context: {
     files: string[];
@@ -65,29 +69,24 @@ declare function getRepoContext(context: MasterCSSMCPContext, input?: Contributo
       reason: string;
     }[];
   };
-  status: "loaded" | "limited";
-  reason: string;
-  version: number;
-  audience: string;
-  root: string;
 } | {
   version: number;
   audience: string;
   root: string;
-  status: "error";
+  status: 'error';
   error: string;
 }>;
 declare function getChangeImpact(context: MasterCSSMCPContext, input?: ContributorInput): Promise<{
   version: number;
   audience: string;
   root: string;
-  status: "error";
+  status: 'error';
   error: string;
 } | {
   version: number;
   audience: string;
   root: string;
-  status: "loaded" | "limited";
+  status: "limited" | "loaded";
   reason: string;
   inputs: {
     task: string | null;
@@ -95,12 +94,12 @@ declare function getChangeImpact(context: MasterCSSMCPContext, input?: Contribut
     hasDiff: boolean;
   };
   affectedPackages: {
-    matchedPaths: string[];
     name: string;
     path: string;
-    kind: WorkspacePackage["kind"] | "agent-docs" | "repo-root";
+    kind: WorkspacePackage['kind'] | 'agent-docs' | 'repo-root';
     packageJSON?: string;
     aiNotes?: string | null;
+    matchedPaths: string[];
   }[];
   risks: Risk[];
   summary: {
@@ -113,13 +112,13 @@ declare function getTestRouter(context: MasterCSSMCPContext, input?: Contributor
   version: number;
   audience: string;
   root: string;
-  status: "error";
+  status: 'error';
   error: string;
 } | {
   version: number;
   audience: string;
   root: string;
-  status: "loaded" | "limited";
+  status: "limited" | "loaded";
   reason: string;
   inputs: {
     task: string | null;
@@ -127,12 +126,12 @@ declare function getTestRouter(context: MasterCSSMCPContext, input?: Contributor
     hasDiff: boolean;
   };
   affectedPackages: {
-    matchedPaths: string[];
     name: string;
     path: string;
-    kind: WorkspacePackage["kind"] | "agent-docs" | "repo-root";
+    kind: WorkspacePackage['kind'] | 'agent-docs' | 'repo-root';
     packageJSON?: string;
     aiNotes?: string | null;
+    matchedPaths: string[];
   }[];
   validation: {
     commands: {
@@ -142,7 +141,7 @@ declare function getTestRouter(context: MasterCSSMCPContext, input?: Contributor
   };
   risks: {
     id: string;
-    severity: "warning" | "info" | "high";
+    severity: "high" | "info" | "warning";
     reason: string;
   }[];
 }>;

package/dist/directives.d.ts

@@ -1,5 +1,4 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/directives.d.ts
 interface InspectDirectivesOptions {
   content?: string;
@@ -8,34 +7,16 @@ interface InspectDirectivesOptions {
   preserveNativeCSS?: boolean;
 }
 declare function inspectDirectives(context: MasterCSSMCPContext, options: InspectDirectivesOptions): Promise<{
-  diagnostics: {
-    code: string;
-    severity: "warning";
-    message: string;
-    source: string;
-    sourceKind: string;
-    filePath: string;
-  }[];
-  summary: {
-    status: string;
-    directives: number;
-    classNames: number;
-    nativeClassNames: number;
-    dependencies: number;
-    warnings: number;
-    cssBytes: number;
-    errors?: undefined;
-  };
   manifest: {
-    settings: import("@master/css-engine").MasterCSSManifestSettings;
+    settings: import("~/packages/engine/src").MasterCSSManifestSettings;
     counts: {
       variables: number;
       variableNamespaces: number;
       utilities: number;
       variants: number;
-      atRules: number;
-      breakpointAtRules: number;
-      containerAtRules: number;
+      conditions: number;
+      breakpointConditions: number;
+      containerConditions: number;
       selectors: number;
       animations: number;
     };
@@ -48,7 +29,7 @@ declare function inspectDirectives(context: MasterCSSMCPContext, options: Inspec
         variables: number;
         utilities: number;
         variants: number;
-        atRules: number;
+        conditions: number;
         selectors: number;
         animations: number;
       };
@@ -56,7 +37,7 @@ declare function inspectDirectives(context: MasterCSSMCPContext, options: Inspec
     classNames: string[];
     nativeClassNames: string[];
     styleDefinitions: number;
-    extractionPolicy: import("@master/css-schema/css-directives").CSSDirectiveExtractionPolicy;
+    extractionPolicy: import("~/packages/schema/src/css-directives").CSSDirectiveExtractionPolicy;
   };
   css: {
     bytes: number;
@@ -87,14 +68,32 @@ declare function inspectDirectives(context: MasterCSSMCPContext, options: Inspec
     hasBlock: boolean;
     quotedStrings: number;
   }[];
+  diagnostics: {
+    code: string;
+    severity: 'warning';
+    message: string;
+    source: string;
+    sourceKind: string;
+    filePath: string;
+  }[];
+  summary: {
+    status: string;
+    directives: number;
+    classNames: number;
+    nativeClassNames: number;
+    dependencies: number;
+    warnings: number;
+    cssBytes: number;
+    errors?: undefined;
+  };
 } | {
   version: number;
   root: string;
   status: string;
   input: {
+    name?: undefined;
     filePath: string;
     mode: string;
-    name?: undefined;
   };
   directiveEntries: {
     name: import("@master/css-lexer").CSSDirectiveRangeName;
@@ -112,7 +111,7 @@ declare function inspectDirectives(context: MasterCSSMCPContext, options: Inspec
   }[];
   diagnostics: {
     code: string;
-    severity: "error";
+    severity: 'error';
     message: string;
     source: string;
     sourceKind: string;

package/dist/directives.js

@@ -36,7 +36,7 @@ function summarizeManifestInput(input) {
 			variables: countObjectKeys(manifestInput.variables),
 			utilities: Array.isArray(manifestInput.utilities) ? manifestInput.utilities.length : countObjectKeys(manifestInput.utilities),
 			variants: Array.isArray(manifestInput.variants) ? manifestInput.variants.length : countObjectKeys(manifestInput.variants),
-			atRules: countObjectKeys(manifestInput.atRules),
+			conditions: countObjectKeys(manifestInput.conditions),
 			selectors: countObjectKeys(manifestInput.selectors),
 			animations: countObjectKeys(manifestInput.animations)
 		}

package/dist/document.d.ts

@@ -1,5 +1,4 @@
 import { TextDocument } from "vscode-languageserver-textdocument";
-
 //#region src/document.d.ts
 interface Position {
   line: number;

package/dist/format.d.ts

@@ -1,6 +1,5 @@
 import MasterCSSMCPContext from "./context.js";
 import { Range, TextEdit } from "./document.js";
-
 //#region src/format.d.ts
 interface PreviewDirectiveFormatOptions {
   content?: string;
@@ -30,6 +29,7 @@ declare function previewDirectiveFormat(context: MasterCSSMCPContext, options?:
   inputs?: undefined;
   preview?: undefined;
 } | {
+  formatted?: undefined;
   version: number;
   root: string;
   mode: string;
@@ -51,7 +51,6 @@ declare function previewDirectiveFormat(context: MasterCSSMCPContext, options?:
     changed: number;
     edits: number;
   };
-  formatted?: undefined;
 }>;
 //#endregion
 export { PreviewDirectiveFormatOptions, previewDirectiveFormat };

package/dist/format.js

@@ -46,7 +46,8 @@ async function previewDirectiveFormat(context, options = {}) {
 	}
 	const files = await resolveSourceFiles(context, options.patterns ?? DEFAULT_DIRECTIVE_FORMAT_PATTERNS);
 	const formattedFiles = await Promise.all(files.map(async (filePath) => {
-		return formatContent(service, filePath, await readFile(filePath, "utf8"), options.range);
+		const content = await readFile(filePath, "utf8");
+		return formatContent(service, filePath, content, options.range);
 	}));
 	const preview = await context.createPreview(formattedFiles.filter((file) => file.changed).map((file) => ({
 		filePath: file.filePath,

package/dist/language.d.ts

@@ -1,5 +1,4 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/language.d.ts
 interface SuggestSyntaxOptions {
   content: string;
@@ -13,9 +12,9 @@ interface SuggestSyntaxOptions {
 }
 declare function suggestSyntax(context: MasterCSSMCPContext, options: SuggestSyntaxOptions): Promise<{
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
+    error?: string | undefined;
   };
   completions: import("vscode-languageserver-protocol").CompletionItem[];
   total: number;

package/dist/lint.d.ts

@@ -1,6 +1,5 @@
 import { MasterCSSLintFileResult, MasterCSSLintSourceDiagnostic } from "@master/css-lint";
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/lint.d.ts
 interface LintProjectOptions {
   patterns?: string[];
@@ -19,7 +18,7 @@ declare function lintProject(context: MasterCSSMCPContext, options?: LintProject
   version: number;
   root: string;
   manifest: {
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
     diagnostics: MasterCSSLintSourceDiagnostic[];
   };
@@ -30,7 +29,7 @@ declare function lintContent(context: MasterCSSMCPContext, options: LintContentO
   version: number;
   root: string;
   manifest: {
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
     diagnostics: MasterCSSLintSourceDiagnostic[];
   };
@@ -44,7 +43,7 @@ declare function previewLintFixes(context: MasterCSSMCPContext, options?: Previe
     version: number;
     root: string;
     manifest: {
-      status: "loaded" | "error";
+      status: "error" | "loaded";
       entries: string[];
       diagnostics: MasterCSSLintSourceDiagnostic[];
     };

package/dist/manifest-query.d.ts

@@ -1,7 +1,6 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/manifest-query.d.ts
-type ManifestQueryKind = 'all' | 'token' | 'utility' | 'variant' | 'mode' | 'at-rule' | 'alias';
+type ManifestQueryKind = 'all' | 'token' | 'utility' | 'variant' | 'mode' | 'condition' | 'alias';
 interface ManifestQueryOptions {
   query?: string;
   kind?: ManifestQueryKind;
@@ -28,12 +27,12 @@ declare function queryManifest(context: MasterCSSMCPContext, options?: ManifestQ
     utilities: never[];
     variants: never[];
     modes: never[];
-    atRules: never[];
+    conditions: never[];
     aliases: never[];
   };
   diagnostics: {
     code: string;
-    severity: "error";
+    severity: 'error';
     message: string;
     source: string;
     sourceKind: string;
@@ -46,13 +45,15 @@ declare function queryManifest(context: MasterCSSMCPContext, options?: ManifestQ
     utilities?: undefined;
     variants?: undefined;
     modes?: undefined;
-    atRules?: undefined;
+    conditions?: undefined;
     aliases?: undefined;
   };
 } | {
+  diagnostics?: undefined;
   version: number;
   root: string;
   manifest: {
+    error?: undefined;
     status: "loaded";
     entries: string[];
     summary: {
@@ -62,14 +63,13 @@ declare function queryManifest(context: MasterCSSMCPContext, options?: ManifestQ
         variableNamespaces: number;
         utilities: number;
         variants: number;
-        atRules: number;
-        breakpointAtRules: number;
-        containerAtRules: number;
+        conditions: number;
+        breakpointConditions: number;
+        containerConditions: number;
         selectors: number;
         animations: number;
       };
     };
-    error?: undefined;
   };
   inputs: {
     query: string | undefined;
@@ -79,28 +79,28 @@ declare function queryManifest(context: MasterCSSMCPContext, options?: ManifestQ
   };
   results: {
     tokens: {
-      static?: boolean | undefined;
-      inline?: boolean | undefined;
-      modes?: string[] | undefined;
-      numeric?: import("@master/css-engine").MasterCSSManifestVariableNumericValue | undefined;
       name: string;
       key: string;
       namespace: string;
-      type: "string" | "number";
+      type: "number" | "string";
       value: import("@master/css-engine").MasterCSSManifestVariableValue | undefined;
+      numeric?: import("@master/css-engine").MasterCSSManifestVariableNumericValue | undefined;
+      modes?: string[] | undefined;
+      inline?: boolean | undefined;
+      static?: boolean | undefined;
     }[];
     utilities: {
-      variableAliasRefs?: string[] | undefined;
-      aliasGroups?: string[] | undefined;
-      layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName | undefined;
-      matcherTypes: ("static" | "pattern" | "key" | "variable" | "value")[];
-      emitType: "static" | "declarations" | "template" | "property";
-      namespaces?: string[] | undefined;
-      keys?: string[] | undefined;
-      subkey?: string | undefined;
-      key?: string | undefined;
-      name?: string | undefined;
       id: string;
+      name?: string | undefined;
+      key?: string | undefined;
+      subkey?: string | undefined;
+      keys?: string[] | undefined;
+      namespaces?: string[] | undefined;
+      layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName | undefined;
+      matcherTypes: ("key" | "pattern" | "static" | "value" | "variable")[];
+      emitType: "declarations" | "property" | "static" | "template";
+      aliasGroups?: string[] | undefined;
+      variableAliasRefs?: string[] | undefined;
     }[];
     variants: {
       token: import("@master/css-engine").MasterCSSManifestVariantToken;
@@ -112,24 +112,24 @@ declare function queryManifest(context: MasterCSSMCPContext, options?: ManifestQ
       default: boolean;
       trigger: import("@master/css-engine").MasterCSSManifestModeTrigger | undefined;
     }[];
-    atRules: {
+    conditions: {
       name: string;
-      id: import("@master/css-engine").MasterCSSManifestAtIdentifier;
+      id: import("@master/css-engine").MasterCSSManifestConditionIdentifier;
       nodes: number;
     }[];
     aliases: ({
       utility: string;
       key: string;
       name: string;
-      type: "variable-alias";
+      type: 'variable-alias';
     } | {
       utility: string;
       ref: string;
-      type: "variable-alias-ref";
+      type: 'variable-alias-ref';
     } | {
       utility: string;
       group: string;
-      type: "alias-group";
+      type: 'alias-group';
     })[];
   };
   summary: {
@@ -139,11 +139,10 @@ declare function queryManifest(context: MasterCSSMCPContext, options?: ManifestQ
     utilities: number;
     variants: number;
     modes: number;
-    atRules: number;
+    conditions: number;
     aliases: number;
     status: string;
   };
-  diagnostics?: undefined;
 }>;
 //#endregion
 export { ManifestQueryKind, ManifestQueryOptions, queryManifest };

package/dist/manifest-query.js

@@ -1,5 +1,5 @@
 import { loadWorkspaceManifest } from "./project.js";
-import { compactAtRules, compactUtility, compactVariable, summarizeManifest } from "./manifest-summary.js";
+import { compactConditions, compactUtility, compactVariable, summarizeManifest } from "./manifest-summary.js";
 import { flattenMasterCSSManifestVariables } from "@master/css-engine";
 //#region src/manifest-query.ts
 const MANIFEST_QUERY_VERSION = 1;
@@ -52,7 +52,7 @@ async function queryManifest(context, options = {}) {
 			utilities: [],
 			variants: [],
 			modes: [],
-			atRules: [],
+			conditions: [],
 			aliases: []
 		},
 		diagnostics: [{
@@ -86,10 +86,10 @@ async function queryManifest(context, options = {}) {
 		default: mode === activeManifest.settings?.defaultMode,
 		trigger: activeManifest.settings?.modeTrigger
 	}));
-	const atRules = [
-		...compactAtRules(activeManifest.atRules),
-		...compactAtRules(activeManifest.breakpointAtRules),
-		...compactAtRules(activeManifest.containerAtRules)
+	const conditions = [
+		...compactConditions(activeManifest.conditions),
+		...compactConditions(activeManifest.breakpointConditions),
+		...compactConditions(activeManifest.containerConditions)
 	].filter((rule) => matchesAny([rule.name, rule.id], query));
 	const aliases = (activeManifest.utilities || []).flatMap((utility) => [
 		...(utility.variableAliases || []).map(([key, name]) => ({
@@ -114,7 +114,7 @@ async function queryManifest(context, options = {}) {
 		utilities: kind === "all" || kind === "utility" ? utilities : [],
 		variants: kind === "all" || kind === "variant" ? variants : [],
 		modes: kind === "all" || kind === "mode" ? modes : [],
-		atRules: kind === "all" || kind === "at-rule" ? atRules : [],
+		conditions: kind === "all" || kind === "condition" ? conditions : [],
 		aliases: kind === "all" || kind === "alias" ? aliases : []
 	};
 	const limitedResults = {
@@ -122,7 +122,7 @@ async function queryManifest(context, options = {}) {
 		utilities: limitResults(allResults.utilities, limit),
 		variants: limitResults(allResults.variants, limit),
 		modes: limitResults(allResults.modes, limit),
-		atRules: limitResults(allResults.atRules, limit),
+		conditions: limitResults(allResults.conditions, limit),
 		aliases: limitResults(allResults.aliases, limit)
 	};
 	const total = Object.values(allResults).reduce((count, items) => count + items.length, 0);
@@ -149,7 +149,7 @@ async function queryManifest(context, options = {}) {
 			utilities: utilities.length,
 			variants: variants.length,
 			modes: modes.length,
-			atRules: atRules.length,
+			conditions: conditions.length,
 			aliases: aliases.length,
 			status: "ok"
 		}

package/dist/manifest-summary.d.ts

@@ -1,5 +1,4 @@
-import { MasterCSSManifest, MasterCSSManifestAtRules, MasterCSSManifestUtility, MasterCSSManifestVariableEntry } from "@master/css-engine";
-
+import { MasterCSSManifest, MasterCSSManifestConditions, MasterCSSManifestUtility, MasterCSSManifestVariableEntry } from "@master/css-engine";
 //#region src/manifest-summary.d.ts
 declare function summarizeManifest(manifest: MasterCSSManifest): {
   settings: import("@master/css-engine").MasterCSSManifestSettings;
@@ -8,41 +7,41 @@ declare function summarizeManifest(manifest: MasterCSSManifest): {
     variableNamespaces: number;
     utilities: number;
     variants: number;
-    atRules: number;
-    breakpointAtRules: number;
-    containerAtRules: number;
+    conditions: number;
+    breakpointConditions: number;
+    containerConditions: number;
     selectors: number;
     animations: number;
   };
 };
 declare function compactVariable(variable: MasterCSSManifestVariableEntry): {
-  static?: boolean | undefined;
-  inline?: boolean | undefined;
-  modes?: string[] | undefined;
-  numeric?: import("@master/css-engine").MasterCSSManifestVariableNumericValue | undefined;
   name: string;
   key: string;
   namespace: string;
-  type: "string" | "number";
+  type: "number" | "string";
   value: import("@master/css-engine").MasterCSSManifestVariableValue | undefined;
+  numeric?: import("@master/css-engine").MasterCSSManifestVariableNumericValue | undefined;
+  modes?: string[] | undefined;
+  inline?: boolean | undefined;
+  static?: boolean | undefined;
 };
 declare function compactUtility(utility: MasterCSSManifestUtility): {
-  variableAliasRefs?: string[] | undefined;
-  aliasGroups?: string[] | undefined;
-  layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName | undefined;
-  matcherTypes: ("static" | "pattern" | "key" | "variable" | "value")[];
-  emitType: "static" | "declarations" | "template" | "property";
-  namespaces?: string[] | undefined;
-  keys?: string[] | undefined;
-  subkey?: string | undefined;
-  key?: string | undefined;
-  name?: string | undefined;
   id: string;
+  name?: string | undefined;
+  key?: string | undefined;
+  subkey?: string | undefined;
+  keys?: string[] | undefined;
+  namespaces?: string[] | undefined;
+  layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName | undefined;
+  matcherTypes: ("key" | "pattern" | "static" | "value" | "variable")[];
+  emitType: "declarations" | "property" | "static" | "template";
+  aliasGroups?: string[] | undefined;
+  variableAliasRefs?: string[] | undefined;
 };
-declare function compactAtRules(atRules: MasterCSSManifestAtRules | undefined): {
+declare function compactConditions(conditions: MasterCSSManifestConditions | undefined): {
   name: string;
-  id: import("@master/css-engine").MasterCSSManifestAtIdentifier;
+  id: import("@master/css-engine").MasterCSSManifestConditionIdentifier;
   nodes: number;
 }[];
 //#endregion
-export { compactAtRules, compactUtility, compactVariable, summarizeManifest };
+export { compactConditions, compactUtility, compactVariable, summarizeManifest };

package/dist/manifest-summary.js

@@ -9,9 +9,9 @@ function summarizeManifest(manifest) {
 			variableNamespaces: Object.keys(manifest.variables || {}).length,
 			utilities: manifest.utilities?.length ?? 0,
 			variants: manifest.variants?.length ?? 0,
-			atRules: Object.keys(manifest.atRules || {}).length,
-			breakpointAtRules: Object.keys(manifest.breakpointAtRules || {}).length,
-			containerAtRules: Object.keys(manifest.containerAtRules || {}).length,
+			conditions: Object.keys(manifest.conditions || {}).length,
+			breakpointConditions: Object.keys(manifest.breakpointConditions || {}).length,
+			containerConditions: Object.keys(manifest.containerConditions || {}).length,
 			selectors: Object.keys(manifest.selectors || {}).length,
 			animations: Object.keys(manifest.animations || {}).length
 		}
@@ -45,12 +45,12 @@ function compactUtility(utility) {
 		...utility.variableAliasRefs?.length ? { variableAliasRefs: utility.variableAliasRefs } : {}
 	};
 }
-function compactAtRules(atRules) {
-	return Object.entries(atRules || {}).map(([name, rule]) => ({
+function compactConditions(conditions) {
+	return Object.entries(conditions || {}).map(([name, rule]) => ({
 		name,
 		id: rule.id,
 		nodes: rule.nodes.length
 	}));
 }
 //#endregion
-export { compactAtRules, compactUtility, compactVariable, summarizeManifest };
+export { compactConditions, compactUtility, compactVariable, summarizeManifest };

package/dist/project.d.ts

@@ -1,31 +1,30 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/project.d.ts
 declare function loadWorkspaceManifest(context: MasterCSSMCPContext): Promise<{
-  status: "loaded";
-  manifest: import("@master/css-engine").MasterCSSManifest;
+  status: 'loaded';
+  manifest: import("~/packages/engine/src").MasterCSSManifest;
   entries: string[];
   dependencies: string[];
   warnings: string[];
   error?: undefined;
 } | {
-  status: "error";
+  manifest?: undefined;
+  status: 'error';
   entries: string[];
   dependencies: string[];
   warnings: string[];
   error: string;
-  manifest?: undefined;
 }>;
 declare function getWorkspaceInfo(context: MasterCSSMCPContext): Promise<{
   root: string;
   roots: string[];
   packages: import("@master/css-project/workspace").MasterCSSWorkspacePackageResolution;
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
     dependencies: string[];
     warnings: string[];
+    error?: string | undefined;
   };
 }>;
 //#endregion

package/dist/result.d.ts

@@ -1,5 +1,4 @@
 import { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
-
 //#region src/result.d.ts
 declare function toJSONText(value: unknown): string;
 declare function jsonToolResult(value: unknown): CallToolResult;

package/dist/scan.d.ts

@@ -1,5 +1,4 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/scan.d.ts
 interface ScanProjectOptions {
   patterns?: string[];
@@ -16,14 +15,6 @@ interface InspectClassOptions {
 }
 declare function resolveSourceFiles(context: MasterCSSMCPContext, patterns?: string[], ignore?: string[]): Promise<string[]>;
 declare function scanProject(context: MasterCSSMCPContext, options?: ScanProjectOptions): Promise<{
-  root: string;
-  manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
-    entries: string[];
-    dependencies: string[];
-    warnings: string[];
-  };
   version: typeof import("@master/css-diagnostics").MASTER_CSS_INSPECTION_REPORT_VERSION;
   cwd: string;
   inputs: {
@@ -83,12 +74,20 @@ declare function scanProject(context: MasterCSSMCPContext, options?: ScanProject
     missingCSS: number;
     invalidClasses: number;
   };
+  root: string;
+  manifest: {
+    status: "error" | "loaded";
+    entries: string[];
+    dependencies: string[];
+    warnings: string[];
+    error?: string | undefined;
+  };
 }>;
 declare function renderCSS(context: MasterCSSMCPContext, options: RenderCSSOptions): Promise<{
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
+    error?: string | undefined;
   };
   classes: string[];
   invalid: string[];
@@ -99,9 +98,9 @@ declare function renderCSS(context: MasterCSSMCPContext, options: RenderCSSOptio
 }>;
 declare function inspectClass(context: MasterCSSMCPContext, options: InspectClassOptions): Promise<{
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
+    error?: string | undefined;
   };
   className: string;
   mode: string | undefined;
@@ -114,15 +113,15 @@ declare function inspectClass(context: MasterCSSMCPContext, options: InspectClas
   valueToken: string | undefined;
   stateToken: string | undefined;
   important: boolean | undefined;
-  matcherTypes: ("static" | "pattern" | "key" | "variable" | "value")[];
+  matcherTypes: ("key" | "pattern" | "static" | "value" | "variable")[];
   variables: {
     key: string;
-    variable: import("@master/css-language").Variable;
+    variable: import("~/packages/language/src").Variable;
   }[];
   rules: {
     className: string;
     layer: import("@master/css-engine").MasterCSSManifestUtilityLayerName;
-    type: import("@master/css-language").UtilityType;
+    type: import("~/packages/language/src").UtilityType;
     text: string;
   }[];
   css: string;

package/dist/server.d.ts

@@ -1,6 +1,5 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import MasterCSSMCPContext, { MasterCSSMCPContextOptions } from "./context.js";
-
 //#region src/server.d.ts
 interface MasterCSSMCPServerInstance {
   server: McpServer;

package/dist/server.js

@@ -271,7 +271,7 @@ function registerTools(server, context) {
 	}, async (input) => jsonToolResult(await getPackageGraph(context, input)));
 	server.registerTool("mastercss_manifest_query", {
 		title: "Query Master CSS Manifest",
-		description: "Query active manifest tokens, utilities, variants, modes, at-rules, and aliases.",
+		description: "Query active manifest tokens, utilities, variants, modes, conditions, and aliases.",
 		inputSchema: {
 			query: z.string().optional(),
 			kind: z.enum([
@@ -280,7 +280,7 @@ function registerTools(server, context) {
 				"utility",
 				"variant",
 				"mode",
-				"at-rule",
+				"condition",
 				"alias"
 			]).optional(),
 			namespace: z.string().optional(),

package/dist/setup.d.ts

@@ -1,5 +1,4 @@
 import MasterCSSMCPContext from "./context.js";
-
 //#region src/setup.d.ts
 type SetupDiagnosticSeverity = 'error' | 'warning' | 'info';
 interface SetupDiagnostic {
@@ -21,9 +20,9 @@ declare function auditSetup(context: MasterCSSMCPContext): Promise<{
     inferred: string;
   };
   packageJSON: {
-    error?: string | undefined;
     filePath: string;
     loaded: boolean;
+    error?: string | undefined;
   };
   packages: {
     declared: {
@@ -37,20 +36,20 @@ declare function auditSetup(context: MasterCSSMCPContext): Promise<{
     resolved: import("@master/css-project/workspace").MasterCSSWorkspacePackageResolution;
   };
   integrations: ({
-    type: "package";
+    type: 'package';
     name: string;
     version: string;
   } | {
-    type: "script";
+    type: 'script';
     name: string;
     command: string;
   })[];
   manifest: {
-    error?: string | undefined;
-    status: "loaded" | "error";
+    status: "error" | "loaded";
     entries: string[];
     dependencies: string[];
     warnings: string[];
+    error?: string | undefined;
   };
   diagnostics: SetupDiagnostic[];
   summary: {

package/package.json

@@ -53,18 +53,18 @@
     "fast-glob": "^3.3.3",
     "vscode-languageserver-textdocument": "^1.0.12",
     "zod": "^4.4.3",
-    "@master/css-compiler": "^2.0.0-rc.85",
-    "@master/css-engine": "^2.0.0-rc.85",
-    "@master/css-diagnostics": "^2.0.0-rc.85",
-    "@master/css-language-service": "^2.0.0-rc.85",
-    "@master/css-lint": "^2.0.0-rc.85",
-    "@master/css-lexer": "^2.0.0-rc.85",
-    "@master/css-project": "^2.0.0-rc.85",
-    "@master/css-preset": "^2.0.0-rc.85",
-    "@master/css-validator": "^2.0.0-rc.85",
-    "@master/css-server": "^2.0.0-rc.85"
+    "@master/css-engine": "^2.0.0-rc.86",
+    "@master/css-diagnostics": "^2.0.0-rc.86",
+    "@master/css-compiler": "^2.0.0-rc.86",
+    "@master/css-lexer": "^2.0.0-rc.86",
+    "@master/css-language-service": "^2.0.0-rc.86",
+    "@master/css-lint": "^2.0.0-rc.86",
+    "@master/css-server": "^2.0.0-rc.86",
+    "@master/css-project": "^2.0.0-rc.86",
+    "@master/css-validator": "^2.0.0-rc.86",
+    "@master/css-preset": "^2.0.0-rc.86"
   },
-  "version": "2.0.0-rc.85",
+  "version": "2.0.0-rc.86",
   "scripts": {
     "build": "tsdown --config ../../shared/tsdown-package.config.ts",
     "dev": "tsdown --config ../../shared/tsdown-package.config.ts --watch",