@wairon/cli 5.1.1-dev.11 → 5.1.1-dev.12

package/dist/index.js

@@ -1312,7 +1312,7 @@ var init_defaults = __esm({
       copilot: ".github/prompts",
       codex: ".codex/agents"
     };
-    WAIRON_VERSION = "5.1.1-dev.11";
+    WAIRON_VERSION = "5.1.1-dev.12";
     GITHUB_REPO = "SYW-Apps/Waffle-AIron";
     ARCHITECT_AGENT_ID = "agent-architect";
     ARCHITECT_TEMPLATE_ID = "architect";
@@ -4729,12 +4729,12 @@ var init_stereotype_deps = __esm({
               }
             }
             if (comp.componentType === "Specialist") {
-              const forbiddenTypes = ["Portal", "Observer", "Orchestrator", "Store", "Supervisor"];
+              const forbiddenTypes = ["Portal", "Observer", "Orchestrator", "Store", "Registry", "Supervisor", "Actor"];
               if (forbiddenTypes.includes(depComp.componentType)) {
                 ctx.addIssue(
                   "error",
                   "ARCHITECTURE_VIOLATION_SPECIALIST_DEP",
-                  `Architectural violation: Specialist component "${comp.id}" cannot depend on "${depComp.componentType}" component "${depComp.id}". Specialists are narrow capabilities \u2014 they may use Repositories, Indexes, and Adapters, but not Orchestrators, Supervisors, Stores, Portals, or Observers.` + (depComp.componentType === "Store" ? storeResolutionHint(comp.componentType, depComp.id) : ""),
+                  `Architectural violation: Specialist component "${comp.id}" cannot depend on "${depComp.componentType}" component "${depComp.id}". Specialists are pure capabilities \u2014 they may use Repository facades, Indexes, and Adapters, but never workflow/runtime blocks (Orchestrators, Supervisors, Actors) and never persistence directly (Stores, Registries \u2014 all storage, even in-memory, is reached through a Repository facade), nor Portals or Observers.` + (depComp.componentType === "Store" ? storeResolutionHint(comp.componentType, depComp.id) : ""),
                   comp.id,
                   isDraftCtx || ctx.isComponentDraft(depComp.id)
                 );
@@ -8010,7 +8010,7 @@ function buildRuleContext(opts) {
   for (const i of interfaces) collectAllows(i.id, i.lint);
   for (const im of implementations) collectAllows(im.id, im.lint);
   for (const t of types) collectAllows(t.id, t.lint);
-  const knownIssueCodes = /* @__PURE__ */ new Set([
+  const knownIssueCodes2 = /* @__PURE__ */ new Set([
     ...[...SDD_RULES, ...extensions.rules].flatMap((r) => r.codes.map((c) => c.code)),
     // Declarative assertions bring their own namespaced codes — lint.allow
     // and severity overrides treat them exactly like builtins.
@@ -8073,7 +8073,7 @@ function buildRuleContext(opts) {
     mountSurfaceSnapshots: opts.mountSurfaceSnapshots ?? [],
     codeModel: opts.codeModel ?? emptyCodeModel(),
     lintAllows,
-    knownIssueCodes,
+    knownIssueCodes: knownIssueCodes2,
     addIssue
   };
 }
@@ -13349,6 +13349,9 @@ var MODEL = __MODEL_JSON__;
 function addRule(rule) {
   ruleSet.push(rule);
 }
+function listRules() {
+  return ruleSet;
+}
 function registerBuiltinRules() {
   ruleSet = [];
   for (const rule of SDD_RULES) addRule(rule);
@@ -13360,6 +13363,9 @@ function ruleSequence() {
   const base = ruleSet.filter((r) => r !== lintAllowsRule);
   return ruleSet.includes(lintAllowsRule) ? [...base, lintAllowsRule] : base;
 }
+function knownIssueCodes() {
+  return listRules().flatMap((r) => r.codes);
+}
 var ruleSet;
 var init_repository = __esm({
   "src/core/rules/repository.ts"() {
@@ -14291,6 +14297,32 @@ function projectPackSelections() {
     return [];
   }
 }
+function issueKey(issue2) {
+  return `${issue2.code}|${issue2.specId ?? ""}`;
+}
+function worstByKey(issues) {
+  const worst = /* @__PURE__ */ new Map();
+  for (const issue2 of issues) {
+    const key = issueKey(issue2);
+    const seen = worst.get(key);
+    if (!seen || SEVERITY_RANK[issue2.severity] > SEVERITY_RANK[seen]) worst.set(key, issue2.severity);
+  }
+  return worst;
+}
+function stricterSeverities(parent, child) {
+  const fromParent = parent?.sddRuleSeverity ?? {};
+  const fromChild = child?.sddRuleSeverity ?? {};
+  const codes = /* @__PURE__ */ new Set([...Object.keys(fromParent), ...Object.keys(fromChild)]);
+  if (codes.size === 0) return parent ?? child;
+  const defaults = new Map(knownIssueCodes().map((rc) => [rc.code, rc.defaultSeverity]));
+  const merged = {};
+  for (const code of codes) {
+    const p = fromParent[code] ?? defaults.get(code);
+    const c = fromChild[code] ?? defaults.get(code);
+    merged[code] = p === void 0 || c === void 0 ? p ?? c : SEVERITY_RANK[p] >= SEVERITY_RANK[c] ? p : c;
+  }
+  return { ...parent ?? child, sddRuleSeverity: merged };
+}
 function issue(severity, code, message, agentId, specId) {
   return { severity, code, message, agentId, specId };
 }
@@ -14372,7 +14404,7 @@ function validateProjectConfig(config) {
     issues
   };
 }
-function listRules() {
+function listRules2() {
   const extensions = loadProjectExtensions();
   registerBuiltinRules();
   registerPackRules(extensions.rules);
@@ -14472,21 +14504,22 @@ function validateSddTree(rulesOrOptions, projectType = "backend") {
     for (const rule of ruleSequence()) {
       rule.check(ctx);
     }
-    const uncovered = (i) => SUBPROJECT_REFERENCE_CODES.has(i.code) && !i.surfaceResolved;
-    const chainingParent = crossTree !== "off" && issues.some(uncovered) ? findChainingParent(getProjectRoot()) : null;
-    const resolution = chainingParent ? resolveThroughParent(getProjectRoot(), treatAllAsComplete) : null;
+    const unresolved = (i) => RESOLUTION_FAILURE_CODES.has(i.code) && !i.surfaceResolved;
+    const chainingParent = crossTree !== "off" && issues.some(unresolved) ? findChainingParent(getProjectRoot()) : null;
+    const resolution = chainingParent ? resolveThroughParent(getProjectRoot(), treatAllAsComplete, rules) : null;
     if (resolution) {
-      const parentSeverity = /* @__PURE__ */ new Map();
-      for (const i of resolution.issues) {
-        const key = `${i.code}|${i.specId ?? ""}`;
-        if (i.severity === "error" || !parentSeverity.has(key)) parentSeverity.set(key, i.severity);
-      }
-      const rejudged = (i) => {
-        const judged = parentSeverity.get(`${i.code}|${i.specId ?? ""}`);
-        return judged === "error" || judged === "warning" && i.severity === "warning";
-      };
-      const kept = issues.filter((i) => !uncovered(i) && !(i.surfaceResolved && rejudged(i)));
-      const merged = dedupeIssues([...kept, ...resolution.issues]);
+      const judgedByParent = worstByKey(resolution.issues);
+      const kept = issues.filter((i) => {
+        const judged = judgedByParent.get(issueKey(i));
+        if (judged !== void 0) return SEVERITY_RANK[judged] < SEVERITY_RANK[i.severity];
+        return !unresolved(i);
+      });
+      const keptByChild = worstByKey(kept);
+      const added = resolution.issues.filter((i) => {
+        const own = keptByChild.get(issueKey(i));
+        return own === void 0 || SEVERITY_RANK[own] <= SEVERITY_RANK[i.severity];
+      });
+      const merged = dedupeIssues([...kept, ...added]);
       return {
         valid: merged.every((i) => i.severity !== "error"),
         issues: merged,
@@ -14503,7 +14536,7 @@ function validateSddTree(rulesOrOptions, projectType = "backend") {
     });
   }
 }
-function resolveThroughParent(boundRoot, treatAllAsComplete) {
+function resolveThroughParent(boundRoot, treatAllAsComplete, childRules) {
   const reach = getRequestParentReach();
   if (reach && !reach.parentReach) return null;
   const ceiling = reach?.topRoot ? path14.resolve(reach.topRoot) : void 0;
@@ -14521,10 +14554,10 @@ function resolveThroughParent(boundRoot, treatAllAsComplete) {
   const scope = chain.join("::");
   const inner = runWithProjectRoot(top, () => {
     invalidateSpecCache();
-    let governing = {};
+    let governing = { rules: stricterSeverities(void 0, childRules) };
     try {
       const config = loadProjectConfig();
-      governing = { rules: config.rules, projectType: config.projectType };
+      governing = { rules: stricterSeverities(config.rules, childRules), projectType: config.projectType };
     } catch {
     }
     return validateSddTree({
@@ -14598,7 +14631,7 @@ function settledStatusBearing(loaded) {
 function validateAsComplete(options) {
   return validateSddTree({ ...options ?? {}, treatAllAsComplete: true });
 }
-var path14, SUBPROJECT_REFERENCE_CODES;
+var path14, RESOLUTION_FAILURE_CODES, SEVERITY_RANK;
 var init_validation = __esm({
   "src/core/validation.ts"() {
     "use strict";
@@ -14614,16 +14647,15 @@ var init_validation = __esm({
     init_fs();
     path14 = __toESM(require("path"));
     init_approval();
-    SUBPROJECT_REFERENCE_CODES = /* @__PURE__ */ new Set([
+    RESOLUTION_FAILURE_CODES = /* @__PURE__ */ new Set([
       "UNDEFINED_TYPE_REFERENCE",
       "INVALID_DEPENDENCY_REFERENCE",
       "INVALID_TARGET_COMPONENT_REFERENCE",
       "INVALID_SUBSYSTEM_REFERENCE",
-      "UNDECLARED_DEPENDENCY_CALL",
       "INVALID_TRUSTED_LINK",
-      "CROSS_SUBSYSTEM_NON_ADAPTER",
       "CROSS_TREE_REF_UNRESOLVED"
     ]);
+    SEVERITY_RANK = { off: 0, warning: 1, error: 2 };
   }
 });
 
@@ -15197,6 +15229,20 @@ function qualifyId(id, prefix, rootSubsystems) {
   }
   return prefix ? `${prefix}::${id}` : id;
 }
+function qualifyDeclaredId(id, prefix, mountRealization = false) {
+  if (!id || !prefix) return id;
+  if (id.startsWith("::") || id.startsWith("super::")) {
+    return qualifyId(id, prefix, NO_ROOT_SUBSYSTEMS);
+  }
+  if (mountRealization && id === prefix.split("::").pop()) {
+    return prefix;
+  }
+  return `${prefix}::${id}`;
+}
+function qualifySubsystemRef(id, prefix, rootSubsystems) {
+  if (prefix && !id.includes("::") && id === prefix.split("::").pop()) return prefix;
+  return qualifyId(id, prefix, rootSubsystems);
+}
 function splitNamespace(qualifiedId) {
   if (!qualifiedId.includes("::")) {
     return { prefix: "", localId: qualifiedId };
@@ -15597,7 +15643,14 @@ function buildProjectGraph(level) {
   return buildGraphModel(level);
 }
 function resolveChainingParent() {
-  return findChainingParent(getProjectRoot());
+  const reach = getRequestParentReach();
+  if (reach && !reach.parentReach) return null;
+  const parent = findChainingParent(getProjectRoot());
+  if (parent && reach?.topRoot) {
+    const fromTop = path15.relative(path15.resolve(reach.topRoot), path15.resolve(parent.parentRoot));
+    if (fromTop === ".." || fromTop.startsWith(`..${path15.sep}`) || path15.isAbsolute(fromTop)) return null;
+  }
+  return parent;
 }
 function computeGateStateId() {
   let gate = {};
@@ -15662,7 +15715,7 @@ function findLegacySpecFiles() {
 function updateSpec(kind, id, delta, hooks) {
   return current().updateSpec(kind, id, delta, hooks);
 }
-var fs9, path15, SIGNATURE_TTL_MS, SpecWorkspace, workspaces;
+var fs9, path15, NO_ROOT_SUBSYSTEMS, SIGNATURE_TTL_MS, SpecWorkspace, workspaces;
 var init_specs2 = __esm({
   "src/core/specs.ts"() {
     "use strict";
@@ -15677,6 +15730,7 @@ var init_specs2 = __esm({
     init_models();
     init_narrative_labels();
     init_diagram();
+    NO_ROOT_SUBSYSTEMS = /* @__PURE__ */ new Set();
     SIGNATURE_TTL_MS = 2e3;
     SpecWorkspace = class {
       constructor(rootDir) {
@@ -15826,7 +15880,7 @@ var init_specs2 = __esm({
           }
         }
         index.subsystems = index.subsystems.map((sub) => {
-          const qualifiedSubId = namespacePrefix ? qualifyId(sub.id, namespacePrefix, this.rootSubsystems) : sub.id;
+          const qualifiedSubId = namespacePrefix ? qualifyDeclaredId(sub.id, namespacePrefix, true) : sub.id;
           const componentPrefix = sub.projectPath ? qualifiedSubId : namespacePrefix;
           return {
             ...sub,
@@ -15845,14 +15899,14 @@ var init_specs2 = __esm({
         const originalSubsystemPaths = index.paths.subsystem;
         index.paths.subsystem = {};
         for (const [k, v] of Object.entries(originalSubsystemPaths)) {
-          const qualifiedK = namespacePrefix ? qualifyId(k, namespacePrefix, this.rootSubsystems) : k;
+          const qualifiedK = namespacePrefix ? qualifyDeclaredId(k, namespacePrefix, true) : k;
           index.paths.subsystem[qualifiedK] = v;
         }
         if (namespacePrefix) {
           index.components = index.components.map((comp) => ({
             ...comp,
-            id: qualifyId(comp.id, namespacePrefix, this.rootSubsystems),
-            subsystem: qualifyId(comp.subsystem, namespacePrefix, this.rootSubsystems),
+            id: qualifyDeclaredId(comp.id, namespacePrefix),
+            subsystem: qualifySubsystemRef(comp.subsystem, namespacePrefix, this.rootSubsystems),
             owns: comp.owns.map((o) => qualifyId(o, namespacePrefix, this.rootSubsystems)),
             dependsOn: comp.dependsOn.map((d) => qualifyId(d, namespacePrefix, this.rootSubsystems)),
             dispatch: comp.dispatch?.map((b) => ({
@@ -15862,12 +15916,12 @@ var init_specs2 = __esm({
           }));
           index.interfaces = index.interfaces.map((intf) => ({
             ...intf,
-            id: qualifyId(intf.id, namespacePrefix, this.rootSubsystems),
+            id: qualifyDeclaredId(intf.id, namespacePrefix),
             component: qualifyId(intf.component, namespacePrefix, this.rootSubsystems)
           }));
           index.implementations = index.implementations.map((impl) => ({
             ...impl,
-            id: qualifyId(impl.id, namespacePrefix, this.rootSubsystems),
+            id: qualifyDeclaredId(impl.id, namespacePrefix),
             contract: qualifyId(impl.contract, namespacePrefix, this.rootSubsystems),
             methods: impl.methods.map((m) => ({
               ...m,
@@ -15879,13 +15933,13 @@ var init_specs2 = __esm({
           }));
           index.types = index.types.map((t) => ({
             ...t,
-            id: qualifyId(t.id, namespacePrefix, this.rootSubsystems),
-            subsystem: t.subsystem ? qualifyId(t.subsystem, namespacePrefix, this.rootSubsystems) : void 0,
+            id: qualifyDeclaredId(t.id, namespacePrefix),
+            subsystem: t.subsystem ? qualifySubsystemRef(t.subsystem, namespacePrefix, this.rootSubsystems) : void 0,
             group: t.group ? qualifyId(t.group, namespacePrefix, this.rootSubsystems) : void 0
           }));
           index.groups = index.groups.map((g) => ({
             ...g,
-            id: qualifyId(g.id, namespacePrefix, this.rootSubsystems)
+            id: qualifyDeclaredId(g.id, namespacePrefix)
           }));
           const originalPaths = index.paths;
           index.paths = {
@@ -15897,19 +15951,19 @@ var init_specs2 = __esm({
             group: {}
           };
           for (const [k, v] of Object.entries(originalPaths.component)) {
-            index.paths.component[qualifyId(k, namespacePrefix, this.rootSubsystems)] = v;
+            index.paths.component[qualifyDeclaredId(k, namespacePrefix)] = v;
           }
           for (const [k, v] of Object.entries(originalPaths.interface)) {
-            index.paths.interface[qualifyId(k, namespacePrefix, this.rootSubsystems)] = v;
+            index.paths.interface[qualifyDeclaredId(k, namespacePrefix)] = v;
           }
           for (const [k, v] of Object.entries(originalPaths.implementation)) {
-            index.paths.implementation[qualifyId(k, namespacePrefix, this.rootSubsystems)] = v;
+            index.paths.implementation[qualifyDeclaredId(k, namespacePrefix)] = v;
           }
           for (const [k, v] of Object.entries(originalPaths.type)) {
-            index.paths.type[qualifyId(k, namespacePrefix, this.rootSubsystems)] = v;
+            index.paths.type[qualifyDeclaredId(k, namespacePrefix)] = v;
           }
           for (const [k, v] of Object.entries(originalPaths.group)) {
-            index.paths.group[qualifyId(k, namespacePrefix, this.rootSubsystems)] = v;
+            index.paths.group[qualifyDeclaredId(k, namespacePrefix)] = v;
           }
         }
         if (currentDepth < maxDepth) {
@@ -21556,7 +21610,7 @@ __export(src_exports, {
   listInstalledPacks: () => listInstalledPacks,
   listMountSnapshots: () => listMountSnapshots,
   listResources: () => listResources,
-  listRules: () => listRules,
+  listRules: () => listRules2,
   listSkillNames: () => listSkillNames,
   listSkillResources: () => listSkillResources,
   listSnapshots: () => listSnapshots,