@zenera/cli 1.1.16 → 1.1.17

package/dist/validate.js

@@ -11,13 +11,43 @@ import { BuildError, ensurePodmanReady } from "./podman.js";
 // Duplicated rather than exported, because a check that agreed with the loader
 // by construction could not report that the two had diverged.
 const CONFIG_NAMES = ['agents.yaml', 'agents.yml', 'agents/agents.yaml', 'agents/agents.yml'];
-const HOUSE_RULES = 'INSTRUCTIONS.md';
+const AGENTS_DIR = 'agents';
+const HOUSE_RULES = 'agents/instructions.md';
+const INSTRUCTIONS_SUFFIX = '-instructions.md';
+const LEGACY_HOUSE_RULES = 'INSTRUCTIONS.md';
 const PROMPTS_DIR = 'agents/prompts';
 const SKILLS_DIR = 'agents/skills';
 const SKILL_FILE = 'SKILL.md';
 const ASSETS_DIR = 'assets';
 /** What `allow:` and `preload:` accept, so a skill outside it cannot be named. */
 const REFERABLE = /^[a-z0-9]+(?:[-_][a-z0-9]+)*$/;
+/**
+ * Mirrors `readHouseRules` in the loader, in the same order: the legacy file
+ * first, then `agents/instructions.md`, then every
+ * `agents/<topic>-instructions.md` by filename.
+ */
+function houseRules(root) {
+    const found = [];
+    const take = (rel) => {
+        if (existsSync(join(root, rel))) {
+            found.push(rel);
+        }
+    };
+    take(LEGACY_HOUSE_RULES);
+    take(HOUSE_RULES);
+    const dir = join(root, AGENTS_DIR);
+    if (!existsSync(dir) || !statSync(dir).isDirectory()) {
+        return found;
+    }
+    const topics = readdirSync(dir, { withFileTypes: true })
+        .filter((entry) => entry.isFile() && entry.name.endsWith(INSTRUCTIONS_SUFFIX))
+        .map((entry) => entry.name)
+        .sort((a, b) => a.localeCompare(b));
+    for (const name of topics) {
+        take(`${AGENTS_DIR}/${name}`);
+    }
+    return found;
+}
 export async function validateProject(opts) {
     const root = resolve(opts.dir);
     const findings = [];
@@ -140,23 +170,38 @@ export async function validateProject(opts) {
     // -----------------------------------------------------------------------
     // Files the config and the conventions name
     // -----------------------------------------------------------------------
-    const hasHouseRules = record(HOUSE_RULES, 'house rules — prepended to every agent prompt', 'file', false);
-    if (!hasHouseRules) {
+    const rules = houseRules(root);
+    for (const rel of rules) {
+        record(rel, 'house rules — prepended to every agent prompt', 'file', false);
+        if (empty(join(root, rel))) {
+            add({
+                severity: 'warning',
+                code: 'house-rules.empty',
+                where: rel,
+                message: `${rel} is empty, so it contributes nothing but a prompt section`,
+                fix: 'write the rules that hold whichever agent is answering, or delete it',
+            });
+        }
+    }
+    if (rules.length === 0) {
+        record(HOUSE_RULES, 'house rules — prepended to every agent prompt', 'file', false);
         add({
             severity: 'note',
             code: 'house-rules.missing',
             where: HOUSE_RULES,
-            message: 'no INSTRUCTIONS.md, which is allowed: every agent then runs on its own role ' +
+            message: 'no house rules, which is allowed: every agent then runs on its own role ' +
                 'prompt alone, with nothing shared between them',
         });
     }
-    else if (empty(join(root, HOUSE_RULES))) {
+    if (rules.includes(LEGACY_HOUSE_RULES)) {
         add({
             severity: 'warning',
-            code: 'house-rules.empty',
-            where: HOUSE_RULES,
-            message: 'INSTRUCTIONS.md is empty, so it contributes nothing but a prompt section',
-            fix: 'write the rules that hold regardless of which agent is answering, or delete it',
+            code: 'house-rules.legacy',
+            where: LEGACY_HOUSE_RULES,
+            message: `${LEGACY_HOUSE_RULES} is where the house rules used to live. It is still ` +
+                `read, and still first, but the layout now keeps them under ${AGENTS_DIR}/ ` +
+                'so a project can have more than one of them',
+            fix: `move it to ${HOUSE_RULES}, or fold it into the ${AGENTS_DIR}/*${INSTRUCTIONS_SUFFIX} files already there`,
         });
     }
     // -----------------------------------------------------------------------
@@ -400,14 +445,11 @@ export function availableTools(root, config) {
 }
 function checkAgent(root, config, spec, entry, available, record, add) {
     const where = `agents.${spec.name}`;
-    const instructions = [];
-    if (existsSync(join(root, HOUSE_RULES))) {
-        instructions.push(HOUSE_RULES);
-    }
+    const instructions = [...houseRules(root)];
     // The role prompt: named by `system:`, or found by convention. A named one
     // that is not there is an error — the loader says so too. An absent
     // conventional one is not, because a project may keep everything it has to
-    // say in INSTRUCTIONS.md.
+    // say in its house rules.
     if (spec.system) {
         const rel = normalise(root, spec.system);
         const outside = rel === undefined;
@@ -457,7 +499,7 @@ function checkAgent(root, config, spec, entry, available, record, add) {
             severity: 'warning',
             code: 'agent.no-instructions',
             where,
-            message: 'this agent has no prompt at all — no INSTRUCTIONS.md and no role file — so ' +
+            message: 'this agent has no prompt at all — no house rules and no role file — so ' +
                 'it runs on the tool descriptions alone',
             fix: `write ${join(PROMPTS_DIR, `${spec.name}.md`)}, or name one with \`system:\``,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenera/cli",
-    "version": "1.1.16",
+    "version": "1.1.17",
     "description": "Command-line front end for @zenera/neo: agentic projects you can run, share and commit.",
     "keywords": [
         "agents",
@@ -51,7 +51,7 @@
         "@inkjs/ui": "^2.0.0",
         "ink": "^7.1.1",
         "react": "^19.2.8",
-        "@zenera/neo": "^1.1.16",
+        "@zenera/neo": "^1.1.17",
         "@anthropic-ai/sdk": "^0.120.0",
         "@google/genai": "^2.18.0",
         "@openrouter/sdk": "^1.2.80",