eminiar 0.13.4 → 0.13.5

package/dist/{hook-chunk-6EFFDI3S.js → hook-chunk-RE4WT5D3.js}

@@ -3176,9 +3176,9 @@ var require_micromatch = __commonJS({
       const index = v.indexOf("{");
       return index > -1 && v.indexOf("}", index) > -1;
     };
-    var micromatch = (list, patterns, options) => {
+    var micromatch = (list2, patterns, options) => {
       patterns = [].concat(patterns);
-      list = [].concat(list);
+      list2 = [].concat(list2);
       let omit = /* @__PURE__ */ new Set();
       let keep = /* @__PURE__ */ new Set();
       let items = /* @__PURE__ */ new Set();
@@ -3193,7 +3193,7 @@ var require_micromatch = __commonJS({
         let isMatch = picomatch(String(patterns[i]), { ...options, onResult }, true);
         let negated = isMatch.state.negated || isMatch.state.negatedExtglob;
         if (negated) negatives++;
-        for (let item of list) {
+        for (let item of list2) {
           let matched = isMatch(item, true);
           let match = negated ? !matched.isMatch : matched.isMatch;
           if (!match) continue;
@@ -3221,7 +3221,7 @@ var require_micromatch = __commonJS({
     micromatch.matcher = (pattern, options) => picomatch(pattern, options);
     micromatch.isMatch = (str2, patterns, options) => picomatch(patterns, options)(str2);
     micromatch.any = micromatch.isMatch;
-    micromatch.not = (list, patterns, options = {}) => {
+    micromatch.not = (list2, patterns, options = {}) => {
       patterns = [].concat(patterns).map(String);
       let result = /* @__PURE__ */ new Set();
       let items = [];
@@ -3229,7 +3229,7 @@ var require_micromatch = __commonJS({
         if (options.onResult) options.onResult(state);
         items.push(state.output);
       };
-      let matches = new Set(micromatch(list, patterns, { ...options, onResult }));
+      let matches = new Set(micromatch(list2, patterns, { ...options, onResult }));
       for (let item of items) {
         if (!matches.has(item)) {
           result.add(item);
@@ -3263,8 +3263,8 @@ var require_micromatch = __commonJS({
       for (let key of keys) res[key] = obj[key];
       return res;
     };
-    micromatch.some = (list, patterns, options) => {
-      let items = [].concat(list);
+    micromatch.some = (list2, patterns, options) => {
+      let items = [].concat(list2);
       for (let pattern of [].concat(patterns)) {
         let isMatch = picomatch(String(pattern), options);
         if (items.some((item) => isMatch(item))) {
@@ -3273,8 +3273,8 @@ var require_micromatch = __commonJS({
       }
       return false;
     };
-    micromatch.every = (list, patterns, options) => {
-      let items = [].concat(list);
+    micromatch.every = (list2, patterns, options) => {
+      let items = [].concat(list2);
       for (let pattern of [].concat(patterns)) {
         let isMatch = picomatch(String(pattern), options);
         if (!items.every((item) => isMatch(item))) {
@@ -6254,6 +6254,70 @@ function existingGenerated(dir) {
   }
   return out;
 }
+function ignoredWhere(ignored, config, agentType) {
+  const hit = config.swarms.flatMap(
+    (swarm) => swarm.roles.filter((r) => r.agentType === agentType).map((r) => ({ swarm, role: r }))
+  )[0];
+  if (!hit) return [];
+  const out = [];
+  for (const i of ignored) {
+    const seg = i.path === "" ? [] : i.path.split(".");
+    const name = /"(.+?)"/.exec(i.message)?.[1] ?? "?";
+    const mine = seg[0] !== "swarms" || seg.length < 2 || seg[1] === hit.swarm.name && (seg.length < 4 || seg[2] !== "agents" || seg[3] === hit.role.role);
+    if (mine) out.push(name);
+  }
+  return out;
+}
+var list = (v) => typeof v === "string" ? v.split(",").map((x) => x.trim()).filter(Boolean) : [];
+function frontmatterOf(raw) {
+  const content = raw.replace(/\r\n/g, "\n");
+  const end = content.indexOf("\n---\n", 3);
+  if (!content.startsWith("---\n") || end === -1) return void 0;
+  try {
+    const v = yaml().parse(content.slice(4, end));
+    return v && typeof v === "object" ? v : void 0;
+  } catch {
+    return void 0;
+  }
+}
+var NEUTRAL_KEYS = /* @__PURE__ */ new Set(["name", "description", "skills", "color", "model", "effort"]);
+function tightens(oldRaw, newRaw) {
+  const o = frontmatterOf(oldRaw);
+  const n = frontmatterOf(newRaw);
+  if (!o || !n) return false;
+  let tighter = false;
+  for (const k of Object.keys(o)) {
+    if (NEUTRAL_KEYS.has(k)) continue;
+    if (!(k in n)) return false;
+    const a = o[k];
+    const b = n[k];
+    if (JSON.stringify(a) === JSON.stringify(b)) continue;
+    if (k === "tools") {
+      const ob = new Set(list(a));
+      const nb = list(b);
+      if (!nb.every((t) => ob.has(t))) return false;
+      tighter = true;
+    } else if (k === "disallowedTools") {
+      const nb = new Set(list(b));
+      if (!list(a).every((t) => nb.has(t))) return false;
+      tighter = true;
+    } else if (k === "hooks") {
+      const oh = a ?? {};
+      const nh = b ?? {};
+      for (const [ev, entries] of Object.entries(oh)) {
+        const have = new Set((nh[ev] ?? []).map((e) => JSON.stringify(e)));
+        if (!Array.isArray(entries) || !entries.every((e) => have.has(JSON.stringify(e))))
+          return false;
+      }
+      tighter = true;
+    } else if (k === "maxTurns") {
+      if (typeof a !== "number" || typeof b !== "number" || b > a) return false;
+      tighter = true;
+    } else return false;
+  }
+  for (const k of Object.keys(n)) if (!(k in o) && !NEUTRAL_KEYS.has(k)) tighter = true;
+  return tighter;
+}
 function planAgentSync(root, config, opts = {}) {
   const dir = agentsDir(root);
   const wantedRoles = config?.enabled ? config.swarms.flatMap((swarm) => swarm.roles.map((role) => ({ swarm, role }))) : [];
@@ -6321,6 +6385,24 @@ function planAgentSync(root, config, opts = {}) {
           reason: config?.enabled ? "no longer in the swarm file" : "swarms are disabled"
         }
       );
+  const ignored = config?.ignoredKeys ?? [];
+  if (ignored.length && !opts.force) {
+    const holds = (agentType) => ignoredWhere(ignored, config, agentType);
+    return actions.map((a) => {
+      if (a.action !== "update") return a;
+      const where = holds(a.agentType);
+      if (!where.length) return a;
+      const old = generated.get(a.agentType);
+      if (old && tightens(old.content, a.content ?? "")) return a;
+      return {
+        agentType: a.agentType,
+        path: a.path,
+        action: "conflict",
+        held: true,
+        reason: `kept: ${config.rel} has keys this eminiar version does not know (${where.slice(0, 3).join(", ")}${where.length > 3 ? ", ..." : ""}), and a newer one may have generated this file with them; update eminiar, or sync with --force`
+      };
+    });
+  }
   return actions;
 }
 function syncAgents(root, config, opts = {}) {
@@ -7932,15 +8014,6 @@ var NAME_MSG = "use 1-32 characters: lowercase letters and digits in words joine
 var noFence = (s) => !s.includes("---");
 var FENCE_MSG = 'must not contain "---" (Claude Code would end the agent frontmatter there)';
 var MODEL_RE = /^(?:inherit|opusplan|(?:sonnet|opus|haiku|fable)(?:\[1m\])?|(?:[a-z0-9-]+\.)*claude-[a-z0-9.:@-]+(?:\[1m\])?)$/;
-var TOP_KEYS = /* @__PURE__ */ new Set([
-  "version",
-  "enabled",
-  "sync",
-  "enforce",
-  "allowed_agents",
-  "defaults",
-  "swarms"
-]);
 var DEFAULT_CONTEXT = {
   memories: 4,
   docs: 2,
@@ -7969,7 +8042,7 @@ var SkillName = external_exports.string().regex(
 ).refine(noFence, FENCE_MSG);
 var Model = external_exports.string().max(100).regex(MODEL_RE, "a model alias (inherit, sonnet, opus, haiku, fable) or a Claude model id").refine(noFence, FENCE_MSG);
 var rank = (t) => TIERS.indexOf(t);
-var RawModelRange = external_exports.strictObject({ floor: external_exports.enum(TIERS).optional(), ceiling: external_exports.enum(TIERS).optional() }).refine(
+var RawModelRange = external_exports.object({ floor: external_exports.enum(TIERS).optional(), ceiling: external_exports.enum(TIERS).optional() }).refine(
   (r) => !r.floor || !r.ceiling || rank(r.floor) <= rank(r.ceiling),
   `floor must not be above ceiling (${TIERS.join(" < ")})`
 );
@@ -7993,7 +8066,7 @@ var AgentName = external_exports.string().trim().regex(
   (n) => !n.startsWith("swarm-"),
   "swarm workers need no entry: they are allowed during a run of their swarm"
 );
-var RawContext = external_exports.strictObject({
+var RawContext = external_exports.object({
   memories: external_exports.number().int().min(0).max(10).optional(),
   docs: external_exports.number().int().min(0).max(10).optional(),
   history: external_exports.boolean().optional(),
@@ -8002,12 +8075,12 @@ var RawContext = external_exports.strictObject({
   // SubagentStart context over 10,000 characters is moved to a file Claude may never read.
   max_chars: external_exports.number().int().min(500).max(9e3).optional()
 });
-var RawHookCommand = external_exports.strictObject({
+var RawHookCommand = external_exports.object({
   type: external_exports.literal("command"),
   command: external_exports.string().trim().min(1).max(2e3).refine(noFence, FENCE_MSG),
   timeout: external_exports.number().int().positive().max(600).optional()
 });
-var RawHookMatcher = external_exports.strictObject({
+var RawHookMatcher = external_exports.object({
   matcher: external_exports.string().max(200).refine(noFence, FENCE_MSG).refine((m) => {
     try {
       new RegExp(m);
@@ -8018,12 +8091,12 @@ var RawHookMatcher = external_exports.strictObject({
   }, "not a valid regular expression (Claude Code matches tool names with it)").optional(),
   hooks: external_exports.array(RawHookCommand).min(1).max(10)
 });
-var RawHooks = external_exports.strictObject({
+var RawHooks = external_exports.object({
   PreToolUse: external_exports.array(RawHookMatcher).max(10).optional(),
   PostToolUse: external_exports.array(RawHookMatcher).max(10).optional(),
   Stop: external_exports.array(RawHookMatcher).max(10).optional()
 });
-var RawAgent = external_exports.strictObject({
+var RawAgent = external_exports.object({
   description: external_exports.string().trim().min(1).max(500).refine(noFence, FENCE_MSG),
   prompt: external_exports.string().max(2e4).optional(),
   model: Model.optional(),
@@ -8041,7 +8114,7 @@ var RawAgent = external_exports.strictObject({
   color: external_exports.enum(AGENT_COLORS).optional(),
   context: RawContext.optional()
 });
-var RawSwarm = external_exports.strictObject({
+var RawSwarm = external_exports.object({
   description: external_exports.string().trim().min(1).max(500),
   topology: external_exports.enum(TOPOLOGIES).optional(),
   max_agents: external_exports.number().int().min(1).max(16).optional(),
@@ -8057,7 +8130,7 @@ var RawFile = external_exports.looseObject({
   sync: external_exports.enum(["auto", "manual"]).optional(),
   enforce: external_exports.boolean().optional(),
   allowed_agents: external_exports.array(AgentName).max(50).optional(),
-  defaults: external_exports.strictObject({
+  defaults: external_exports.object({
     model: Model.optional(),
     model_range: RawModelRange.optional(),
     skills: external_exports.array(SkillName).max(20).optional(),
@@ -8082,6 +8155,53 @@ function mergeContext(...layers) {
   return out;
 }
 var uniq = (xs) => [...new Set(xs)];
+function unknownKeys(v, s = RawFile, at = []) {
+  if (s instanceof external_exports.ZodOptional) s = s.unwrap();
+  if (Array.isArray(v))
+    return s instanceof external_exports.ZodArray ? v.flatMap((x, i) => unknownKeys(x, s.element, [...at, String(i)])) : [];
+  if (!v || typeof v !== "object") return [];
+  const entries = Object.entries(v);
+  if (s instanceof external_exports.ZodRecord)
+    return entries.flatMap(([k, x]) => unknownKeys(x, s.valueType, [...at, k]));
+  if (!(s instanceof external_exports.ZodObject)) return [];
+  const known = Object.keys(s.shape);
+  return entries.flatMap(
+    ([k, x]) => Object.hasOwn(s.shape, k) ? unknownKeys(x, s.shape[k], [...at, k]) : at.length === 0 && (k.startsWith("x-") || k === "<<") ? [] : [{ at, key: k, known }]
+  );
+}
+function schemaKeys(s = RawFile, out = /* @__PURE__ */ new Set()) {
+  if (s instanceof external_exports.ZodOptional) s = s.unwrap();
+  if (s instanceof external_exports.ZodArray) schemaKeys(s.element, out);
+  else if (s instanceof external_exports.ZodRecord) schemaKeys(s.valueType, out);
+  else if (s instanceof external_exports.ZodObject) {
+    for (const [k, v] of Object.entries(s.shape))
+      if (!out.has(k)) {
+        out.add(k);
+        schemaKeys(v, out);
+      }
+  }
+  return out;
+}
+var RESTRICTION_KEY = /tool|scope|hook|allow|deny|permission|model|effort|count/i;
+function restrictionLike(key, known) {
+  let best;
+  for (const k of known) {
+    if (!RESTRICTION_KEY.test(k)) continue;
+    const d = editDistance(key.toLowerCase(), k.toLowerCase(), 2);
+    if (d <= 2 && key.length >= 3 && (!best || d < best.d)) best = { k, d };
+  }
+  if (best) return best.k;
+  return RESTRICTION_KEY.test(key) ? "" : void 0;
+}
+function typoOf(key, known) {
+  const max = key.length >= 7 ? 2 : 1;
+  let best;
+  for (const k of known) {
+    const d = editDistance(key.toLowerCase(), k.toLowerCase(), max);
+    if (d <= max && (!best || d < best.d)) best = { k, d };
+  }
+  return best?.k;
+}
 function roleRange(defaults, a, at, issue) {
   const spec = a.model_range ?? defaults?.model_range;
   if (!spec || !spec.floor && !spec.ceiling) return void 0;
@@ -8217,6 +8337,27 @@ function parseSwarmYaml(text, file, rel) {
         for (const role of Object.keys(agents))
           checkName(["swarms", name, "agents", role], role, "agent");
     }
+  const ignoredKeys = [];
+  const allKeys = schemaKeys();
+  for (const u of unknownKeys(js)) {
+    const near = typoOf(u.key, u.known);
+    const found = { path: u.at.join("."), line: lineOf([...u.at, u.key]) };
+    if (allKeys.has(u.key))
+      issues.push({ ...found, message: `unknown key "${u.key}": not allowed here` });
+    else if (near)
+      issues.push({ ...found, message: `unknown key "${u.key}" (did you mean "${near}"?)` });
+    else if (u.at.length === 4 && u.at[0] === "swarms" && u.at[2] === "agents" && restrictionLike(u.key, u.known) !== void 0) {
+      const like = restrictionLike(u.key, u.known);
+      issues.push({
+        ...found,
+        message: `unknown key "${u.key}" looks like a restriction${like ? ` (did you mean "${like}"?)` : ""}: ignoring it would silently drop a limit`
+      });
+    } else
+      ignoredKeys.push({
+        ...found,
+        message: `unknown key "${u.key}" ignored: not a setting in this eminiar version`
+      });
+  }
   const parsed = RawFile.safeParse(js);
   if (!parsed.success) {
     return {
@@ -8234,15 +8375,9 @@ function parseSwarmYaml(text, file, rel) {
       ]
     };
   }
-  for (const k of Object.keys(js))
-    if (!TOP_KEYS.has(k) && !k.startsWith("x-") && k !== "<<")
-      issue(
-        [k],
-        `unknown key "${k}" (top-level keys: ${[...TOP_KEYS].join(", ")}; x-* keys may hold YAML anchors)`
-      );
   const config = resolve2(parsed.data, file, rel, issue);
   if (issues.length) return { state: "invalid", file, rel, enforce, issues };
-  return { state: "ok", config };
+  return { state: "ok", config: { ...config, ignoredKeys } };
 }
 function resolve2(raw, file, rel, issue) {
   const swarms = [];
@@ -9646,9 +9781,17 @@ function sessionStartAt(ctx, sessionId) {
       out.push(
         config.sync === "auto" ? `Agent files were regenerated (${sync.changed} changed); if Claude Code does not list them yet, run /agents or restart.` : `${sync.changed} agent file(s) are out of date (sync: manual); run \`eminiar swarm sync\`.`
       );
-    if (sync.conflicts)
+    const held = sync.actions.filter((a) => a.held).length;
+    if (config.ignoredKeys.length)
+      out.push(
+        clip2(
+          `${config.rel}: ${config.ignoredKeys.length} unknown key(s) ignored (first: ${issueWhere(config.ignoredKeys)}); generated agent files of the roles those keys belong to are not rewritten unless an update only tightens them (\`eminiar swarm sync --force\` does). \`eminiar swarm validate\` lists the keys.`,
+          400
+        )
+      );
+    if (sync.conflicts > held)
       out.push(
-        `${sync.conflicts} agent file(s) in .claude/agents were left alone (hand-written, or generated and then edited); \`eminiar swarm sync --dry-run\` explains.`
+        `${sync.conflicts - held} agent file(s) in .claude/agents were left alone (hand-written, or generated and then edited); \`eminiar swarm sync --dry-run\` explains.`
       );
     const mctx = main === local ? ctx : getContext(main);
     const db = getStorage(mctx, { vectors: false });
@@ -9898,4 +10041,4 @@ queue-microtask/index.js:
 run-parallel/index.js:
   (*! run-parallel. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> *)
 */
-//# sourceMappingURL=hook-chunk-6EFFDI3S.js.map
+//# sourceMappingURL=hook-chunk-RE4WT5D3.js.map

package/dist/{hook-hooks-YGXLOZ6H.js → hook-hooks-5H6LFYD5.js}

@@ -8,7 +8,7 @@ import {
   manifestPath,
   readManifestAt,
   resolvePrice
-} from "./hook-chunk-6EFFDI3S.js";
+} from "./hook-chunk-RE4WT5D3.js";
 import {
   adjudicateOne,
   briefUnitsOf,
@@ -1826,4 +1826,4 @@ export {
   withModel,
   withNote
 };
-//# sourceMappingURL=hook-hooks-YGXLOZ6H.js.map
+//# sourceMappingURL=hook-hooks-5H6LFYD5.js.map

package/dist/hook.js

@@ -35,7 +35,7 @@ import {
   swarmSubagentStop,
   swarmTouch,
   workerLacksTool
-} from "./hook-chunk-6EFFDI3S.js";
+} from "./hook-chunk-RE4WT5D3.js";
 import {
   GUIDE_ORDER,
   classifyAssistant,
@@ -1902,7 +1902,7 @@ var userPromptSubmit = async (input) => {
   let systemMessage;
   if (ctx.config.adjudicator.enabled && input.client !== "cursor" && hasBudget(ADJUDICATOR_NEEDS_MS)) {
     try {
-      const { onPrompt } = await import("./hook-hooks-YGXLOZ6H.js");
+      const { onPrompt } = await import("./hook-hooks-5H6LFYD5.js");
       const a = await onPrompt(ctx, db, input, sessionId);
       if (a?.context) parts.push(a.context);
       systemMessage = a?.systemMessage;
@@ -1960,7 +1960,7 @@ var postToolUse = async (input) => {
     const ctx = sessionContext(input.cwd);
     if (ctx.config.adjudicator.enabled) {
       try {
-        const { onPostAgent } = await import("./hook-hooks-YGXLOZ6H.js");
+        const { onPostAgent } = await import("./hook-hooks-5H6LFYD5.js");
         onPostAgent(ctx, db, input);
       } catch {
       }
@@ -2065,7 +2065,7 @@ var sessionEnd = async (input) => {
   ingestUsage(db, input, sessionId);
   if (ctx.config.adjudicator.enabled && input.client !== "cursor") {
     try {
-      const { onSessionEnd } = await import("./hook-hooks-YGXLOZ6H.js");
+      const { onSessionEnd } = await import("./hook-hooks-5H6LFYD5.js");
       onSessionEnd(ctx, db, input);
     } catch {
     }
@@ -3582,7 +3582,7 @@ var preToolUse = async (input) => {
   const out = await route(ctx, input, spawn?.kind === "worker");
   if (!ctx.config.adjudicator.enabled || input.client === "cursor") return out;
   try {
-    const { afterRouting } = await import("./hook-hooks-YGXLOZ6H.js");
+    const { afterRouting } = await import("./hook-hooks-5H6LFYD5.js");
     return await afterRouting(ctx, input, spawn, out);
   } catch {
     return out;
@@ -3822,7 +3822,7 @@ ${guide}`);
   if (swarm) parts.push(swarm);
   if (ctx.config.adjudicator.enabled && input.client !== "cursor") {
     try {
-      const { onSessionStart } = await import("./hook-hooks-YGXLOZ6H.js");
+      const { onSessionStart } = await import("./hook-hooks-5H6LFYD5.js");
       const line2 = onSessionStart(ctx, db, input);
       if (line2) parts.push(line2);
     } catch {