@wcstack/lint 1.32.0 → 2.0.0

package/dist/cli.cjs

@@ -96,6 +96,9 @@ var WcsDiagnosticCode = {
   // 同名 tag / filter の後勝ち禁止(§5-3)。override:true が無い再定義もこの collision で表す。
   ManifestTagCollision: "wcs/manifest-tag-collision",
   ManifestFilterCollision: "wcs/manifest-filter-collision",
+  // 同名 state の stateSchema が複数の application artifact に宣言されている(§5-3 の
+  // application 版・D8)。勝者なし: その state は未宣言扱い(schema 検証は沈黙)。
+  ManifestStateCollision: "wcs/manifest-state-collision",
   // 明示 override:true(§5-4)。衝突ではなく意図的な shadow の告知(info)。
   ManifestOverride: "wcs/manifest-override",
   // --- sidecar vs live declaration drift ---
@@ -168,7 +171,15 @@ var WcsDiagnosticCode = {
   // router/auto があるのに <base href> がない(SPA の basename 誤導出)。
   BaseHrefMissing: "wcs/base-href-missing",
   // @wcstack/signals と /dom エントリの同一ページ混在(リアクティブコア二重化)。
-  SignalsDualEntry: "wcs/signals-dual-entry"
+  SignalsDualEntry: "wcs/signals-dual-entry",
+  // --- deprecations ---
+  // 名前付き State（`<wcs-state name>` / `path@name`）。v2 でマウント（`mount=` と接頭辞付きパス）に
+  // 置き換わる（docs/state-mount-design.md D16）。1.x では warning、v2 では parse error と同時に error。
+  NamedStateDeprecated: "wcs/named-state-deprecated",
+  // --- volume mount ---
+  // `<wcs-state mount="...">` の値が runtime の validateVolumeMountPath で raise する形
+  // （空・空セグメント・ワイルドカード・予約文字 $ # @）。runtime と同条件・同文言（v2）。
+  MountPathInvalid: "wcs/mount-path-invalid"
 };
 function sortDiagnostics(diagnostics) {
   const severityRank = { error: 0, warning: 1, info: 2 };
@@ -784,7 +795,6 @@ var MAX_WILDCARD_DEPTH = 128;
 var BINDING_SEPARATOR = ";";
 var PROP_VALUE_SEPARATOR = ":";
 var MODIFIER_SEPARATOR = "#";
-var STATE_NAME_SEPARATOR = "@";
 var FILTER_SEPARATOR = "|";
 var MODIFIER_PREVENT = "prevent";
 var MODIFIER_STOP = "stop";
@@ -842,7 +852,6 @@ function getWcsManifest() {
         binding: BINDING_SEPARATOR,
         propValue: PROP_VALUE_SEPARATOR,
         modifier: MODIFIER_SEPARATOR,
-        stateName: STATE_NAME_SEPARATOR,
         filter: FILTER_SEPARATOR
       },
       // 正本 STRUCTURAL_BINDING_TYPE_SET から導出（手書きの二重定義を排除）。
@@ -909,233 +918,13 @@ var STRUCTURAL_DIRECTIVES = [...STRUCTURAL_BINDING_TYPE_SET].map((name) => ({
   ...STRUCTURAL_DIRECTIVE_INFO[name]
 }));
 
-// src/language/htmlParse.ts
-function parseWcsScriptBlocks(html, stateTagName = "wcs-state") {
-  const blocks = [];
-  let pos = 0;
-  const len = html.length;
-  while (pos < len) {
-    if (html.startsWith("<!--", pos)) {
-      const commentEnd = html.indexOf("-->", pos + 4);
-      if (commentEnd === -1) break;
-      pos = commentEnd + 3;
-      continue;
-    }
-    const wcsMatch = matchOpenTag(html, pos, stateTagName);
-    if (wcsMatch === null) {
-      pos++;
-      continue;
-    }
-    const stateName = extractAttribute(wcsMatch.tagContent, "name") ?? "default";
-    pos = wcsMatch.end;
-    const wcsCloseIdx = findCloseTag(html, pos, stateTagName);
-    const wcsEnd = wcsCloseIdx === -1 ? len : wcsCloseIdx;
-    while (pos < wcsEnd) {
-      if (html.startsWith("<!--", pos)) {
-        const commentEnd = html.indexOf("-->", pos + 4);
-        if (commentEnd === -1) break;
-        pos = commentEnd + 3;
-        continue;
-      }
-      const scriptMatch = matchOpenTag(html, pos, "script");
-      if (scriptMatch === null) {
-        pos++;
-        continue;
-      }
-      const typeAttr = extractAttribute(scriptMatch.tagContent, "type");
-      if (typeAttr?.toLowerCase() !== "module") {
-        pos = scriptMatch.end;
-        continue;
-      }
-      const contentStart = scriptMatch.end;
-      const scriptCloseIdx = findCloseTag(html, contentStart, "script");
-      if (scriptCloseIdx === -1) {
-        pos = contentStart;
-        break;
-      }
-      const contentEnd = scriptCloseIdx;
-      blocks.push({
-        contentStart,
-        contentEnd,
-        content: html.slice(contentStart, contentEnd),
-        stateName
-      });
-      pos = html.indexOf(">", scriptCloseIdx) + 1;
-      if (pos === 0) break;
-    }
-    pos = wcsEnd;
-    if (wcsCloseIdx !== -1) {
-      const closeEnd = html.indexOf(">", wcsCloseIdx);
-      if (closeEnd !== -1) pos = closeEnd + 1;
-    }
-  }
-  return blocks;
-}
-function parseWcsStateElements(html, stateTagName = "wcs-state") {
-  const elements = [];
-  let pos = 0;
-  const len = html.length;
-  while (pos < len) {
-    if (html.startsWith("<!--", pos)) {
-      const commentEnd = html.indexOf("-->", pos + 4);
-      if (commentEnd === -1) break;
-      pos = commentEnd + 3;
-      continue;
-    }
-    const wcsMatch = matchOpenTag(html, pos, stateTagName);
-    if (wcsMatch === null) {
-      pos++;
-      continue;
-    }
-    const stateName = extractAttribute(wcsMatch.tagContent, "name") ?? "default";
-    const jsonAttr = extractAttribute(wcsMatch.tagContent, "json") ?? void 0;
-    const stateAttr = extractAttribute(wcsMatch.tagContent, "state") ?? void 0;
-    const srcAttr = extractAttribute(wcsMatch.tagContent, "src") ?? void 0;
-    const tagStart = pos;
-    const tagEnd = wcsMatch.end;
-    pos = wcsMatch.end;
-    const scriptBlocks = [];
-    const wcsCloseIdx = findCloseTag(html, pos, stateTagName);
-    const wcsEnd = wcsCloseIdx === -1 ? len : wcsCloseIdx;
-    while (pos < wcsEnd) {
-      if (html.startsWith("<!--", pos)) {
-        const commentEnd = html.indexOf("-->", pos + 4);
-        if (commentEnd === -1) break;
-        pos = commentEnd + 3;
-        continue;
-      }
-      const scriptMatch = matchOpenTag(html, pos, "script");
-      if (scriptMatch === null) {
-        pos++;
-        continue;
-      }
-      const typeAttr = extractAttribute(scriptMatch.tagContent, "type");
-      if (typeAttr?.toLowerCase() !== "module") {
-        pos = scriptMatch.end;
-        continue;
-      }
-      const contentStart = scriptMatch.end;
-      const scriptCloseIdx = findCloseTag(html, contentStart, "script");
-      if (scriptCloseIdx === -1) {
-        pos = contentStart;
-        break;
-      }
-      scriptBlocks.push({
-        contentStart,
-        contentEnd: scriptCloseIdx,
-        content: html.slice(contentStart, scriptCloseIdx),
-        stateName
-      });
-      pos = html.indexOf(">", scriptCloseIdx) + 1;
-      if (pos === 0) break;
-    }
-    elements.push({ stateName, jsonAttr, stateAttr, srcAttr, scriptBlocks, tagStart, tagEnd });
-    pos = wcsEnd;
-    if (wcsCloseIdx !== -1) {
-      const closeEnd = html.indexOf(">", wcsCloseIdx);
-      if (closeEnd !== -1) pos = closeEnd + 1;
-    }
-  }
-  return elements;
-}
-function findScriptJsonById(html, id2) {
-  let pos = 0;
-  const len = html.length;
-  while (pos < len) {
-    if (html.startsWith("<!--", pos)) {
-      const commentEnd = html.indexOf("-->", pos + 4);
-      if (commentEnd === -1) break;
-      pos = commentEnd + 3;
-      continue;
-    }
-    const scriptMatch = matchOpenTag(html, pos, "script");
-    if (scriptMatch === null) {
-      pos++;
-      continue;
-    }
-    const typeAttr = extractAttribute(scriptMatch.tagContent, "type");
-    const idAttr = extractAttribute(scriptMatch.tagContent, "id");
-    if (typeAttr?.toLowerCase() === "application/json" && idAttr === id2) {
-      const contentStart = scriptMatch.end;
-      const scriptCloseIdx = findCloseTag(html, contentStart, "script");
-      if (scriptCloseIdx === -1) return null;
-      return html.slice(contentStart, scriptCloseIdx);
-    }
-    pos = scriptMatch.end;
-  }
-  return null;
-}
-function matchOpenTag(html, pos, tagName) {
-  if (html[pos] !== "<") return null;
-  const nameStart = pos + 1;
-  const nameEnd = nameStart + tagName.length;
-  if (nameEnd > html.length) return null;
-  const slice3 = html.slice(nameStart, nameEnd);
-  if (slice3.toLowerCase() !== tagName.toLowerCase()) return null;
-  const charAfter = html[nameEnd];
-  if (charAfter !== ">" && charAfter !== " " && charAfter !== "	" && charAfter !== "\n" && charAfter !== "\r" && charAfter !== "/") {
-    return null;
-  }
-  let i = nameEnd;
-  let inSingleQuote = false;
-  let inDoubleQuote = false;
-  while (i < html.length) {
-    const ch = html[i];
-    if (inSingleQuote) {
-      if (ch === "'") inSingleQuote = false;
-    } else if (inDoubleQuote) {
-      if (ch === '"') inDoubleQuote = false;
-    } else if (ch === "'") {
-      inSingleQuote = true;
-    } else if (ch === '"') {
-      inDoubleQuote = true;
-    } else if (ch === ">") {
-      return {
-        start: pos,
-        end: i + 1,
-        tagContent: html.slice(nameEnd, i)
-      };
-    }
-    i++;
-  }
-  return null;
-}
-function findCloseTag(html, startPos, tagName) {
-  const pattern = "</" + tagName;
-  const patternLower = pattern.toLowerCase();
-  const htmlLower = html.toLowerCase();
-  let pos = startPos;
-  while (pos < html.length) {
-    const idx = htmlLower.indexOf(patternLower, pos);
-    if (idx === -1) return -1;
-    const afterIdx = idx + pattern.length;
-    if (afterIdx < html.length) {
-      const ch = html[afterIdx];
-      if (ch === ">" || ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
-        return idx;
-      }
-    }
-    pos = idx + 1;
-  }
-  return -1;
-}
-function extractAttribute(tagContent, attrName) {
-  const regex = new RegExp(
-    `(?:^|\\s)${attrName}\\s*=\\s*(?:"([^"]*)"|'([^']*)'|(\\S+))`,
-    "i"
-  );
-  const match = tagContent.match(regex);
-  if (!match) return null;
-  return match[1] ?? match[2] ?? match[3] ?? null;
-}
-
 // src/service/stateAnalyzer.ts
 var RESERVED_STREAMS_KEY = "$streams";
 var RESERVED_COMMAND_TOKENS_KEY = "$commandTokens";
 var RESERVED_EVENT_TOKENS_KEY = "$eventTokens";
 var RESERVED_LIST_KEYS_KEY = "$listKeys";
 var RESERVED_WATCH_KEY = "$watch";
-function analyzeStatePaths(scriptContent, stateName = "default") {
+function analyzeStatePaths(scriptContent) {
   const objectContent = extractDefaultExportObject(scriptContent);
   if (!objectContent) return [];
   const paths = [];
@@ -1144,27 +933,27 @@ function analyzeStatePaths(scriptContent, stateName = "default") {
   const pendingListKeys = [];
   for (const prop of topLevelProps) {
     if (prop.name.startsWith("$")) {
-      collectReservedKeyPaths(prop, paths, pendingStreamValues, pendingListKeys, stateName);
+      collectReservedKeyPaths(prop, paths, pendingStreamValues, pendingListKeys);
       continue;
     }
     if (prop.kind === "method") {
-      paths.push({ path: prop.name, kind: "method", stateName });
+      paths.push({ path: prop.name, kind: "method" });
       continue;
     }
     if (prop.kind === "getter") {
-      if (!paths.some((p) => p.stateName === stateName && p.path === prop.name)) {
-        paths.push({ path: prop.name, kind: "computed", stateName });
+      if (!paths.some((p) => p.path === prop.name)) {
+        paths.push({ path: prop.name, kind: "computed" });
       }
       continue;
     }
-    pushDataPropertyPaths(prop, paths, stateName);
+    pushDataPropertyPaths(prop, paths);
   }
   for (const streamValue of pendingStreamValues) {
-    if (paths.some((p) => p.stateName === stateName && p.path === streamValue.name)) continue;
-    pushDataPropertyPaths(streamValue, paths, stateName);
+    if (paths.some((p) => p.path === streamValue.name)) continue;
+    pushDataPropertyPaths(streamValue, paths);
   }
   for (const listKeyEntry of pendingListKeys) {
-    pushListKeyPaths(listKeyEntry, paths, stateName);
+    pushListKeyPaths(listKeyEntry, paths);
   }
   return paths;
 }
@@ -1251,7 +1040,7 @@ function findNonObjectWatch(scriptContent) {
   if (!isArrowFunction && !isWholeLiteral) return null;
   return span;
 }
-function collectReservedKeyPaths(prop, paths, pendingStreamValues, pendingListKeys, stateName) {
+function collectReservedKeyPaths(prop, paths, pendingStreamValues, pendingListKeys) {
   if (prop.name === RESERVED_STREAMS_KEY && prop.kind === "data" && prop.value && isObjectLiteral(prop.value)) {
     const entries = parseTopLevelProperties(extractObjectContent(prop.value));
     for (const entry of entries) {
@@ -1263,20 +1052,20 @@ function collectReservedKeyPaths(prop, paths, pendingStreamValues, pendingListKe
         value: initial?.value,
         typeHint: initial?.typeHint
       });
-      paths.push({ path: `$streamStatus.${entry.name}`, kind: "data", typeHint: "string", stateName });
-      paths.push({ path: `$streamError.${entry.name}`, kind: "data", stateName });
+      paths.push({ path: `$streamStatus.${entry.name}`, kind: "data", typeHint: "string" });
+      paths.push({ path: `$streamError.${entry.name}`, kind: "data" });
     }
     return;
   }
   if (prop.name === RESERVED_COMMAND_TOKENS_KEY && prop.value) {
     for (const name of extractStringArrayItems(prop.value)) {
-      paths.push({ path: `$command.${name}`, kind: "command", stateName });
+      paths.push({ path: `$command.${name}`, kind: "command" });
     }
     return;
   }
   if (prop.name === RESERVED_EVENT_TOKENS_KEY && prop.value) {
     for (const name of extractStringArrayItems(prop.value)) {
-      paths.push({ path: name, kind: "eventToken", stateName });
+      paths.push({ path: name, kind: "eventToken" });
     }
     return;
   }
@@ -1288,22 +1077,22 @@ function collectReservedKeyPaths(prop, paths, pendingStreamValues, pendingListKe
     return;
   }
 }
-function pushListKeyPaths(entry, paths, stateName) {
+function pushListKeyPaths(entry, paths) {
   const listPath = entry.name;
   const segments = listPath.split(".");
   if (listPath.length === 0 || segments.some((s) => s.length === 0) || segments[segments.length - 1] === "*") {
     return;
   }
-  const has = (path) => paths.some((p) => p.stateName === stateName && p.path === path);
-  if (!has(listPath)) paths.push({ path: listPath, kind: "data", typeHint: "array", stateName });
-  if (!has(`${listPath}.*`)) paths.push({ path: `${listPath}.*`, kind: "list", stateName });
+  const has = (path) => paths.some((p) => p.path === path);
+  if (!has(listPath)) paths.push({ path: listPath, kind: "data", typeHint: "array" });
+  if (!has(`${listPath}.*`)) paths.push({ path: `${listPath}.*`, kind: "list" });
   if (!has(`${listPath}.length`)) {
-    paths.push({ path: `${listPath}.length`, kind: "data", typeHint: "number", stateName });
+    paths.push({ path: `${listPath}.length`, kind: "data", typeHint: "number" });
   }
   const keyField = extractStringLiteralValue(entry.value);
   if (keyField === null || keyField.includes(".") || keyField.includes("*")) return;
   if (!has(`${listPath}.*.${keyField}`)) {
-    paths.push({ path: `${listPath}.*.${keyField}`, kind: "data", stateName });
+    paths.push({ path: `${listPath}.*.${keyField}`, kind: "data" });
   }
 }
 function extractStringLiteralValue(value) {
@@ -1326,17 +1115,17 @@ function extractStringArrayItems(value) {
   return items;
 }
 var MAX_OBJECT_NEST_DEPTH = 5;
-function pushDataPropertyPaths(prop, paths, stateName) {
-  pushDataPropertyPathsAt(prop.name, prop, paths, stateName, 0);
+function pushDataPropertyPaths(prop, paths) {
+  pushDataPropertyPathsAt(prop.name, prop, paths, 0);
 }
-function pushDataPropertyPathsAt(path, prop, paths, stateName, depth) {
-  paths.push({ path, kind: "data", typeHint: prop.typeHint, rawInitial: prop.value?.trim(), stateName });
+function pushDataPropertyPathsAt(path, prop, paths, depth) {
+  paths.push({ path, kind: "data", typeHint: prop.typeHint, rawInitial: prop.value?.trim() });
   if (prop.value && isArrayLiteral(prop.value)) {
-    paths.push({ path: `${path}.*`, kind: "list", stateName });
-    paths.push({ path: `${path}.length`, kind: "data", typeHint: "number", stateName });
+    paths.push({ path: `${path}.*`, kind: "list" });
+    paths.push({ path: `${path}.length`, kind: "data", typeHint: "number" });
     if (depth >= MAX_OBJECT_NEST_DEPTH) return;
     for (const childProp of extractArrayElementDataProperties(prop.value)) {
-      pushDataPropertyPathsAt(`${path}.*.${childProp.name}`, childProp, paths, stateName, depth + 1);
+      pushDataPropertyPathsAt(`${path}.*.${childProp.name}`, childProp, paths, depth + 1);
     }
     return;
   }
@@ -1345,11 +1134,11 @@ function pushDataPropertyPathsAt(path, prop, paths, stateName, depth) {
     const childProps = parseTopLevelProperties(extractObjectContent(prop.value));
     for (const childProp of childProps) {
       if (childProp.kind !== "data") continue;
-      pushDataPropertyPathsAt(`${path}.${childProp.name}`, childProp, paths, stateName, depth + 1);
+      pushDataPropertyPathsAt(`${path}.${childProp.name}`, childProp, paths, depth + 1);
     }
   }
 }
-function analyzeJsonPaths(jsonString, stateName = "default") {
+function analyzeJsonPaths(jsonString) {
   let data;
   try {
     data = JSON.parse(jsonString);
@@ -1358,31 +1147,31 @@ function analyzeJsonPaths(jsonString, stateName = "default") {
   }
   if (typeof data !== "object" || data === null || Array.isArray(data)) return [];
   const paths = [];
-  collectJsonPaths(data, "", paths, stateName, 0);
+  collectJsonPaths(data, "", paths, 0);
   return paths;
 }
-function collectJsonPaths(obj, prefix, paths, stateName, depth) {
+function collectJsonPaths(obj, prefix, paths, depth) {
   if (depth >= MAX_OBJECT_NEST_DEPTH) return;
   for (const [key, value] of Object.entries(obj)) {
     if (prefix === "" && key.startsWith("$")) continue;
     const path = prefix ? `${prefix}.${key}` : key;
-    pushJsonValuePaths(path, value, paths, stateName, depth);
+    pushJsonValuePaths(path, value, paths, depth);
   }
 }
-function pushJsonValuePaths(path, value, paths, stateName, depth) {
-  paths.push({ path, kind: "data", typeHint: inferJsonTypeHint(value), stateName });
+function pushJsonValuePaths(path, value, paths, depth) {
+  paths.push({ path, kind: "data", typeHint: inferJsonTypeHint(value) });
   if (Array.isArray(value)) {
-    paths.push({ path: `${path}.*`, kind: "list", stateName });
-    paths.push({ path: `${path}.length`, kind: "data", typeHint: "number", stateName });
+    paths.push({ path: `${path}.*`, kind: "list" });
+    paths.push({ path: `${path}.length`, kind: "data", typeHint: "number" });
     if (depth >= MAX_OBJECT_NEST_DEPTH) return;
     if (value.length > 0 && typeof value[0] === "object" && value[0] !== null && !Array.isArray(value[0])) {
       const firstElement = value[0];
       for (const [childKey, childValue] of Object.entries(firstElement)) {
-        pushJsonValuePaths(`${path}.*.${childKey}`, childValue, paths, stateName, depth + 1);
+        pushJsonValuePaths(`${path}.*.${childKey}`, childValue, paths, depth + 1);
       }
     }
   } else if (typeof value === "object" && value !== null) {
-    collectJsonPaths(value, path, paths, stateName, depth + 1);
+    collectJsonPaths(value, path, paths, depth + 1);
   }
 }
 function inferJsonTypeHint(value) {
@@ -1585,42 +1374,369 @@ function extractJsDocType(content, propIndex) {
   const typeExpr = jsdocMatch[1].trim();
   return normalizeJsDocType(typeExpr);
 }
-function normalizeJsDocType(typeExpr) {
-  const parts = typeExpr.split("|").map((p) => p.trim());
-  const normalized = parts.map((p) => {
-    const lower = p.toLowerCase();
-    if (lower === "string") return "string";
-    if (lower === "number") return "number";
-    if (lower === "boolean") return "boolean";
-    if (lower === "null") return "null";
-    if (lower === "undefined") return "null";
-    if (lower.endsWith("[]") || lower.startsWith("array")) return "array";
-    if (lower === "object") return "object";
+function normalizeJsDocType(typeExpr) {
+  const parts = typeExpr.split("|").map((p) => p.trim());
+  const normalized = parts.map((p) => {
+    const lower = p.toLowerCase();
+    if (lower === "string") return "string";
+    if (lower === "number") return "number";
+    if (lower === "boolean") return "boolean";
+    if (lower === "null") return "null";
+    if (lower === "undefined") return "null";
+    if (lower.endsWith("[]") || lower.startsWith("array")) return "array";
+    if (lower === "object") return "object";
+    return null;
+  }).filter((p) => p !== null);
+  if (normalized.length === 0) return void 0;
+  const unique = [...new Set(normalized)].sort();
+  return unique.join("|");
+}
+function isEscaped(text, i) {
+  let backslashCount = 0;
+  let j = i - 1;
+  while (j >= 0 && text[j] === "\\") {
+    backslashCount++;
+    j--;
+  }
+  return backslashCount % 2 === 1;
+}
+function inferTypeHint(valueStart) {
+  const v = valueStart.trim().replace(/,\s*$/, "");
+  if (/^-?\d+\.\d/.test(v)) return "number";
+  if (/^-?\d/.test(v)) return "number";
+  if (/^["'`]/.test(v)) return "string";
+  if (v === "true" || v === "false") return "boolean";
+  if (v === "null") return "null";
+  if (v.startsWith("[")) return "array";
+  if (v.startsWith("{")) return "object";
+  return void 0;
+}
+function analyzeSchemaPaths(schema) {
+  const paths = [];
+  const defs = schema.$defs ?? {};
+  collectSchemaObjectPaths(schema, "", paths, defs, 0);
+  return paths;
+}
+function mergeSchemaCandidates(candidates, applicationSchema) {
+  if (applicationSchema === void 0) return candidates;
+  const schemaCandidates = [];
+  const schemaKeys = /* @__PURE__ */ new Set();
+  for (const p of analyzeSchemaPaths(applicationSchema)) {
+    schemaCandidates.push(p);
+    schemaKeys.add(p.path);
+  }
+  const kept = candidates.filter((p) => !schemaKeys.has(p.path));
+  return [...kept, ...schemaCandidates];
+}
+function derefSchemaNodes(node, defs) {
+  const out = [];
+  const stack = [{ node, chain: /* @__PURE__ */ new Set() }];
+  while (stack.length > 0) {
+    const { node: n, chain } = stack.pop();
+    if (n === null || typeof n !== "object") continue;
+    if (typeof n.$ref === "string") {
+      const match = /^#\/\$defs\/(.+)$/.exec(n.$ref);
+      if (match === null || chain.has(n.$ref)) continue;
+      const target = defs[match[1].replace(/~1/g, "/").replace(/~0/g, "~")];
+      if (target === void 0) continue;
+      stack.push({ node: target, chain: /* @__PURE__ */ new Set([...chain, n.$ref]) });
+      continue;
+    }
+    if (Array.isArray(n.anyOf)) {
+      for (let i = n.anyOf.length - 1; i >= 0; i--) stack.push({ node: n.anyOf[i], chain });
+      continue;
+    }
+    out.push(n);
+  }
+  return out;
+}
+function schemaTypeHint(nodes) {
+  const hints = /* @__PURE__ */ new Set();
+  for (const n of nodes) {
+    const types = typeof n.type === "string" ? [n.type] : Array.isArray(n.type) ? n.type : [];
+    if (types.length > 0) {
+      for (const t of types) {
+        if (t === "null") continue;
+        hints.add(t === "integer" ? "number" : t);
+      }
+      continue;
+    }
+    if (Array.isArray(n.enum)) {
+      for (const v of n.enum) {
+        const h = inferJsonTypeHint(v);
+        if (h !== void 0 && h !== "null") hints.add(h);
+      }
+    } else if (n.const !== void 0) {
+      const h = inferJsonTypeHint(n.const);
+      if (h !== void 0 && h !== "null") hints.add(h);
+    } else if (n.properties !== void 0) {
+      hints.add("object");
+    } else if (n.items !== void 0) {
+      hints.add("array");
+    }
+  }
+  return hints.size === 0 ? void 0 : [...hints].join("|");
+}
+function collectSchemaObjectPaths(node, prefix, paths, defs, depth) {
+  if (depth >= MAX_OBJECT_NEST_DEPTH) return;
+  const seen = /* @__PURE__ */ new Set();
+  for (const n of derefSchemaNodes(node, defs)) {
+    for (const [key, child] of Object.entries(n.properties ?? {})) {
+      if (prefix === "" && key.startsWith("$")) continue;
+      if (seen.has(key)) continue;
+      seen.add(key);
+      const path = prefix ? `${prefix}.${key}` : key;
+      pushSchemaValuePaths(path, child, paths, defs, depth);
+    }
+  }
+}
+function pushSchemaValuePaths(path, node, paths, defs, depth) {
+  const nodes = derefSchemaNodes(node, defs);
+  const typeHint = schemaTypeHint(nodes);
+  paths.push(withHint({ path, kind: "data", fromSchema: true }, typeHint));
+  const items = nodes.map((n) => n.items).find((i) => i !== void 0 && i !== null && typeof i === "object");
+  const isArray = items !== void 0 || (typeHint?.split("|").includes("array") ?? false);
+  if (isArray) {
+    const itemNodes = items !== void 0 ? derefSchemaNodes(items, defs) : [];
+    paths.push(withHint({ path: `${path}.*`, kind: "list", fromSchema: true }, schemaTypeHint(itemNodes)));
+    paths.push({ path: `${path}.length`, kind: "data", typeHint: "number", fromSchema: true });
+    if (depth >= MAX_OBJECT_NEST_DEPTH) return;
+    const seen = /* @__PURE__ */ new Set();
+    for (const n of itemNodes) {
+      for (const [childKey, childNode] of Object.entries(n.properties ?? {})) {
+        if (seen.has(childKey)) continue;
+        seen.add(childKey);
+        pushSchemaValuePaths(`${path}.*.${childKey}`, childNode, paths, defs, depth + 1);
+      }
+    }
+    return;
+  }
+  if (nodes.some((n) => n.properties !== void 0)) {
+    collectSchemaObjectPaths(node, path, paths, defs, depth + 1);
+  }
+}
+function withHint(candidate, typeHint) {
+  return typeHint === void 0 ? candidate : { ...candidate, typeHint };
+}
+
+// src/language/htmlParse.ts
+function parseWcsScriptBlocks(html, stateTagName = "wcs-state") {
+  const blocks = [];
+  let pos = 0;
+  const len = html.length;
+  while (pos < len) {
+    if (html.startsWith("<!--", pos)) {
+      const commentEnd = html.indexOf("-->", pos + 4);
+      if (commentEnd === -1) break;
+      pos = commentEnd + 3;
+      continue;
+    }
+    const wcsMatch = matchOpenTag(html, pos, stateTagName);
+    if (wcsMatch === null) {
+      pos++;
+      continue;
+    }
+    const mountPath = extractAttribute(wcsMatch.tagContent, "mount");
+    pos = wcsMatch.end;
+    const wcsCloseIdx = findCloseTag(html, pos, stateTagName);
+    const wcsEnd = wcsCloseIdx === -1 ? len : wcsCloseIdx;
+    while (pos < wcsEnd) {
+      if (html.startsWith("<!--", pos)) {
+        const commentEnd = html.indexOf("-->", pos + 4);
+        if (commentEnd === -1) break;
+        pos = commentEnd + 3;
+        continue;
+      }
+      const scriptMatch = matchOpenTag(html, pos, "script");
+      if (scriptMatch === null) {
+        pos++;
+        continue;
+      }
+      const typeAttr = extractAttribute(scriptMatch.tagContent, "type");
+      if (typeAttr?.toLowerCase() !== "module") {
+        pos = scriptMatch.end;
+        continue;
+      }
+      const contentStart = scriptMatch.end;
+      const scriptCloseIdx = findCloseTag(html, contentStart, "script");
+      if (scriptCloseIdx === -1) {
+        pos = contentStart;
+        break;
+      }
+      const contentEnd = scriptCloseIdx;
+      blocks.push({
+        contentStart,
+        contentEnd,
+        content: html.slice(contentStart, contentEnd),
+        mountPath
+      });
+      pos = html.indexOf(">", scriptCloseIdx) + 1;
+      if (pos === 0) break;
+    }
+    pos = wcsEnd;
+    if (wcsCloseIdx !== -1) {
+      const closeEnd = html.indexOf(">", wcsCloseIdx);
+      if (closeEnd !== -1) pos = closeEnd + 1;
+    }
+  }
+  return blocks;
+}
+function parseWcsStateElements(html, stateTagName = "wcs-state") {
+  const elements = [];
+  let pos = 0;
+  const len = html.length;
+  while (pos < len) {
+    if (html.startsWith("<!--", pos)) {
+      const commentEnd = html.indexOf("-->", pos + 4);
+      if (commentEnd === -1) break;
+      pos = commentEnd + 3;
+      continue;
+    }
+    const wcsMatch = matchOpenTag(html, pos, stateTagName);
+    if (wcsMatch === null) {
+      pos++;
+      continue;
+    }
+    const mountPath = extractAttribute(wcsMatch.tagContent, "mount");
+    const jsonAttr = extractAttribute(wcsMatch.tagContent, "json") ?? void 0;
+    const stateAttr = extractAttribute(wcsMatch.tagContent, "state") ?? void 0;
+    const srcAttr = extractAttribute(wcsMatch.tagContent, "src") ?? void 0;
+    const tagStart = pos;
+    const tagEnd = wcsMatch.end;
+    pos = wcsMatch.end;
+    const scriptBlocks = [];
+    const wcsCloseIdx = findCloseTag(html, pos, stateTagName);
+    const wcsEnd = wcsCloseIdx === -1 ? len : wcsCloseIdx;
+    while (pos < wcsEnd) {
+      if (html.startsWith("<!--", pos)) {
+        const commentEnd = html.indexOf("-->", pos + 4);
+        if (commentEnd === -1) break;
+        pos = commentEnd + 3;
+        continue;
+      }
+      const scriptMatch = matchOpenTag(html, pos, "script");
+      if (scriptMatch === null) {
+        pos++;
+        continue;
+      }
+      const typeAttr = extractAttribute(scriptMatch.tagContent, "type");
+      if (typeAttr?.toLowerCase() !== "module") {
+        pos = scriptMatch.end;
+        continue;
+      }
+      const contentStart = scriptMatch.end;
+      const scriptCloseIdx = findCloseTag(html, contentStart, "script");
+      if (scriptCloseIdx === -1) {
+        pos = contentStart;
+        break;
+      }
+      scriptBlocks.push({
+        contentStart,
+        contentEnd: scriptCloseIdx,
+        content: html.slice(contentStart, scriptCloseIdx),
+        mountPath
+      });
+      pos = html.indexOf(">", scriptCloseIdx) + 1;
+      if (pos === 0) break;
+    }
+    elements.push({ mountPath, jsonAttr, stateAttr, srcAttr, scriptBlocks, tagStart, tagEnd });
+    pos = wcsEnd;
+    if (wcsCloseIdx !== -1) {
+      const closeEnd = html.indexOf(">", wcsCloseIdx);
+      if (closeEnd !== -1) pos = closeEnd + 1;
+    }
+  }
+  return elements;
+}
+function findScriptJsonById(html, id2) {
+  let pos = 0;
+  const len = html.length;
+  while (pos < len) {
+    if (html.startsWith("<!--", pos)) {
+      const commentEnd = html.indexOf("-->", pos + 4);
+      if (commentEnd === -1) break;
+      pos = commentEnd + 3;
+      continue;
+    }
+    const scriptMatch = matchOpenTag(html, pos, "script");
+    if (scriptMatch === null) {
+      pos++;
+      continue;
+    }
+    const typeAttr = extractAttribute(scriptMatch.tagContent, "type");
+    const idAttr = extractAttribute(scriptMatch.tagContent, "id");
+    if (typeAttr?.toLowerCase() === "application/json" && idAttr === id2) {
+      const contentStart = scriptMatch.end;
+      const scriptCloseIdx = findCloseTag(html, contentStart, "script");
+      if (scriptCloseIdx === -1) return null;
+      return html.slice(contentStart, scriptCloseIdx);
+    }
+    pos = scriptMatch.end;
+  }
+  return null;
+}
+function matchOpenTag(html, pos, tagName) {
+  if (html[pos] !== "<") return null;
+  const nameStart = pos + 1;
+  const nameEnd = nameStart + tagName.length;
+  if (nameEnd > html.length) return null;
+  const slice3 = html.slice(nameStart, nameEnd);
+  if (slice3.toLowerCase() !== tagName.toLowerCase()) return null;
+  const charAfter = html[nameEnd];
+  if (charAfter !== ">" && charAfter !== " " && charAfter !== "	" && charAfter !== "\n" && charAfter !== "\r" && charAfter !== "/") {
     return null;
-  }).filter((p) => p !== null);
-  if (normalized.length === 0) return void 0;
-  const unique = [...new Set(normalized)].sort();
-  return unique.join("|");
+  }
+  let i = nameEnd;
+  let inSingleQuote = false;
+  let inDoubleQuote = false;
+  while (i < html.length) {
+    const ch = html[i];
+    if (inSingleQuote) {
+      if (ch === "'") inSingleQuote = false;
+    } else if (inDoubleQuote) {
+      if (ch === '"') inDoubleQuote = false;
+    } else if (ch === "'") {
+      inSingleQuote = true;
+    } else if (ch === '"') {
+      inDoubleQuote = true;
+    } else if (ch === ">") {
+      return {
+        start: pos,
+        end: i + 1,
+        tagContent: html.slice(nameEnd, i)
+      };
+    }
+    i++;
+  }
+  return null;
 }
-function isEscaped(text, i) {
-  let backslashCount = 0;
-  let j = i - 1;
-  while (j >= 0 && text[j] === "\\") {
-    backslashCount++;
-    j--;
+function findCloseTag(html, startPos, tagName) {
+  const pattern = "</" + tagName;
+  const patternLower = pattern.toLowerCase();
+  const htmlLower = html.toLowerCase();
+  let pos = startPos;
+  while (pos < html.length) {
+    const idx = htmlLower.indexOf(patternLower, pos);
+    if (idx === -1) return -1;
+    const afterIdx = idx + pattern.length;
+    if (afterIdx < html.length) {
+      const ch = html[afterIdx];
+      if (ch === ">" || ch === " " || ch === "	" || ch === "\n" || ch === "\r") {
+        return idx;
+      }
+    }
+    pos = idx + 1;
   }
-  return backslashCount % 2 === 1;
+  return -1;
 }
-function inferTypeHint(valueStart) {
-  const v = valueStart.trim().replace(/,\s*$/, "");
-  if (/^-?\d+\.\d/.test(v)) return "number";
-  if (/^-?\d/.test(v)) return "number";
-  if (/^["'`]/.test(v)) return "string";
-  if (v === "true" || v === "false") return "boolean";
-  if (v === "null") return "null";
-  if (v.startsWith("[")) return "array";
-  if (v.startsWith("{")) return "object";
-  return void 0;
+function extractAttribute(tagContent, attrName) {
+  const regex = new RegExp(
+    `(?:^|\\s)${attrName}\\s*=\\s*(?:"([^"]*)"|'([^']*)'|(\\S+))`,
+    "i"
+  );
+  const match = tagContent.match(regex);
+  if (!match) return null;
+  return match[1] ?? match[2] ?? match[3] ?? null;
 }
 
 // src/service/statePathResolver.ts
@@ -1634,33 +1750,45 @@ function getStatePathsFromHtml(html, stateTagName = "wcs-state", fileReader) {
   return allPaths;
 }
 function resolveElementPaths(element, html, fileReader) {
+  const raw = resolveElementPathsRaw(element, html, fileReader);
+  if (element.mountPath === null) return raw;
+  const prefix = element.mountPath + ".";
+  const out = [];
+  for (const p of raw) {
+    if (p.path.startsWith("$")) continue;
+    if (p.kind === "method" || p.kind === "eventToken") continue;
+    out.push({ ...p, path: prefix + p.path });
+  }
+  return out;
+}
+function resolveElementPathsRaw(element, html, fileReader) {
   if (element.stateAttr) {
     const jsonContent = findScriptJsonById(html, element.stateAttr);
     if (jsonContent) {
-      const paths = analyzeJsonPaths(jsonContent, element.stateName);
+      const paths = analyzeJsonPaths(jsonContent);
       if (paths.length > 0) return paths;
     }
   }
   if (element.srcAttr && fileReader) {
-    const paths = resolveSrcAttribute(element.srcAttr, element.stateName, fileReader);
+    const paths = resolveSrcAttribute(element.srcAttr, fileReader);
     if (paths.length > 0) return paths;
   }
   if (element.jsonAttr) {
-    const paths = analyzeJsonPaths(element.jsonAttr, element.stateName);
+    const paths = analyzeJsonPaths(element.jsonAttr);
     if (paths.length > 0) return paths;
   }
   if (element.scriptBlocks.length > 0) {
     return element.scriptBlocks.flatMap(
-      (block) => analyzeStatePaths(block.content, block.stateName)
+      (block) => analyzeStatePaths(block.content)
     );
   }
   return [];
 }
-function resolveSrcAttribute(srcPath, stateName, fileReader) {
+function resolveSrcAttribute(srcPath, fileReader) {
   if (srcPath.endsWith(".json")) {
     const content = fileReader(srcPath);
     if (content) {
-      return analyzeJsonPaths(content, stateName);
+      return analyzeJsonPaths(content);
     }
     return [];
   }
@@ -1668,18 +1796,18 @@ function resolveSrcAttribute(srcPath, stateName, fileReader) {
     const tsPath = srcPath.replace(/\.js$/, ".ts");
     const tsContent = fileReader(tsPath);
     if (tsContent) {
-      return analyzeStatePaths(tsContent, stateName);
+      return analyzeStatePaths(tsContent);
     }
     const jsContent = fileReader(srcPath);
     if (jsContent) {
-      return analyzeStatePaths(jsContent, stateName);
+      return analyzeStatePaths(jsContent);
     }
     return [];
   }
   if (srcPath.endsWith(".ts")) {
     const content = fileReader(srcPath);
     if (content) {
-      return analyzeStatePaths(content, stateName);
+      return analyzeStatePaths(content);
     }
     return [];
   }
@@ -1812,6 +1940,8 @@ var ja = {
   commandTokenUndeclared: (t) => `\u30B3\u30DE\u30F3\u30C9\u30C8\u30FC\u30AF\u30F3 "${t}" \u306F $commandTokens \u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u305B\u3093`,
   streamPathMissing: (p) => `\u30D1\u30B9 "${p}" \u306F $streams \u5BA3\u8A00\u306B\u5B58\u5728\u3057\u307E\u305B\u3093`,
   pathMissing: (p) => `\u30D1\u30B9 "${p}" \u306F\u72B6\u614B\u5B9A\u7FA9\u306B\u5B58\u5728\u3057\u307E\u305B\u3093`,
+  pathNonexistent: (p) => `\u30D1\u30B9 "${p}" \u306F\u5BA3\u8A00\u3055\u308C\u305F stateSchema \u306B\u5B58\u5728\u3057\u307E\u305B\u3093`,
+  pathTypeMismatch: (p, label, expected, actual) => `\u30D1\u30B9 "${p}" \u306F stateSchema \u4E0A\u3067 ${actual} \u578B\u3067\u3059\u304C\u3001${label} \u306B\u306F${JA_EXPECTED_LABEL[expected]}\u304C\u5FC5\u8981\u3067\u3059`,
   expansionSuffix: (x) => `\uFF08\u5C55\u958B: ${x}\uFF09`,
   patternPathOutsideFor: (p) => `\u30D1\u30BF\u30FC\u30F3\u30D1\u30B9 "${p}" \u306F <template for> \u306E\u5916\u5074\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093`,
   omittedPathOutsideFor: (p) => `\u7701\u7565\u30D1\u30B9 "${p}" \u306F <template for> \u306E\u5916\u5074\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093`,
@@ -1851,7 +1981,21 @@ var ja = {
   storageSeedClobber: (path, raw) => `<wcs-storage> \u306E value \u30D0\u30A4\u30F3\u30C9\u5148 "${path}" \u304C ${raw} \u3067\u30B7\u30FC\u30C9\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u521D\u671F\u66F8\u304D\u623B\u3057\u304C\u4FDD\u5B58\u5024\u3092\u4E0A\u66F8\u304D\u3057\u307E\u3059 \u2014 undefined \u3067\u30B7\u30FC\u30C9\uFF08\`${path}: undefined\`\uFF09\u3059\u308B\u304B manual \u3092\u4ED8\u3051\u3066\u304F\u3060\u3055\u3044`,
   devtoolsAfterState: () => `@wcstack/devtools/auto \u306F @wcstack/state/auto \u3088\u308A\u5148\u306B\u8AAD\u307F\u8FBC\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u5F8C\u3060\u3068\u914D\u7DDA\u53F0\u5E33\u304C\u30E9\u30A4\u30D6\u3067 captured \u3055\u308C\u307E\u305B\u3093\uFF09`,
   baseHrefMissing: () => `@wcstack/router \u3092\u4F7F\u3046 SPA \u306B\u306F <head> \u5185\u306E <base href="/"> \u304C\u5FC5\u8981\u3067\u3059\uFF08\u7121\u3044\u3068\u30C7\u30A3\u30FC\u30D7\u30EA\u30F3\u30AF\u3067 basename \u304C\u8AA4\u5C0E\u51FA\u3055\u308C\u307E\u3059\uFF09`,
-  signalsDualEntry: () => `@wcstack/signals \u3068 @wcstack/signals/dom \u304C\u540C\u4E00\u30DA\u30FC\u30B8\u304B\u3089 import \u3055\u308C\u3066\u3044\u307E\u3059\u3002CDN \u3067\u306F\u5404\u30A8\u30F3\u30C8\u30EA\u304C\u81EA\u5DF1\u5B8C\u7D50\u30D0\u30F3\u30C9\u30EB\u306E\u305F\u3081\u30EA\u30A2\u30AF\u30C6\u30A3\u30D6\u30B3\u30A2\u304C\u4E8C\u91CD\u5316\u3057\u3001\u5883\u754C\u3067\u53CD\u5FDC\u304C\u58CA\u308C\u307E\u3059 \u2014 \u3059\u3079\u3066 /dom \u30A8\u30F3\u30C8\u30EA\u304B\u3089 import \u3057\u3066\u304F\u3060\u3055\u3044`
+  signalsDualEntry: () => `@wcstack/signals \u3068 @wcstack/signals/dom \u304C\u540C\u4E00\u30DA\u30FC\u30B8\u304B\u3089 import \u3055\u308C\u3066\u3044\u307E\u3059\u3002CDN \u3067\u306F\u5404\u30A8\u30F3\u30C8\u30EA\u304C\u81EA\u5DF1\u5B8C\u7D50\u30D0\u30F3\u30C9\u30EB\u306E\u305F\u3081\u30EA\u30A2\u30AF\u30C6\u30A3\u30D6\u30B3\u30A2\u304C\u4E8C\u91CD\u5316\u3057\u3001\u5883\u754C\u3067\u53CD\u5FDC\u304C\u58CA\u308C\u307E\u3059 \u2014 \u3059\u3079\u3066 /dom \u30A8\u30F3\u30C8\u30EA\u304B\u3089 import \u3057\u3066\u304F\u3060\u3055\u3044`,
+  namedStateAttrDeprecated: (name) => `name \u5C5E\u6027\u306F v2 \u3067\u64A4\u53BB\u3055\u308C\u307E\u3057\u305F\uFF081 root 1 \u30C4\u30EA\u30FC\uFF09\u3002\u30EB\u30FC\u30C8\u30C4\u30EA\u30FC\u3078\u306E\u30DE\u30A6\u30F3\u30C8 <wcs-state mount="${name}"> \u306B\u7F6E\u304D\u63DB\u3048\u3001\u30D1\u30B9\u306F "${name}.<path>" \u3067\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\uFF08docs/state-mount-design.md \xA79\uFF09`,
+  namedStatePathDeprecated: (name) => name === "default" ? `"@default" \u30BB\u30EC\u30AF\u30BF\u306F v2 \u3067\u64A4\u53BB\u3055\u308C\u307E\u3057\u305F\u3002"@default" \u3092\u5916\u3057\u3066\u304F\u3060\u3055\u3044\uFF08docs/state-mount-design.md \xA79\uFF09` : `"@name" \u30BB\u30EC\u30AF\u30BF\u306F v2 \u3067\u64A4\u53BB\u3055\u308C\u307E\u3057\u305F\uFF081 root 1 \u30C4\u30EA\u30FC\uFF09\u3002\u30DE\u30A6\u30F3\u30C8\u3057\u305F\u30C4\u30EA\u30FC\u3092 "${name}.<path>" \u3067\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\uFF08docs/state-mount-design.md \xA79\uFF09`,
+  mountPathInvalid: (problem, mountPath) => {
+    switch (problem) {
+      case "empty":
+        return `"mount" \u306B\u306F\u7A7A\u3067\u306A\u3044\u30C4\u30EA\u30FC\u30D1\u30B9\u304C\u5FC5\u8981\u3067\u3059\uFF08runtime: "mount" requires a non-empty tree path.\uFF09`;
+      case "emptySegment":
+        return `"mount" \u30D1\u30B9 "${mountPath}" \u306B\u7A7A\u306E\u30BB\u30B0\u30E1\u30F3\u30C8\u304C\u3042\u308A\u307E\u3059\uFF08runtime: has an empty segment.\uFF09`;
+      case "wildcard":
+        return `"mount" \u30D1\u30B9 "${mountPath}" \u306F\u9759\u7684\u3067\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093 \u2014 \u30EF\u30A4\u30EB\u30C9\u30AB\u30FC\u30C9\u306F\u4F7F\u3048\u307E\u305B\u3093\uFF08runtime: must be static.\uFF09`;
+      default:
+        return `"mount" \u30D1\u30B9 "${mountPath}" \u306B\u4E88\u7D04\u6587\u5B57\uFF08$, #, @\uFF09\u306F\u4F7F\u3048\u307E\u305B\u3093\uFF08runtime: must not use reserved characters.\uFF09`;
+    }
+  }
 };
 var EN_EXPECTED_LABEL = {
   array: "an array-typed path",
@@ -1867,6 +2011,8 @@ var en = {
   commandTokenUndeclared: (t) => `Command token "${t}" is not declared in $commandTokens`,
   streamPathMissing: (p) => `Path "${p}" does not exist in the $streams declaration`,
   pathMissing: (p) => `Path "${p}" does not exist in the state definition`,
+  pathNonexistent: (p) => `Path "${p}" does not exist in the declared stateSchema`,
+  pathTypeMismatch: (p, label, expected, actual) => `Path "${p}" is ${actual} in the stateSchema, but ${label} requires ${expected === "array" ? "an array" : expected === "boolean" ? "a boolean" : "a string"}`,
   expansionSuffix: (x) => ` (expanded: ${x})`,
   patternPathOutsideFor: (p) => `Pattern path "${p}" cannot be used outside a <template for>`,
   omittedPathOutsideFor: (p) => `Shorthand path "${p}" cannot be used outside a <template for>`,
@@ -1906,25 +2052,225 @@ var en = {
   storageSeedClobber: (path, raw) => `The <wcs-storage> value-bound slot "${path}" is seeded with ${raw}. The initial write-back overwrites the persisted value \u2014 seed it with undefined (\`${path}: undefined\`) or add manual`,
   devtoolsAfterState: () => `Load @wcstack/devtools/auto BEFORE @wcstack/state/auto (otherwise the wiring ledger is not captured live)`,
   baseHrefMissing: () => `An SPA using @wcstack/router needs <base href="/"> in <head> (without it, deep links misderive the basename)`,
-  signalsDualEntry: () => `Both @wcstack/signals and @wcstack/signals/dom are imported on this page. On a CDN each entry is a self-contained bundle, so the reactive core is duplicated and reactivity breaks at the seam \u2014 import everything from the single /dom entry`
+  signalsDualEntry: () => `Both @wcstack/signals and @wcstack/signals/dom are imported on this page. On a CDN each entry is a self-contained bundle, so the reactive core is duplicated and reactivity breaks at the seam \u2014 import everything from the single /dom entry`,
+  namedStateAttrDeprecated: (name) => `The "name" attribute was removed in v2 \u2014 there is a single state tree per root. Mount this state onto the tree instead: <wcs-state mount="${name}"> and read it as "${name}.<path>" (docs/state-mount-design.md \xA79)`,
+  namedStatePathDeprecated: (name) => name === "default" ? `The "@default" selector was removed in v2 \u2014 drop it (docs/state-mount-design.md \xA79)` : `The "@name" selector was removed in v2 \u2014 there is a single state tree. Mount the named state onto the tree (<wcs-state mount="...">) and read it as "${name}.<path>" (docs/state-mount-design.md \xA79)`,
+  mountPathInvalid: (problem, mountPath) => {
+    switch (problem) {
+      case "empty":
+        return `"mount" requires a non-empty tree path.`;
+      case "emptySegment":
+        return `"mount" path "${mountPath}" has an empty segment.`;
+      case "wildcard":
+        return `"mount" path "${mountPath}" must be static (wildcards are not allowed).`;
+      default:
+        return `"mount" path "${mountPath}" must not use reserved characters ($, #, @).`;
+    }
+  }
 };
 var CATALOGS = { ja, en };
 function getMessages(locale3) {
   return CATALOGS[resolveLocale(locale3)];
 }
 
+// src/core/sidecar/schemaSubset.ts
+var ALLOWED_SCHEMA_KEYWORDS = /* @__PURE__ */ new Set([
+  "type",
+  "properties",
+  "required",
+  "items",
+  "enum",
+  "const",
+  "anyOf",
+  "$defs",
+  "$ref"
+]);
+var DiagnosticContext = class {
+  constructor(spans) {
+    this.spans = spans;
+  }
+  diagnostics = [];
+  add(code, pointer2, message, severity, extra = {}, useKeySpan = false) {
+    const span = this.spans.get(pointer2);
+    const start = span === void 0 ? 0 : useKeySpan ? span.keyStart ?? span.start : span.start;
+    const end = span === void 0 ? 0 : useKeySpan ? span.keyEnd ?? span.end : span.end;
+    this.diagnostics.push({ code, start, end, message, severity, ...extra });
+  }
+};
+function isSchemaObject(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function isSchemaMap(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function validateSchemaSubset(schema, pointerBase, ctx, rootDefs) {
+  walkKeywords(schema, pointerBase, ctx, rootDefs);
+  const safe = /* @__PURE__ */ new Set();
+  detectCycles(schema, pointerBase, ctx, rootDefs, /* @__PURE__ */ new Set(), safe);
+  for (const [name, def] of Object.entries(rootDefs)) {
+    detectCycles(def, `${pointerBase}/$defs/${escape(name)}`, ctx, rootDefs, /* @__PURE__ */ new Set(), safe);
+  }
+}
+function walkKeywords(node, ptr, ctx, rootDefs) {
+  if (!isSchemaObject(node)) return;
+  for (const keyword of Object.keys(node)) {
+    if (!ALLOWED_SCHEMA_KEYWORDS.has(keyword)) {
+      ctx.add(
+        WcsDiagnosticCode.ManifestUnknownKeyword,
+        `${ptr}/${escape(keyword)}`,
+        `Unsupported schema keyword "${keyword}". Allowed: ${[...ALLOWED_SCHEMA_KEYWORDS].join(", ")}.`,
+        "warning",
+        {},
+        true
+      );
+    }
+  }
+  if (typeof node.$ref === "string") {
+    if (!node.$ref.startsWith("#/")) {
+      ctx.add(
+        WcsDiagnosticCode.ManifestExternalRef,
+        `${ptr}/$ref`,
+        `External $ref "${node.$ref}" is forbidden; only local "#/$defs/..." references are allowed.`,
+        "error"
+      );
+    } else if (resolveLocalRef(node.$ref, rootDefs) === void 0) {
+      ctx.add(
+        WcsDiagnosticCode.ManifestRefUnresolved,
+        `${ptr}/$ref`,
+        `Unresolved local $ref "${node.$ref}".`,
+        "error"
+      );
+    }
+  }
+  if (isSchemaMap(node.properties)) {
+    for (const [name, child] of Object.entries(node.properties)) {
+      walkKeywords(child, `${ptr}/properties/${escape(name)}`, ctx, rootDefs);
+    }
+  }
+  if (node.items !== void 0 && isSchemaObject(node.items)) {
+    walkKeywords(node.items, `${ptr}/items`, ctx, rootDefs);
+  }
+  if (Array.isArray(node.anyOf)) {
+    node.anyOf.forEach((child, i) => walkKeywords(child, `${ptr}/anyOf/${i}`, ctx, rootDefs));
+  }
+  if (isSchemaMap(node.$defs)) {
+    for (const [name, child] of Object.entries(node.$defs)) {
+      walkKeywords(child, `${ptr}/$defs/${escape(name)}`, ctx, rootDefs);
+    }
+  }
+}
+function detectCycles(node, ptr, ctx, rootDefs, refStack, safe) {
+  if (!isSchemaObject(node)) return;
+  if (typeof node.$ref === "string") {
+    const ref = node.$ref;
+    if (!ref.startsWith("#/")) return;
+    if (refStack.has(ref)) {
+      ctx.add(WcsDiagnosticCode.ManifestRefCycle, `${ptr}/$ref`, `Cyclic $ref detected at "${ref}".`, "error");
+      return;
+    }
+    if (safe.has(ref)) return;
+    const target = resolveLocalRef(ref, rootDefs);
+    if (target === void 0) return;
+    refStack.add(ref);
+    detectCycles(target, ptr, ctx, rootDefs, refStack, safe);
+    refStack.delete(ref);
+    safe.add(ref);
+    return;
+  }
+  if (isSchemaMap(node.properties)) {
+    for (const child of Object.values(node.properties)) detectCycles(child, ptr, ctx, rootDefs, refStack, safe);
+  }
+  if (node.items !== void 0 && isSchemaObject(node.items)) {
+    detectCycles(node.items, ptr, ctx, rootDefs, refStack, safe);
+  }
+  if (Array.isArray(node.anyOf)) {
+    for (const child of node.anyOf) detectCycles(child, ptr, ctx, rootDefs, refStack, safe);
+  }
+}
+function resolveLocalRef(ref, rootDefs) {
+  const match = /^#\/\$defs\/(.+)$/.exec(ref);
+  if (match === null) return void 0;
+  const name = match[1].replace(/~1/g, "/").replace(/~0/g, "~");
+  return rootDefs[name];
+}
+function resolveSchemaPath(root, rootDefs, segments) {
+  let current = root;
+  for (let depth = 0; depth < segments.length; depth++) {
+    const segment = segments[depth];
+    const resolved = derefUnion(current, rootDefs);
+    if (resolved.kind === "ref-error") return resolved;
+    const candidates = resolved.nodes;
+    if (segment === "*") {
+      const items = firstDefined(candidates, (n) => isSchemaObject(n.items) ? n.items : void 0);
+      if (items === void 0) {
+        return { kind: "unknown" };
+      }
+      current = items;
+      continue;
+    }
+    if (segment === "length" && candidates.some((n) => hasType(n, "array"))) {
+      current = { type: "number" };
+      continue;
+    }
+    const child = firstDefined(candidates, (n) => isSchemaMap(n.properties) ? n.properties[segment] : void 0);
+    if (child !== void 0) {
+      current = child;
+      continue;
+    }
+    const anyObject = candidates.some((n) => hasType(n, "object") || isSchemaMap(n.properties));
+    if (anyObject) {
+      return { kind: "nonexistent", segment, depth };
+    }
+    return { kind: "unknown" };
+  }
+  const final = derefUnion(current, rootDefs);
+  if (final.kind === "ref-error") return final;
+  return { kind: "resolved", schema: final.nodes.length === 1 ? final.nodes[0] : current };
+}
+function derefUnion(node, rootDefs) {
+  const out = [];
+  const stack = [{ node, chain: /* @__PURE__ */ new Set() }];
+  while (stack.length > 0) {
+    const { node: n, chain } = stack.pop();
+    if (typeof n.$ref === "string") {
+      if (!n.$ref.startsWith("#/") || chain.has(n.$ref)) {
+        return { kind: "ref-error", ref: n.$ref };
+      }
+      const target = resolveLocalRef(n.$ref, rootDefs);
+      if (target === void 0) return { kind: "ref-error", ref: n.$ref };
+      stack.push({ node: target, chain: /* @__PURE__ */ new Set([...chain, n.$ref]) });
+      continue;
+    }
+    if (Array.isArray(n.anyOf)) {
+      for (const branch of n.anyOf) stack.push({ node: branch, chain });
+      continue;
+    }
+    out.push(n);
+  }
+  return { kind: "ok", nodes: out };
+}
+function firstDefined(nodes, pick) {
+  for (const n of nodes) {
+    const v = pick(n);
+    if (v !== void 0) return v;
+  }
+  return void 0;
+}
+function hasType(node, t) {
+  const type = node.type;
+  if (type === void 0) return false;
+  return Array.isArray(type) ? type.includes(t) : type === t;
+}
+function escape(key) {
+  return key.replace(/~/g, "~0").replace(/\//g, "~1");
+}
+
 // src/service/bindingValidator.ts
 var filterMap = new Map(BUILTIN_FILTERS.map((f) => [f.name, f]));
-function validateBindings(html, attrName, stateTagName = "wcs-state", locale3, fileReader) {
+function validateBindings(html, attrName, stateTagName = "wcs-state", locale3, fileReader, applicationSchema) {
   const diagnostics = [];
   const msgs = getMessages(locale3);
-  const statePaths = getStatePathsFromHtml(html, stateTagName, fileReader);
-  const pathsByState = /* @__PURE__ */ new Map();
-  for (const p of statePaths) {
-    const list = pathsByState.get(p.stateName) ?? [];
-    list.push(p);
-    pathsByState.set(p.stateName, list);
-  }
+  const statePaths = mergeSchemaCandidates(getStatePathsFromHtml(html, stateTagName, fileReader), applicationSchema);
   const attrs = findAllBindAttributes(html, attrName);
   let structuralTemplates = null;
   const getStructuralTemplates = () => {
@@ -1957,7 +2303,7 @@ function validateBindings(html, attrName, stateTagName = "wcs-state", locale3, f
     for (const binding of bindings) {
       const bindingStart = attr.valueStart + pos;
       const parsed = parseBindingExpression(binding);
-      const scopedPaths = pathsByState.get(parsed.targetState) ?? [];
+      const scopedPaths = statePaths;
       const scopedPathSet = new Set(scopedPaths.map((p) => p.path));
       const propNoMod = parsed.property.replace(/#.*$/, "").trim();
       if (propNoMod === "...") {
@@ -2041,16 +2387,17 @@ function validateBindings(html, attrName, stateTagName = "wcs-state", locale3, f
             }
           }
           if (checkPath) {
-            const message = validatePathExistence(checkPath, pathTrimmed, scopedPaths, scopedPathSet, commandNames, msgs);
-            if (message) {
+            const schema = applicationSchema;
+            const verdict = schema !== void 0 ? validateSchemaPathExistence(checkPath, pathTrimmed, scopedPaths, scopedPathSet, commandNames, schema, msgs) : toMissingVerdict(validatePathExistence(checkPath, pathTrimmed, scopedPaths, scopedPathSet, commandNames, msgs));
+            if (verdict) {
               const pathOffset = binding.indexOf(parsed.path);
               const pathStart = bindingStart + pathOffset;
               diagnostics.push({
-                code: WcsDiagnosticCode.BindingPathMissing,
+                code: verdict.code,
                 start: pathStart,
                 end: pathStart + pathTrimmed.length,
-                message: `${message}${pathTrimmed.startsWith(".") ? msgs.expansionSuffix(checkPath) : ""}`,
-                severity: "warning"
+                message: `${verdict.message}${pathTrimmed.startsWith(".") ? msgs.expansionSuffix(checkPath) : ""}`,
+                severity: verdict.severity
               });
             }
           }
@@ -2169,12 +2516,13 @@ function validateBindings(html, attrName, stateTagName = "wcs-state", locale3, f
             if (typeReq && resultType !== typeReq.expected) {
               const pathOffset = binding.indexOf(parsed.path);
               const pathStart = bindingStart + pathOffset;
+              const schemaDefinite = typeReq.expected === "array" && parsed.filters.length === 0 && applicationSchema !== void 0 && scopedPaths.some((p) => p.path === pathTrimmed && p.fromSchema === true);
               diagnostics.push({
-                code: WcsDiagnosticCode.BindingTypeExpectation,
+                code: schemaDefinite ? WcsDiagnosticCode.PathTypeMismatch : WcsDiagnosticCode.BindingTypeExpectation,
                 start: pathStart,
                 end: pathStart + pathTrimmed.length,
-                message: msgs.typeExpectation(typeReq.label, typeReq.expected, resultType),
-                severity: typeReq.severity
+                message: schemaDefinite ? msgs.pathTypeMismatch(pathTrimmed, typeReq.label, typeReq.expected, resultType) : msgs.typeExpectation(typeReq.label, typeReq.expected, resultType),
+                severity: schemaDefinite ? "error" : typeReq.severity
               });
             }
           }
@@ -2222,7 +2570,7 @@ function splitBindingExpressions(value) {
 function parseBindingExpression(expr) {
   const colonIndex = expr.indexOf(":");
   if (colonIndex === -1) {
-    return { property: expr.trim(), path: null, targetState: "default", filters: [], inputFilters: [] };
+    return { property: expr.trim(), path: null, filters: [], inputFilters: [] };
   }
   const rawProp = expr.slice(0, colonIndex);
   const propSegments = splitByPipe(rawProp);
@@ -2234,9 +2582,8 @@ function parseBindingExpression(expr) {
   const filterSegments = segments.slice(1);
   const atIndex = pathSegment.indexOf("@");
   const path = atIndex !== -1 ? pathSegment.slice(0, atIndex) : pathSegment;
-  const targetState = atIndex !== -1 ? pathSegment.slice(atIndex + 1).trim() || "default" : "default";
   const filters = parseFilterSegments(expr, filterSegments, colonIndex + 1 + pathSegment.length + 1);
-  return { property, path: path.trim() || null, targetState, filters, inputFilters };
+  return { property, path: path.trim() || null, filters, inputFilters };
 }
 function parseFilterSegments(expr, segments, searchStart) {
   const filters = [];
@@ -2345,6 +2692,20 @@ function validatePathExistence(checkPath, displayPath, scopedPaths, scopedPathSe
   }
   return null;
 }
+function toMissingVerdict(message) {
+  return message ? { code: WcsDiagnosticCode.BindingPathMissing, message, severity: "warning" } : null;
+}
+function validateSchemaPathExistence(checkPath, displayPath, scopedPaths, scopedPathSet, commandNames, schema, msgs) {
+  if (checkPath.startsWith("$")) {
+    return toMissingVerdict(validatePathExistence(checkPath, displayPath, scopedPaths, scopedPathSet, commandNames, msgs));
+  }
+  if (scopedPathSet.has(checkPath)) return null;
+  const resolution = resolveSchemaPath(schema, schema.$defs ?? {}, checkPath.split("."));
+  if (resolution.kind === "nonexistent") {
+    return { code: WcsDiagnosticCode.PathNonexistent, message: msgs.pathNonexistent(displayPath), severity: "error" };
+  }
+  return null;
+}
 function collectStructuralTemplates(html, attrName) {
   const escaped = attrName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const attrRegex = new RegExp(`${escaped}\\s*=\\s*(["'])`, "i");
@@ -2746,12 +3107,21 @@ function isInsideTag(html, offset, tagName) {
 }
 
 // src/service/templateSyntaxValidator.ts
-function validateTemplateSyntax(html, stateTagName, bindAttrName = "data-wcs", locale3, fileReader) {
+function validateTemplateSyntax(html, stateTagName, bindAttrName = "data-wcs", locale3, fileReader, applicationSchema) {
   const diagnostics = [];
   const msgs = getMessages(locale3);
-  const allPaths = getStatePathsFromHtml(html, stateTagName, fileReader);
+  const allPaths = mergeSchemaCandidates(getStatePathsFromHtml(html, stateTagName, fileReader), applicationSchema);
+  const defaultSchema = applicationSchema;
+  const missingVerdict = (path, displayPath, pathSet2, scoped) => {
+    if (isValidTemplatePath(path, pathSet2, scoped)) return null;
+    if (defaultSchema !== void 0 && !path.startsWith("$")) {
+      const resolution = resolveSchemaPath(defaultSchema, defaultSchema.$defs ?? {}, path.split("."));
+      return resolution.kind === "nonexistent" ? { code: WcsDiagnosticCode.PathNonexistent, severity: "error", message: msgs.pathNonexistent(displayPath) } : null;
+    }
+    return { code: WcsDiagnosticCode.BindingPathMissing, severity: "warning", message: msgs.pathMissing(displayPath) };
+  };
   if (allPaths.length === 0) return diagnostics;
-  const defaultPaths = allPaths.filter((p) => p.stateName === "default");
+  const defaultPaths = allPaths;
   const pathSet = new Set(defaultPaths.map((p) => p.path));
   const filterNameSet = new Set(BUILTIN_FILTERS.map((f) => f.name));
   const mustaches = findAllMustacheSyntax(html);
@@ -2777,9 +3147,8 @@ function validateTemplateSyntax(html, stateTagName, bindAttrName = "data-wcs", l
     }
     if (!item.expression) continue;
     const parts = item.expression.split("|");
-    let pathPart = (parts[0] || "").trim();
-    const atIdx = pathPart.indexOf("@");
-    if (atIdx !== -1) pathPart = pathPart.slice(0, atIdx).trim();
+    const pathPart = (parts[0] || "").trim();
+    if (pathPart.includes("@")) continue;
     const insideFor = item.insideTemplate && isInsideForTemplate(html, item.matchStart, bindAttrName);
     if (pathPart && !/^-?\d|^["'`]|^true$|^false$|^null$/.test(pathPart)) {
       if (!insideFor && pathPart.includes("*")) {
@@ -2800,7 +3169,7 @@ function validateTemplateSyntax(html, stateTagName, bindAttrName = "data-wcs", l
           severity: "warning"
         });
       }
-      if (insideFor && !pathPart.startsWith(".") && !pathPart.includes("@")) {
+      if (insideFor && !pathPart.startsWith(".")) {
         const indexMatch = /^\$(\d+)$/.exec(pathPart);
         const needed = indexMatch !== null ? Number(indexMatch[1]) : pathPart.includes("*") ? countWildcardSegments(pathPart) : 0;
         if (needed > 0) {
@@ -2829,24 +3198,28 @@ function validateTemplateSyntax(html, stateTagName, bindAttrName = "data-wcs", l
         const forPath = insideFor ? getInnermostForPath(html, item.matchStart, bindAttrName) : null;
         if (forPath && !forPath.startsWith(".")) {
           const expandedPath = pathPart === "." ? `${forPath}.*` : `${forPath}.*.${pathPart.slice(1)}`;
-          if (!isValidTemplatePath(expandedPath, pathSet, defaultPaths)) {
+          const verdict = missingVerdict(expandedPath, pathPart, pathSet, defaultPaths);
+          if (verdict) {
             diagnostics.push({
-              code: WcsDiagnosticCode.BindingPathMissing,
+              code: verdict.code,
               start: item.exprStart,
               end: item.exprStart + pathPart.length,
-              message: msgs.pathMissing(pathPart) + msgs.expansionSuffix(expandedPath),
-              severity: "warning"
+              message: verdict.message + msgs.expansionSuffix(expandedPath),
+              severity: verdict.severity
             });
           }
         }
-      } else if (!isValidTemplatePath(pathPart, pathSet, defaultPaths)) {
-        diagnostics.push({
-          code: WcsDiagnosticCode.BindingPathMissing,
-          start: item.exprStart,
-          end: item.exprStart + pathPart.length,
-          message: msgs.pathMissing(pathPart),
-          severity: "warning"
-        });
+      } else {
+        const verdict = missingVerdict(pathPart, pathPart, pathSet, defaultPaths);
+        if (verdict) {
+          diagnostics.push({
+            code: verdict.code,
+            start: item.exprStart,
+            end: item.exprStart + pathPart.length,
+            message: verdict.message,
+            severity: verdict.severity
+          });
+        }
       }
     }
     for (let i = 1; i < parts.length; i++) {
@@ -3732,11 +4105,14 @@ var BUILTIN_TAGS = {
   "wcs-raf": {
     "package": "raf",
     "hasWcBindable": true,
-    "observedAttributes": [],
+    "observedAttributes": [
+      "reduced-motion"
+    ],
     "inputs": {
       "once": "once",
       "repeat": "repeat",
       "manual": "manual",
+      "reducedMotion": "reduced-motion",
       "trigger": null
     },
     "properties": [
@@ -4255,7 +4631,7 @@ function validateBindingAgainstContract(tagName, contract, parsed, property, sta
     return;
   }
   if (property === "trigger" && "trigger" in contract.inputs && parsed.path) {
-    const cand = findDataSlot(getPaths(), parsed.path, parsed.targetState);
+    const cand = findDataSlot(getPaths(), parsed.path);
     if (cand?.rawInitial === "true") {
       diagnostics.push({
         code: WcsDiagnosticCode.TriggerSeededTruthy,
@@ -4269,7 +4645,7 @@ function validateBindingAgainstContract(tagName, contract, parsed, property, sta
     }
   }
   if (tagName === "wcs-storage" && property === "value" && !hasManual && parsed.path && !/(?:^|,)init=(?:element|auto)\b/.test(modifiers)) {
-    const cand = findDataSlot(getPaths(), parsed.path, parsed.targetState);
+    const cand = findDataSlot(getPaths(), parsed.path);
     if (cand?.rawInitial !== void 0 && EMPTYISH_SEEDS.has(normalizeSeed(cand.rawInitial))) {
       diagnostics.push({
         code: WcsDiagnosticCode.StorageSeedClobber,
@@ -4283,8 +4659,8 @@ function validateBindingAgainstContract(tagName, contract, parsed, property, sta
     }
   }
 }
-function findDataSlot(paths, path, stateName) {
-  return paths.find((c) => c.kind === "data" && c.path === path && c.stateName === stateName);
+function findDataSlot(paths, path) {
+  return paths.find((c) => c.kind === "data" && c.path === path);
 }
 function normalizeSeed(raw) {
   const compact = raw.replace(/\s+/g, "");
@@ -4559,7 +4935,7 @@ function blankJsComments(code) {
 }
 
 // src/service/watchDeclarationValidator.ts
-var STATE_NAME_SEPARATOR2 = "@";
+var STATE_NAME_SEPARATOR = "@";
 function validateWatchDeclarations(html, stateTagName = "wcs-state", locale3) {
   const msgs = getMessages(locale3);
   const out = [];
@@ -4576,7 +4952,7 @@ function validateWatchDeclarations(html, stateTagName = "wcs-state", locale3) {
     }
     const entries = analyzeWatchEntries(block.content);
     if (entries.length === 0) continue;
-    const paths = analyzeStatePaths(block.content, block.stateName);
+    const paths = analyzeStatePaths(block.content);
     const pathSet = new Set(paths.map((p) => p.path));
     for (const entry of entries) {
       const diagnostic = validateEntry(entry, pathSet, msgs);
@@ -4595,7 +4971,7 @@ function validateWatchDeclarations(html, stateTagName = "wcs-state", locale3) {
 function validateEntry(entry, pathSet, msgs) {
   const { key } = entry;
   const invalid = (message) => ({ code: WcsDiagnosticCode.WatchDeclarationInvalid, message, severity: "error" });
-  if (key.includes(STATE_NAME_SEPARATOR2)) {
+  if (key.includes(STATE_NAME_SEPARATOR)) {
     return invalid(msgs.watchKeyCrossState(key));
   }
   if (key.startsWith("$")) {
@@ -4617,6 +4993,112 @@ function validateEntry(entry, pathSet, msgs) {
   return null;
 }
 
+// src/service/namedStateValidator.ts
+function findStateSelector(expr, embedded = false) {
+  const colon = embedded ? -1 : expr.indexOf(":");
+  const from = colon + 1;
+  let depth = 0;
+  let end = expr.length;
+  for (let i = from; i < expr.length; i++) {
+    const ch = expr[i];
+    if (ch === "(") depth++;
+    else if (ch === ")") depth = Math.max(0, depth - 1);
+    else if (ch === "|" && depth === 0) {
+      end = i;
+      break;
+    }
+  }
+  const at = expr.indexOf("@", from);
+  if (at === -1 || at >= end) return null;
+  const raw = expr.slice(at + 1, end);
+  const name = raw.trim();
+  const nameStart = at + 1 + (raw.length - raw.trimStart().length);
+  return { start: at, end: name.length === 0 ? at + 1 : nameStart + name.length, name: name.length === 0 ? "default" : name };
+}
+function validateNamedState(html, attrName, stateTagName = "wcs-state", locale3) {
+  const msgs = getMessages(locale3);
+  const diagnostics = [];
+  for (const element of parseWcsStateElements(html, stateTagName)) {
+    const tagText = html.slice(element.tagStart, element.tagEnd);
+    const match = /(?:^|\s)name\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/i.exec(tagText);
+    if (match === null) continue;
+    const value = match[1] ?? match[2] ?? match[3] ?? "";
+    const quoted = match[1] !== void 0 || match[2] !== void 0;
+    const valueEnd = element.tagStart + match.index + match[0].length - (quoted ? 1 : 0);
+    diagnostics.push({
+      code: WcsDiagnosticCode.NamedStateDeprecated,
+      start: valueEnd - value.length,
+      end: valueEnd,
+      message: msgs.namedStateAttrDeprecated(value),
+      severity: "error"
+    });
+  }
+  for (const attr of findAllBindAttributes(html, attrName)) {
+    let pos = 0;
+    for (const expr of splitBindingExpressions(attr.value)) {
+      const selector = findStateSelector(expr);
+      if (selector !== null) {
+        diagnostics.push({
+          code: WcsDiagnosticCode.NamedStateDeprecated,
+          start: attr.valueStart + pos + selector.start,
+          end: attr.valueStart + pos + selector.end,
+          message: msgs.namedStatePathDeprecated(selector.name),
+          severity: "error"
+        });
+      }
+      pos += expr.length + 1;
+    }
+  }
+  for (const item of [...findAllMustacheSyntax(html), ...findAllCommentBindings(html)]) {
+    const selector = findStateSelector(item.expression, true);
+    if (selector !== null) {
+      diagnostics.push({
+        code: WcsDiagnosticCode.NamedStateDeprecated,
+        start: item.exprStart + selector.start,
+        end: item.exprStart + selector.end,
+        message: msgs.namedStatePathDeprecated(selector.name),
+        severity: "error"
+      });
+    }
+  }
+  return diagnostics;
+}
+
+// src/service/mountAttrValidator.ts
+function findMountPathProblem(mountPath) {
+  if (mountPath.length === 0) return "empty";
+  for (const segment of mountPath.split(".")) {
+    if (segment.length === 0) return "emptySegment";
+    if (segment === "*") return "wildcard";
+    if (segment.includes("$") || segment.includes("#") || segment.includes("@")) return "reserved";
+  }
+  return null;
+}
+function validateMountAttributes(html, stateTagName = "wcs-state", locale3) {
+  const msgs = getMessages(locale3);
+  const diagnostics = [];
+  for (const element of parseWcsStateElements(html, stateTagName)) {
+    if (element.mountPath === null) continue;
+    const problem = findMountPathProblem(element.mountPath);
+    if (problem === null) continue;
+    const tagText = html.slice(element.tagStart, element.tagEnd);
+    const match = /(?:^|\s)mount\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))/i.exec(tagText);
+    if (match === null) continue;
+    const value = match[1] ?? match[2] ?? match[3] ?? "";
+    const quoted = match[1] !== void 0 || match[2] !== void 0;
+    const valueEnd = element.tagStart + match.index + match[0].length - (quoted ? 1 : 0);
+    const attrStart = element.tagStart + match.index + (/^\s/.test(match[0]) ? 1 : 0);
+    diagnostics.push({
+      code: WcsDiagnosticCode.MountPathInvalid,
+      start: value.length === 0 ? attrStart : valueEnd - value.length,
+      end: valueEnd + (quoted && value.length === 0 ? 1 : 0),
+      message: msgs.mountPathInvalid(problem, element.mountPath),
+      severity: "error"
+    });
+  }
+  return diagnostics;
+}
+
 // ../state/dist/parser.esm.js
 var DELIMITER2 = ".";
 var WILDCARD2 = "*";
@@ -4624,7 +5106,6 @@ var MAX_WILDCARD_DEPTH2 = 128;
 var BINDING_SEPARATOR2 = ";";
 var PROP_VALUE_SEPARATOR2 = ":";
 var MODIFIER_SEPARATOR2 = "#";
-var STATE_NAME_SEPARATOR3 = "@";
 var FILTER_SEPARATOR2 = "|";
 var ELSE_KEYWORD2 = "else";
 var SPREAD_PROP2 = "...";
@@ -5480,10 +5961,12 @@ function parseStatePart(statePart) {
   } else {
     stateAndPath = statePart.trim();
   }
-  const [statePathName, stateName = "default"] = stateAndPath.split(STATE_NAME_SEPARATOR3).map(trimFn);
+  if (stateAndPath.indexOf("@") !== -1) {
+    raiseError2(`"${stateAndPath}": the "@name" selector was removed in v2 \u2014 there is a single state tree. Mount the named state onto the tree (<wcs-state mount="...">) and read it by its path prefix instead.`);
+  }
+  const statePathName = stateAndPath;
   const pathInfo = getPathInfo(statePathName);
   return {
-    stateName,
     statePathName,
     statePathInfo: pathInfo,
     outFilters: filters
@@ -5506,7 +5989,6 @@ function parseBindTextsForElement(bindText) {
         propModifiers: [],
         statePathName: "#else",
         statePathInfo: pathInfo,
-        stateName: "",
         inFilters: [],
         outFilters: [],
         bindingType: "else"
@@ -5606,24 +6088,18 @@ function parseEmbeddedTextWithPositions(expression) {
     error = e.message;
   }
   if (parsed === null) {
-    return { exprRange, exprText: expression, parsed, error, propRange: null, pathRange: null, stateNameRange: null };
+    return { exprRange, exprText: expression, parsed, error, propRange: null, pathRange: null };
   }
   const firstPipe = expression.indexOf(delimiters.filter);
   const pathScopeEnd = firstPipe === -1 ? expression.length : firstPipe;
   const pathLocal = locate(expression, parsed.statePathName, 0, pathScopeEnd);
-  let stateNameLocal = null;
-  const at = expression.indexOf(delimiters.stateName);
-  if (at !== -1 && at < pathScopeEnd) {
-    stateNameLocal = locate(expression, parsed.stateName, at + 1, pathScopeEnd);
-  }
   return {
     exprRange,
     exprText: expression,
     parsed,
     error,
     propRange: null,
-    pathRange: pathLocal,
-    stateNameRange: stateNameLocal
+    pathRange: pathLocal
   };
 }
 function parseBindTextWithPositions(bindText) {
@@ -5645,23 +6121,18 @@ function parseBindTextWithPositions(bindText) {
       error = e.message;
     }
     if (parsed === null) {
-      results.push({ exprRange, exprText: expr, parsed, error, propRange: null, pathRange: null, stateNameRange: null });
+      results.push({ exprRange, exprText: expr, parsed, error, propRange: null, pathRange: null });
       continue;
     }
     const colon = expr.indexOf(delimiters.propValue);
     const propEndLimit = colon === -1 ? expr.length : colon;
     const propLocal = locate(expr, parsed.propName, 0, propEndLimit);
     let pathLocal = null;
-    let stateNameLocal = null;
     if (colon !== -1) {
       const stateBase = colon + 1;
       const firstPipe = expr.indexOf(delimiters.filter, stateBase);
       const pathScopeEnd = firstPipe === -1 ? expr.length : firstPipe;
       pathLocal = locate(expr, parsed.statePathName, stateBase, pathScopeEnd);
-      const at = expr.indexOf(delimiters.stateName, stateBase);
-      if (at !== -1 && at < pathScopeEnd) {
-        stateNameLocal = locate(expr, parsed.stateName, at + 1, pathScopeEnd);
-      }
     }
     const lift = (range) => range === null ? null : { start: exprStart + range.start, end: exprStart + range.end };
     results.push({
@@ -5670,17 +6141,13 @@ function parseBindTextWithPositions(bindText) {
       parsed,
       error,
       propRange: lift(propLocal),
-      pathRange: lift(pathLocal),
-      stateNameRange: lift(stateNameLocal)
+      pathRange: lift(pathLocal)
     });
   }
   return results;
 }
 
 // src/core/index/referenceIndex.ts
-function keyOf(stateName, path) {
-  return `${stateName}\0${path}`;
-}
 function buildReferenceIndex(html, options = {}) {
   clearParserCaches();
   const bindAttribute = options.bindAttribute ?? "data-wcs";
@@ -5698,13 +6165,11 @@ function buildReferenceIndex(html, options = {}) {
       occurrences.push({
         source: "attribute",
         kind: binding.parsed.propSegments[0] === "eventToken" ? "eventToken" : "path",
-        stateName: binding.parsed.stateName,
         path: binding.parsed.statePathName,
         pathRange: lift(binding.pathRange),
         exprRange: lift(binding.exprRange),
         propName: binding.parsed.propName,
         propRange: binding.propRange === null ? null : lift(binding.propRange),
-        stateNameRange: binding.stateNameRange === null ? null : lift(binding.stateNameRange),
         bindingType: binding.parsed.bindingType
       });
     }
@@ -5727,22 +6192,21 @@ function buildReferenceIndex(html, options = {}) {
     occurrences.push({
       source: match.kind,
       kind: "path",
-      stateName: binding.parsed.stateName,
       path: binding.parsed.statePathName,
       pathRange: shift(binding.pathRange),
       exprRange: { start: match.exprStart, end: match.exprEnd },
       propName: null,
       propRange: null,
-      stateNameRange: binding.stateNameRange === null ? null : shift(binding.stateNameRange),
       bindingType: "text"
     });
   }
   const declarations = [];
   for (const block of parseWcsScriptBlocks(html, stateTagName)) {
+    const prefix = block.mountPath === null ? "" : block.mountPath + ".";
     for (const span of analyzeDeclarationSpans(block.content)) {
+      if (prefix !== "" && span.name.startsWith("$")) continue;
       declarations.push({
-        stateName: block.stateName,
-        name: span.name,
+        name: prefix + span.name,
         kind: span.kind,
         range: { start: block.contentStart + span.start, end: block.contentStart + span.end }
       });
@@ -5751,7 +6215,7 @@ function buildReferenceIndex(html, options = {}) {
   const byPath = /* @__PURE__ */ new Map();
   for (const occurrence of occurrences) {
     if (occurrence.kind !== "path") continue;
-    const key = keyOf(occurrence.stateName, occurrence.path);
+    const key = occurrence.path;
     const list = byPath.get(key);
     if (list === void 0) {
       byPath.set(key, [occurrence]);
@@ -5761,22 +6225,22 @@ function buildReferenceIndex(html, options = {}) {
   }
   const declarationByName = /* @__PURE__ */ new Map();
   for (const declaration of declarations) {
-    const key = keyOf(declaration.stateName, declaration.name);
+    const key = declaration.name;
     if (!declarationByName.has(key)) declarationByName.set(key, declaration);
   }
   return {
     occurrences,
     declarations,
     problems,
-    referencesOf(stateName, path) {
-      return (byPath.get(keyOf(stateName, path)) ?? []).slice();
+    referencesOf(path) {
+      return (byPath.get(path) ?? []).slice();
     },
-    declarationOf(stateName, path) {
-      const exact = declarationByName.get(keyOf(stateName, path));
+    declarationOf(path) {
+      const exact = declarationByName.get(path);
       if (exact !== void 0) return exact;
       const firstSegment = path.split(".")[0];
       if (firstSegment === path) return null;
-      return declarationByName.get(keyOf(stateName, firstSegment)) ?? null;
+      return declarationByName.get(firstSegment) ?? null;
     },
     occurrenceAt(offset) {
       for (const occurrence of occurrences) {
@@ -6021,8 +6485,9 @@ function validateUpdatedCallbackDemand(html, stateTagName, bindAttrName, locale3
   for (const block of blocks) {
     const callback = analyzeCallableBodies(block.content).find((entry) => entry.name === STATE_UPDATED_CALLBACK && entry.kind === "method");
     if (callback === void 0) continue;
-    const declared = new Set(analyzeStatePaths(block.content, block.stateName).map((p) => p.path));
-    const bound = boundPaths.get(block.stateName) ?? /* @__PURE__ */ new Set();
+    if (block.mountPath !== null) continue;
+    const declared = new Set(analyzeStatePaths(block.content).map((p) => p.path));
+    const bound = boundPaths;
     const body = blankComments(callback.body);
     PATH_TEST_LITERAL.lastIndex = 0;
     let match;
@@ -6045,27 +6510,18 @@ function validateUpdatedCallbackDemand(html, stateTagName, bindAttrName, locale3
   return out;
 }
 function collectBoundPaths(html, stateTagName, bindAttrName) {
-  const byState = /* @__PURE__ */ new Map();
-  const add = (stateName, path) => {
-    let set = byState.get(stateName);
-    if (set === void 0) {
-      set = /* @__PURE__ */ new Set();
-      byState.set(stateName, set);
-    }
-    set.add(path);
-  };
+  const bound = /* @__PURE__ */ new Set();
   const index = buildReferenceIndex(html, { bindAttribute: bindAttrName, stateTagName });
   for (const occurrence of index.occurrences) {
-    add(occurrence.stateName, occurrence.path);
+    bound.add(occurrence.path);
     if (!occurrence.path.startsWith(".")) continue;
     const forPath = getInnermostForPath(html, occurrence.pathRange.start, bindAttrName);
     if (forPath === null || forPath.startsWith(".")) continue;
-    add(
-      occurrence.stateName,
+    bound.add(
       occurrence.path === "." ? `${forPath}.*` : `${forPath}.*.${occurrence.path.slice(1)}`
     );
   }
-  return byState;
+  return bound;
 }
 function validateSemantics(html, stateTagName = "wcs-state", locale3, bindAttrName = "data-wcs") {
   const out = [];
@@ -6077,154 +6533,6 @@ function validateSemantics(html, stateTagName = "wcs-state", locale3, bindAttrNa
   return out;
 }
 
-// src/core/validateDocument.ts
-function validateDocument(text, options = {}) {
-  const bindAttribute = options.bindAttribute ?? "data-wcs";
-  const stateTagName = options.stateTagName ?? "wcs-state";
-  const locale3 = options.locale;
-  const fileReader = options.fileReader;
-  const out = [];
-  out.push(...validateBindings(text, bindAttribute, stateTagName, locale3, fileReader));
-  out.push(...validateTemplateSyntax(text, stateTagName, bindAttribute, locale3, fileReader));
-  out.push(...validateIoNodes(text, bindAttribute, stateTagName, locale3, fileReader));
-  out.push(...validateAriaAttributes(text, bindAttribute, locale3));
-  out.push(...validateDocumentEnv(text, locale3));
-  out.push(...validateSemantics(text, stateTagName, locale3, bindAttribute));
-  out.push(...validateArrayMutations(text, stateTagName, locale3));
-  out.push(...validateWatchDeclarations(text, stateTagName, locale3));
-  for (const d of validateStateTypes(text, stateTagName, locale3)) {
-    out.push({ code: WcsDiagnosticCode.TypeAnnotation, start: d.start, end: d.end, message: d.message, severity: d.severity });
-  }
-  for (const d of validateNestedAssigns(text, stateTagName, locale3)) {
-    out.push({ code: WcsDiagnosticCode.NestedAssign, start: d.start, end: d.end, message: d.message, severity: d.severity });
-  }
-  return sortDiagnostics(out);
-}
-
-// src/core/sidecar/schemaSubset.ts
-var ALLOWED_SCHEMA_KEYWORDS = /* @__PURE__ */ new Set([
-  "type",
-  "properties",
-  "required",
-  "items",
-  "enum",
-  "const",
-  "anyOf",
-  "$defs",
-  "$ref"
-]);
-var DiagnosticContext = class {
-  constructor(spans) {
-    this.spans = spans;
-  }
-  diagnostics = [];
-  add(code, pointer2, message, severity, extra = {}, useKeySpan = false) {
-    const span = this.spans.get(pointer2);
-    const start = span === void 0 ? 0 : useKeySpan ? span.keyStart ?? span.start : span.start;
-    const end = span === void 0 ? 0 : useKeySpan ? span.keyEnd ?? span.end : span.end;
-    this.diagnostics.push({ code, start, end, message, severity, ...extra });
-  }
-};
-function isSchemaObject(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function isSchemaMap(value) {
-  return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function validateSchemaSubset(schema, pointerBase, ctx, rootDefs) {
-  walkKeywords(schema, pointerBase, ctx, rootDefs);
-  const safe = /* @__PURE__ */ new Set();
-  detectCycles(schema, pointerBase, ctx, rootDefs, /* @__PURE__ */ new Set(), safe);
-  for (const [name, def] of Object.entries(rootDefs)) {
-    detectCycles(def, `${pointerBase}/$defs/${escape(name)}`, ctx, rootDefs, /* @__PURE__ */ new Set(), safe);
-  }
-}
-function walkKeywords(node, ptr, ctx, rootDefs) {
-  if (!isSchemaObject(node)) return;
-  for (const keyword of Object.keys(node)) {
-    if (!ALLOWED_SCHEMA_KEYWORDS.has(keyword)) {
-      ctx.add(
-        WcsDiagnosticCode.ManifestUnknownKeyword,
-        `${ptr}/${escape(keyword)}`,
-        `Unsupported schema keyword "${keyword}". Allowed: ${[...ALLOWED_SCHEMA_KEYWORDS].join(", ")}.`,
-        "warning",
-        {},
-        true
-      );
-    }
-  }
-  if (typeof node.$ref === "string") {
-    if (!node.$ref.startsWith("#/")) {
-      ctx.add(
-        WcsDiagnosticCode.ManifestExternalRef,
-        `${ptr}/$ref`,
-        `External $ref "${node.$ref}" is forbidden; only local "#/$defs/..." references are allowed.`,
-        "error"
-      );
-    } else if (resolveLocalRef(node.$ref, rootDefs) === void 0) {
-      ctx.add(
-        WcsDiagnosticCode.ManifestRefUnresolved,
-        `${ptr}/$ref`,
-        `Unresolved local $ref "${node.$ref}".`,
-        "error"
-      );
-    }
-  }
-  if (isSchemaMap(node.properties)) {
-    for (const [name, child] of Object.entries(node.properties)) {
-      walkKeywords(child, `${ptr}/properties/${escape(name)}`, ctx, rootDefs);
-    }
-  }
-  if (node.items !== void 0 && isSchemaObject(node.items)) {
-    walkKeywords(node.items, `${ptr}/items`, ctx, rootDefs);
-  }
-  if (Array.isArray(node.anyOf)) {
-    node.anyOf.forEach((child, i) => walkKeywords(child, `${ptr}/anyOf/${i}`, ctx, rootDefs));
-  }
-  if (isSchemaMap(node.$defs)) {
-    for (const [name, child] of Object.entries(node.$defs)) {
-      walkKeywords(child, `${ptr}/$defs/${escape(name)}`, ctx, rootDefs);
-    }
-  }
-}
-function detectCycles(node, ptr, ctx, rootDefs, refStack, safe) {
-  if (!isSchemaObject(node)) return;
-  if (typeof node.$ref === "string") {
-    const ref = node.$ref;
-    if (!ref.startsWith("#/")) return;
-    if (refStack.has(ref)) {
-      ctx.add(WcsDiagnosticCode.ManifestRefCycle, `${ptr}/$ref`, `Cyclic $ref detected at "${ref}".`, "error");
-      return;
-    }
-    if (safe.has(ref)) return;
-    const target = resolveLocalRef(ref, rootDefs);
-    if (target === void 0) return;
-    refStack.add(ref);
-    detectCycles(target, ptr, ctx, rootDefs, refStack, safe);
-    refStack.delete(ref);
-    safe.add(ref);
-    return;
-  }
-  if (isSchemaMap(node.properties)) {
-    for (const child of Object.values(node.properties)) detectCycles(child, ptr, ctx, rootDefs, refStack, safe);
-  }
-  if (node.items !== void 0 && isSchemaObject(node.items)) {
-    detectCycles(node.items, ptr, ctx, rootDefs, refStack, safe);
-  }
-  if (Array.isArray(node.anyOf)) {
-    for (const child of node.anyOf) detectCycles(child, ptr, ctx, rootDefs, refStack, safe);
-  }
-}
-function resolveLocalRef(ref, rootDefs) {
-  const match = /^#\/\$defs\/(.+)$/.exec(ref);
-  if (match === null) return void 0;
-  const name = match[1].replace(/~1/g, "/").replace(/~0/g, "~");
-  return rootDefs[name];
-}
-function escape(key) {
-  return key.replace(/~/g, "~0").replace(/\//g, "~1");
-}
-
 // src/core/sidecar/jsonSource.ts
 var JsonReader = class {
   constructor(text) {
@@ -6398,8 +6706,8 @@ function parseJsonWithSpans(text) {
 }
 
 // src/core/sidecar/types.ts
-var SUPPORTED_SCHEMA_VERSION = 1;
-var SUPPORTED_NAMESPACE_VERSION = 1;
+var SUPPORTED_SCHEMA_VERSION = 2;
+var SUPPORTED_NAMESPACE_VERSION = 2;
 
 // src/core/sidecar/loader.ts
 var NAMESPACE_KEYS = ["wcstack.types", "wcstack.async", "wcstack.platformCapabilities", "wcstack.application"];
@@ -6436,10 +6744,11 @@ function loadManifest(artifact) {
     return { artifact, manifest: null, ctx, spans: parsed.spans };
   }
   if (obj.schemaVersion !== SUPPORTED_SCHEMA_VERSION) {
+    const migration = obj.schemaVersion === 1 ? ` schemaVersion 1 (states[name]) predates v2's single state tree \u2014 regenerate with \`wcs-schema emit\`.` : "";
     ctx.add(
       WcsDiagnosticCode.ManifestSchemaVersion,
       pointer("schemaVersion"),
-      `Unsupported schemaVersion ${obj.schemaVersion}; this reader supports ${SUPPORTED_SCHEMA_VERSION}.`,
+      `Unsupported schemaVersion ${obj.schemaVersion}; this reader supports ${SUPPORTED_SCHEMA_VERSION}.${migration}`,
       "error"
     );
     return { artifact, manifest: null, ctx, spans: parsed.spans };
@@ -6488,8 +6797,12 @@ function resolvePackageContracts(loaded) {
   const collided = /* @__PURE__ */ new Set();
   const firstSource = /* @__PURE__ */ new Map();
   const filterOwner = /* @__PURE__ */ new Map();
+  let schemaOwner;
+  let schemaWinner;
+  let hasApplicationArtifact = false;
   for (const lm of loaded) {
     if (lm.manifest === null) continue;
+    if (lm.manifest.kind === "application") hasApplicationArtifact = true;
     const types = lm.manifest.manifestExtensions?.["wcstack.types"];
     if (lm.manifest.kind === "package" && types !== void 0) {
       for (const [tag, component] of Object.entries(types.components ?? {})) {
@@ -6541,13 +6854,97 @@ function resolvePackageContracts(loaded) {
         );
       }
     }
+    if (lm.manifest.kind === "application" && application?.stateSchema !== void 0) {
+      const schema = application.stateSchema;
+      if (schema !== null && typeof schema === "object" && !Array.isArray(schema)) {
+        if (schemaOwner === void 0) {
+          schemaOwner = lm.artifact.source;
+          schemaWinner = schema;
+        } else {
+          schemaWinner = void 0;
+          ctxFor(lm).add(
+            WcsDiagnosticCode.ManifestStateCollision,
+            pointer("manifestExtensions", "wcstack.application", "stateSchema"),
+            `Multiple application artifacts declare a stateSchema (also in "${schemaOwner}"); neither is used.`,
+            "error",
+            void 0,
+            true
+          );
+        }
+      }
+    }
   }
   const diagnosticsBySource = /* @__PURE__ */ new Map();
   for (const [source, diags] of perSource) {
     const kept = diags.filter((d) => !(d.code === WcsDiagnosticCode.ManifestOverride && d.tag !== void 0 && collided.has(d.tag)));
     if (kept.length > 0) diagnosticsBySource.set(source, kept);
   }
-  return { tags: winners, diagnosticsBySource };
+  return { tags: winners, applicationSchema: schemaWinner, hasApplicationArtifact, diagnosticsBySource };
+}
+
+// src/core/sidecar/discover.ts
+var APPLICATION_MANIFEST_FILENAME = "wcstack.manifest.json";
+var MAX_ASCEND = 16;
+function discoverApplicationManifest(fileReader) {
+  for (let up = 0; up <= MAX_ASCEND; up++) {
+    const relativePath = `${"../".repeat(up)}${APPLICATION_MANIFEST_FILENAME}`;
+    const text = fileReader(relativePath);
+    if (text === void 0) continue;
+    const loaded = loadManifest({ text, source: relativePath });
+    return { relativePath, text, loaded, schema: applicationSchemaOf(loaded) };
+  }
+  return void 0;
+}
+function applicationSchemaOf(loaded) {
+  const manifest = loaded.manifest;
+  if (manifest === null || manifest.kind !== "application") return void 0;
+  const application = manifest.manifestExtensions?.["wcstack.application"];
+  const schema = application?.stateSchema;
+  if (schema !== null && typeof schema === "object" && !Array.isArray(schema)) {
+    return schema;
+  }
+  return void 0;
+}
+function joinRelativeSource(htmlSource, relativePath) {
+  const sepIndex = Math.max(htmlSource.lastIndexOf("/"), htmlSource.lastIndexOf("\\"));
+  const dirSegments = sepIndex === -1 ? [] : htmlSource.slice(0, sepIndex).split(/[\\/]/);
+  for (const segment of relativePath.split("/")) {
+    if (segment === "" || segment === ".") continue;
+    if (segment === "..") {
+      if (dirSegments.length > 0 && dirSegments[dirSegments.length - 1] !== "..") dirSegments.pop();
+      else dirSegments.push("..");
+      continue;
+    }
+    dirSegments.push(segment);
+  }
+  return dirSegments.join("/");
+}
+
+// src/core/validateDocument.ts
+function validateDocument(text, options = {}) {
+  const bindAttribute = options.bindAttribute ?? "data-wcs";
+  const stateTagName = options.stateTagName ?? "wcs-state";
+  const locale3 = options.locale;
+  const fileReader = options.fileReader;
+  const applicationSchema = options.applicationSchema ?? (fileReader !== void 0 ? discoverApplicationManifest(fileReader)?.schema : void 0);
+  const out = [];
+  out.push(...validateBindings(text, bindAttribute, stateTagName, locale3, fileReader, applicationSchema));
+  out.push(...validateTemplateSyntax(text, stateTagName, bindAttribute, locale3, fileReader, applicationSchema));
+  out.push(...validateIoNodes(text, bindAttribute, stateTagName, locale3, fileReader));
+  out.push(...validateAriaAttributes(text, bindAttribute, locale3));
+  out.push(...validateDocumentEnv(text, locale3));
+  out.push(...validateSemantics(text, stateTagName, locale3, bindAttribute));
+  out.push(...validateArrayMutations(text, stateTagName, locale3));
+  out.push(...validateWatchDeclarations(text, stateTagName, locale3));
+  out.push(...validateNamedState(text, bindAttribute, stateTagName, locale3));
+  out.push(...validateMountAttributes(text, stateTagName, locale3));
+  for (const d of validateStateTypes(text, stateTagName, locale3)) {
+    out.push({ code: WcsDiagnosticCode.TypeAnnotation, start: d.start, end: d.end, message: d.message, severity: d.severity });
+  }
+  for (const d of validateNestedAssigns(text, stateTagName, locale3)) {
+    out.push({ code: WcsDiagnosticCode.NestedAssign, start: d.start, end: d.end, message: d.message, severity: d.severity });
+  }
+  return sortDiagnostics(out);
 }
 
 // src/core/sidecar/drift.ts
@@ -6606,13 +7003,23 @@ function checkDrift(tag, component, live, ctx) {
 }
 
 // src/core/sidecar/validate.ts
+function validateManifestArtifact(artifact) {
+  const loaded = loadManifest(artifact);
+  validateLoadedSchemas(loaded);
+  return sortDiagnostics(loaded.ctx.diagnostics);
+}
 function validateLoadedSchemas(loaded) {
   if (loaded.manifest === null) return;
   const types = loaded.manifest.manifestExtensions?.["wcstack.types"];
-  if (types === void 0) return;
-  for (const [tag, component] of Object.entries(types.components ?? {})) {
+  for (const [tag, component] of Object.entries(types?.components ?? {})) {
     validateComponentSchemas(tag, component, loaded.ctx);
   }
+  const application = loaded.manifest.manifestExtensions?.["wcstack.application"];
+  const stateSchema = application?.stateSchema;
+  if (stateSchema !== void 0 && stateSchema !== null && typeof stateSchema === "object" && !Array.isArray(stateSchema)) {
+    const ptr = pointer("manifestExtensions", "wcstack.application", "stateSchema");
+    validateSchemaSubset(stateSchema, ptr, loaded.ctx, stateSchema.$defs ?? {});
+  }
 }
 function validateComponentSchemas(tag, component, ctx) {
   const base = pointer("manifestExtensions", "wcstack.types", "components", tag);
@@ -6662,7 +7069,9 @@ function validateManifestSet(input) {
   return {
     diagnostics: sortDiagnostics(all),
     byArtifact: sortedByArtifact,
-    resolvedTags
+    resolvedTags,
+    resolvedSchema: resolved.applicationSchema,
+    hasApplicationArtifact: resolved.hasApplicationArtifact
   };
 }
 function escapePtr(key) {
@@ -6673,13 +7082,10 @@ function escapePtr(key) {
 var severityLabel = { error: "error", warning: "warning", info: "info" };
 function runValidation(inputs, options = {}) {
   const diagnosticsBySource = /* @__PURE__ */ new Map();
-  for (const input of inputs) {
-    if (input.kind === "html") {
-      const docOptions = input.fileReader !== void 0 ? { ...options, fileReader: input.fileReader } : options;
-      diagnosticsBySource.set(input.source, validateDocument(input.text, docOptions));
-    }
-  }
+  const textBySource = new Map(inputs.map((i) => [i.source, i.text]));
   const manifestInputs = inputs.filter((i) => i.kind === "manifest");
+  let explicitSchema;
+  let haveExplicitApplication = false;
   if (manifestInputs.length > 0) {
     const result = validateManifestSet({
       artifacts: manifestInputs.map((m) => ({ text: m.text, source: m.source })),
@@ -6688,8 +7094,32 @@ function runValidation(inputs, options = {}) {
     for (const input of manifestInputs) {
       diagnosticsBySource.set(input.source, result.byArtifact.get(input.source) ?? []);
     }
+    if (result.hasApplicationArtifact) {
+      haveExplicitApplication = true;
+      explicitSchema = result.resolvedSchema;
+    }
+  }
+  for (const input of inputs) {
+    if (input.kind !== "html") continue;
+    let applicationSchema = explicitSchema;
+    if (!haveExplicitApplication && input.fileReader !== void 0) {
+      const discovered = discoverApplicationManifest(input.fileReader);
+      applicationSchema = discovered?.schema;
+      if (discovered !== void 0) {
+        const source = joinRelativeSource(input.source, discovered.relativePath);
+        if (!diagnosticsBySource.has(source)) {
+          textBySource.set(source, discovered.text);
+          diagnosticsBySource.set(source, validateManifestArtifact({ text: discovered.text, source }));
+        }
+      }
+    }
+    const docOptions = {
+      ...options,
+      ...input.fileReader !== void 0 ? { fileReader: input.fileReader } : {},
+      ...applicationSchema !== void 0 ? { applicationSchema } : {}
+    };
+    diagnosticsBySource.set(input.source, validateDocument(input.text, docOptions));
   }
-  const textBySource = new Map(inputs.map((i) => [i.source, i.text]));
   const lines = [];
   let errorCount = 0;
   let warningCount = 0;
@@ -6711,7 +7141,7 @@ function runValidation(inputs, options = {}) {
     errorCount,
     warningCount,
     infoCount,
-    exitCode: errorCount > 0 ? 1 : 0,
+    exitCode: errorCount > 0 || options.strict === true && warningCount > 0 ? 1 : 0,
     diagnosticsBySource
   };
 }
@@ -6728,6 +7158,7 @@ function parseArgs(argv) {
     else if (arg.startsWith("--state-tag=")) options.stateTagName = arg.slice("--state-tag=".length);
     else if (arg.startsWith("--lang=")) options.locale = arg.slice("--lang=".length);
     else if (arg === "--errors-only" || arg === "--quiet") options.errorsOnly = true;
+    else if (arg === "--strict") options.strict = true;
     else if (!arg.startsWith("-")) files.push(arg);
   }
   return { options, files };
@@ -6746,7 +7177,7 @@ function main(argv) {
   const { options, files } = parseArgs(argv);
   const locale3 = resolveCliLocale(options.locale);
   if (files.length === 0) {
-    process.stderr.write("usage: wcs-validate [--attr=data-wcs] [--state-tag=wcs-state] [--lang=ja|en] <file> [<file> ...]\n");
+    process.stderr.write("usage: wcs-validate [--attr=data-wcs] [--state-tag=wcs-state] [--lang=ja|en] [--errors-only] [--strict] <file> [<file> ...]\n");
     return 2;
   }
   const inputs = [];
@@ -6768,7 +7199,7 @@ function main(argv) {
   }
   process.stdout.write(
     `
-${result.errorCount} error(s), ${result.warningCount} warning(s), ${result.infoCount} info
+${result.errorCount} error(s), ${result.warningCount} warning(s), ${result.infoCount} info${options.strict ? " (strict)" : ""}
 `
   );
   return result.exitCode;