eminiar 0.13.0 → 0.13.1

package/dist/server.js

@@ -10691,8 +10691,8 @@ var require_pattern2 = __commonJS({
     }
     exports.endsWithSlashGlobStar = endsWithSlashGlobStar;
     function isAffectDepthOfReadingPattern(pattern2) {
-      const basename8 = path3.basename(pattern2);
-      return endsWithSlashGlobStar(pattern2) || isStaticPattern(basename8);
+      const basename9 = path3.basename(pattern2);
+      return endsWithSlashGlobStar(pattern2) || isStaticPattern(basename9);
     }
     exports.isAffectDepthOfReadingPattern = isAffectDepthOfReadingPattern;
     function expandPatternsWithBraceExpansion(patterns) {
@@ -11176,11 +11176,11 @@ var require_out = __commonJS({
       async.read(path3, getSettings(optionsOrSettingsOrCallback), callback);
     }
     exports.stat = stat;
-    function statSync18(path3, optionsOrSettings) {
+    function statSync19(path3, optionsOrSettings) {
       const settings = getSettings(optionsOrSettings);
       return sync.read(path3, settings);
     }
-    exports.statSync = statSync18;
+    exports.statSync = statSync19;
     function getSettings(settingsOrOptions = {}) {
       if (settingsOrOptions instanceof settings_1.default) {
         return settingsOrOptions;
@@ -42768,6 +42768,12 @@ import { join } from "path";
 function eminiarHome() {
   return process.env.EMINIAR_HOME || join(homedir(), ".eminiar");
 }
+function claudeConfigDir(env = process.env, home = homedir()) {
+  return env.CLAUDE_CONFIG_DIR?.trim() || join(home, ".claude");
+}
+function claudePluginsDir(env = process.env, home = homedir()) {
+  return env.CLAUDE_CODE_PLUGIN_CACHE_DIR?.trim() || join(claudeConfigDir(env, home), "plugins");
+}
 function paths() {
   const home = eminiarHome();
   return {
@@ -42871,9 +42877,9 @@ var buildAdjudicatorObject = () => external_exports.object({
   }).prefault({}),
   minPromptChars: external_exports.number().int().min(0).default(12),
   /**
-   * Ordered ladder, smallest first; "fable" may be inserted by the user. Every provider request
-   * carries the whole ladder and a committed project file may set it, so it is bounded: each
-   * tier at most once (task #56).
+   * Ordered ladder, smallest first; "fable" may be inserted by the user. Personal config only
+   * (a committed project file cannot set it). Every provider request carries the whole ladder,
+   * so it is bounded: each tier at most once (task #56).
    */
   tiers: external_exports.array(external_exports.enum(TIERS)).min(1).max(TIERS.length).refine((t) => new Set(t).size === t.length, "adjudicator.tiers must not repeat a tier").meta({ uniqueItems: true }).default(["haiku", "sonnet", "opus"]),
   weights: external_exports.object({
@@ -43223,22 +43229,22 @@ function envOverrides() {
 }
 var PROJECT_ADJUDICATOR_KEYS = [
   "enabled",
-  "mode",
   "surfaces",
   "promptMode",
   "minPromptChars",
-  "tiers",
   "weights",
-  "apply",
   "advice",
   "embedding",
   "learning",
   "cache"
 ];
+function projectKeeps(adj, k) {
+  return PROJECT_ADJUDICATOR_KEYS.includes(k) || k === "mode" && adj.mode === "advise";
+}
 function droppedProjectAdjudicatorKeys(raw) {
   const adj = raw.adjudicator;
   if (!isPlainObject3(adj)) return [];
-  return Object.keys(adj).filter((k) => !PROJECT_ADJUDICATOR_KEYS.includes(k)).sort();
+  return Object.keys(adj).filter((k) => !projectKeeps(adj, k)).sort();
 }
 function projectAdjudicatorWarning(projectRoot) {
   const lines = [];
@@ -43385,7 +43391,7 @@ function projectLayer(raw) {
   if (!isPlainObject3(adj)) return raw;
   if (findSecretFields(adj).length) return raw;
   const kept = {};
-  for (const k of PROJECT_ADJUDICATOR_KEYS) if (Object.hasOwn(adj, k)) kept[k] = adj[k];
+  for (const k of Object.keys(adj)) if (projectKeeps(adj, k)) kept[k] = adj[k];
   return { ...ownJson(raw), adjudicator: kept };
 }
 function withoutUnsafeDocsManifest(raw, source) {
@@ -51595,7 +51601,7 @@ function usageWhere(f, opts = {}) {
 var SqliteAdapter = class _SqliteAdapter {
   constructor(path3, opts = {}) {
     this.path = path3;
-    this.db = new Database(path3, { timeout: 2e3 });
+    this.db = new Database(path3, { timeout: opts.busyTimeoutMs ?? 2e3 });
     this.swarm = new SqliteSwarmStore(this.db);
     this.adjudicator = new SqliteAdjudicatorStore(this.db);
     this.db.pragma("journal_mode = WAL");
@@ -52809,13 +52815,15 @@ var SqliteAdapter = class _SqliteAdapter {
 
 // src/storage/index.ts
 var open2 = /* @__PURE__ */ new Map();
+var busyTimeoutMs;
 function getStorage(ctx, opts = {}) {
   const key = `${ctx.dbPath}|${opts.vectors === false ? "novec" : "vec"}`;
   let adapter = open2.get(key);
   if (!adapter) {
     adapter = new SqliteAdapter(ctx.dbPath, {
       dims: ctx.config.embeddings.dims,
-      vectors: opts.vectors ?? true
+      vectors: opts.vectors ?? true,
+      ...busyTimeoutMs === void 0 ? {} : { busyTimeoutMs }
     });
     open2.set(key, adapter);
   }
@@ -58186,6 +58194,14 @@ function yaml() {
   yamlLib ??= createRequire(import.meta.url)("yaml");
   return yamlLib;
 }
+var EXEC_TOOLS = /* @__PURE__ */ new Set([
+  "em_execute",
+  "em_execute_file",
+  "em_batch_execute"
+]);
+function roleHasShell(role) {
+  return (role.tools?.includes("Bash") ?? true) && !role.disallowedTools?.includes("Bash");
+}
 var EM_MCP_PREFIXES = ["mcp__plugin_eminiar_eminiar__", "mcp__eminiar__"];
 var AGENTS_REL = ".claude/agents";
 function agentsDir(root) {
@@ -58199,21 +58215,26 @@ var TOPOLOGY_RULE = {
   mesh: "peers share one task board. Claim any open task (your role's first), and read the blackboard for what the other workers found.",
   pipeline: "work moves in stages. You can claim a task only once every task of the earlier stages is done."
 };
-function workerTools(tools2) {
+function workerTools(tools2, shell = tools2.includes("Bash")) {
   const out = tools2.includes("ToolSearch") ? [...tools2] : [...tools2, "ToolSearch"];
   for (const prefix of EM_MCP_PREFIXES)
-    for (const t of WORKER_EM_TOOLS) if (!out.includes(prefix + t)) out.push(prefix + t);
+    for (const t of WORKER_EM_TOOLS)
+      if ((shell || !EXEC_TOOLS.has(t)) && !out.includes(prefix + t)) out.push(prefix + t);
   return out;
 }
+var execToolNames = () => EM_MCP_PREFIXES.flatMap((prefix) => [...EXEC_TOOLS].map((t) => prefix + t));
 function frontmatter(swarm, role) {
   const fm = {
     name: role.agentType,
     description: `Worker "${role.role}" of the eminiar swarm "${swarm.name}": ${role.description} Spawn it for a task of this swarm and name the task as "task #N" in the prompt; the em-swarm skill coordinates runs.`
   };
   if (role.model) fm.model = role.model;
-  if (role.tools) fm.tools = workerTools(role.tools).join(", ");
+  if (role.tools) fm.tools = workerTools(role.tools, roleHasShell(role)).join(", ");
   const spawns = role.tools?.some((t) => t === "Agent" || t === "Task");
-  const disallowed = [.../* @__PURE__ */ new Set([...role.disallowedTools ?? [], ...spawns ? [] : ["Agent"]])];
+  const noShell = role.disallowedTools?.includes("Bash") ? execToolNames() : [];
+  const disallowed = [
+    .../* @__PURE__ */ new Set([...role.disallowedTools ?? [], ...spawns ? [] : ["Agent"], ...noShell])
+  ];
   if (disallowed.length) fm.disallowedTools = disallowed.join(", ");
   if (role.skills.length) fm.skills = role.skills;
   if (role.hooks) {
@@ -58232,6 +58253,7 @@ var hashOf = (fm, rest, range) => createHash8("sha1").update(range ? `range=${ra
 ${fm}
 ${rest}` : `${fm}
 ${rest}`).digest("hex").slice(0, 12);
+var SHARED_TREE_RULE = "Other workers may be editing this working tree at the same time, and their changes are not committed. Never run `git stash`, `git checkout`, `git switch`, `git reset`, `git restore` or `git clean`, not even on one path: they hide or wipe another worker's work. If you commit, add only the files you changed: `git add -A` or `git commit -a` takes their unfinished work with yours. To test without your change (a mutation check), copy the files into a scratch directory outside the tree and run the tests there.";
 function renderAgentFile(config2, swarm, role) {
   const fm = yaml().stringify(frontmatter(swarm, role), { lineWidth: 0 }).trimEnd();
   if (fm.includes("---"))
@@ -58245,12 +58267,15 @@ function renderAgentFile(config2, swarm, role) {
     ...role.prompt ? [role.prompt, ""] : [],
     "## Swarm protocol",
     "",
-    '1. eminiar starts you with a swarm brief: the run goal, the open tasks, the shared notes and what the project knows (memories, history, structure). First claim the task your prompt names with `em_swarm {action:"claim", task:N}` (or the next open one with `em_swarm {action:"claim"}`); if the brief says you already hold a task, continue it.',
-    '2. Ask eminiar before acting: `em_recall {query}` for decisions and constraints, `em_history {action:"file", path}` before editing a file, `em_graph_impact {node}` before changing a symbol, `em_symbols` / `em_search` instead of grepping.',
-    '3. Share what other workers need with `em_swarm {action:"post", key, value}` and read theirs with `em_swarm {action:"read"}`.',
-    '4. Close every task with `em_swarm {action:"update", task, status, result}`: status `done`, `failed` or `blocked`; the result says what changed and how you verified it.',
-    "5. Record durable decisions with `em_remember` so later sessions know them.",
-    "6. Your final message goes back to the coordinator: lead with the outcome, then the files you changed and anything left open.",
+    ...[
+      'eminiar starts you with a swarm brief: the run goal, the open tasks, the shared notes and what the project knows (memories, history, structure). First claim the task your prompt names with `em_swarm {action:"claim", task:N}` (or the next open one with `em_swarm {action:"claim"}`); if the brief says you already hold a task, continue it.',
+      'Ask eminiar before acting: `em_recall {query}` for decisions and constraints, `em_history {action:"file", path}` before editing a file, `em_graph_impact {node}` before changing a symbol, `em_symbols` / `em_search` instead of grepping.',
+      ...!role.isolation && roleHasShell(role) ? [SHARED_TREE_RULE] : [],
+      'Share what other workers need with `em_swarm {action:"post", key, value}` and read theirs with `em_swarm {action:"read"}`.',
+      'Close every task with `em_swarm {action:"update", task, status, result}`: status `done`, `failed` or `blocked`; the result says what changed and how you verified it.',
+      "Record durable decisions with `em_remember` so later sessions know them.",
+      "Your final message goes back to the coordinator: lead with the outcome, then the files you changed and anything left open."
+    ].map((step, i) => `${i + 1}. ${step}`),
     ""
   ].join("\n");
   const range = role.range ? modelRangeText(role.range) : void 0;
@@ -58615,7 +58640,7 @@ function projectDirs(root, cwd) {
 }
 function pluginDirs(plugin, env, home) {
   const out = /* @__PURE__ */ new Set();
-  const pluginsRoot = env.CLAUDE_CODE_PLUGIN_CACHE_DIR?.trim() || join15(home, ".claude", "plugins");
+  const pluginsRoot = claudePluginsDir(env, home);
   try {
     const j = JSON.parse(readFileSync12(join15(pluginsRoot, "installed_plugins.json"), "utf8"));
     for (const [key, val] of Object.entries(j?.plugins ?? {})) {
@@ -58716,7 +58741,7 @@ function resolveAgentPin(agentType, q) {
     const scopes = [];
     if (managed) scopes.push(["managed", join15(managed, ".claude", "agents")]);
     for (const d of projectDirs(q.root, q.cwd)) scopes.push(["project", d]);
-    scopes.push(["user", join15(home, ".claude", "agents")]);
+    scopes.push(["user", join15(claudeConfigDir(env, home), "agents")]);
     let truncated = false;
     for (const [source, dir] of scopes) {
       const found = byName(dir, agentType);
@@ -60915,7 +60940,6 @@ function topToolConsumers(toolUses, limit = 10) {
 init_esm_shims();
 import { createHash as createHash10 } from "crypto";
 import { closeSync, existsSync as existsSync12, openSync, readdirSync as readdirSync8, readSync, statSync as statSync12 } from "fs";
-import { homedir as homedir3 } from "os";
 import { basename as basename3, dirname as dirname11, join as join19, resolve as resolve10, sep as sep3 } from "path";
 
 // src/usage/transcript.ts
@@ -61144,7 +61168,7 @@ function isValidSessionId(id) {
   return SESSION_ID_RE.test(id);
 }
 function claudeDir() {
-  return process.env.EMINIAR_CLAUDE_DIR || join19(homedir3(), ".claude");
+  return process.env.EMINIAR_CLAUDE_DIR || claudeConfigDir();
 }
 function insideDir(path3, dir) {
   const d = resolve10(dir);
@@ -63981,7 +64005,6 @@ import { join as join23 } from "path";
 // src/permissions/settings.ts
 init_esm_shims();
 import { existsSync as existsSync14, readFileSync as readFileSync16, realpathSync as realpathSync5, statSync as statSync13 } from "fs";
-import { homedir as homedir4 } from "os";
 import { join as join21 } from "path";
 
 // src/permissions/rules.ts
@@ -64163,11 +64186,11 @@ function stamp(file3) {
 var cache5 = /* @__PURE__ */ new Map();
 function loadPermissionRules(root, extraDeny = []) {
   const files = [
-    join21(homedir4(), ".claude", "settings.json"),
+    join21(claudeConfigDir(), "settings.json"),
     join21(root, ".claude", "settings.json"),
     join21(root, ".claude", "settings.local.json")
   ];
-  const key = `${root}\0${extraDeny.join("\0")}`;
+  const key = [...files, ...extraDeny].join("\0");
   const stamps = files.map(stamp);
   const hit = cache5.get(key);
   if (hit?.stamps.every((s, i) => s === stamps[i])) return hit.rules;
@@ -69135,12 +69158,13 @@ import {
   readdirSync as readdirSync9,
   readFileSync as readFileSync18,
   renameSync as renameSync6,
+  statSync as statSync17,
   unlinkSync as unlinkSync6,
   writeFileSync as writeFileSync9
 } from "fs";
 import { connect } from "net";
-import { homedir as homedir5 } from "os";
-import { dirname as dirname14, join as join26 } from "path";
+import { homedir as homedir3 } from "os";
+import { basename as basename7, dirname as dirname14, join as join26 } from "path";
 import { parseArgs } from "util";
 
 // src/adjudicator/eval.ts
@@ -69534,10 +69558,9 @@ import {
   readFileSync as readFileSync20,
   writeFileSync as writeFileSync10
 } from "fs";
-import { homedir as homedir6 } from "os";
 import { dirname as dirname15, join as join28 } from "path";
-var claudeDir2 = () => process.env.CLAUDE_CONFIG_DIR || join28(homedir6(), ".claude");
-var pluginsDir = () => join28(claudeDir2(), "plugins");
+var claudeDir2 = () => claudeConfigDir();
+var pluginsDir = () => claudePluginsDir();
 function readJson3(file3) {
   if (!existsSync20(file3)) return {};
   try {
@@ -69905,9 +69928,23 @@ function symbolsAt(db, path3, hunks) {
   }
   return out;
 }
+function isDiffRef(ref) {
+  return ref.length > 0 && ref.length <= 256 && !ref.startsWith("-") && !new RegExp("\\p{Cc}", "u").test(ref);
+}
 function detectChanges(db, root, opts = {}) {
-  const args = ["diff", "--unified=0", "--no-color", "--relative", "--no-ext-diff"];
-  if (opts.ref) args.push(opts.ref);
+  const args = [
+    "diff",
+    "--unified=0",
+    "--no-color",
+    "--relative",
+    "--no-ext-diff",
+    "--no-textconv"
+  ];
+  if (opts.ref) {
+    if (!isDiffRef(opts.ref))
+      throw new Error(`not a ref, sha or range: ${JSON.stringify(opts.ref)}`);
+    args.push("--end-of-options", opts.ref);
+  }
   const hunks = parseUnifiedDiff(git2(root, args));
   if (!opts.ref) {
     for (const p2 of git2(root, ["ls-files", "--others", "--exclude-standard"]).split("\n")) {
@@ -71919,8 +71956,8 @@ ${swarm.instructions}`] : []
 // src/swarm/hooks.ts
 init_esm_shims();
 import { execFileSync } from "child_process";
-import { readFileSync as readFileSync25, realpathSync as realpathSync8, statSync as statSync17 } from "fs";
-import { basename as basename7, dirname as dirname16, join as join33, resolve as resolve12 } from "path";
+import { readFileSync as readFileSync25, realpathSync as realpathSync8, statSync as statSync18 } from "fs";
+import { basename as basename8, dirname as dirname16, join as join33, resolve as resolve12 } from "path";
 
 // src/hooks/log.ts
 init_esm_shims();
@@ -71986,7 +72023,7 @@ function verifyCaller(input2) {
 function coordinationRoot(root) {
   try {
     const dotGit = join33(root, ".git");
-    if (!statSync17(dotGit).isFile()) return root;
+    if (!statSync18(dotGit).isFile()) return root;
     const m = /^gitdir:\s*(.+?)\s*$/m.exec(readFileSync25(dotGit, "utf8"));
     if (!m) return root;
     const gitdir = resolve12(root, m[1]);
@@ -71996,7 +72033,7 @@ function coordinationRoot(root) {
     } catch {
       return root;
     }
-    if (basename7(common) === ".git") return realpathSync8(dirname16(common));
+    if (basename8(common) === ".git") return realpathSync8(dirname16(common));
     const out = execFileSync("git", ["worktree", "list", "--porcelain"], {
       cwd: root,
       encoding: "utf8",
@@ -72006,7 +72043,7 @@ function coordinationRoot(root) {
     const first = /^worktree (.+)$/m.exec(out)?.[1];
     if (!first || /^bare$/m.test(out.split("\n\n")[0] ?? "")) return root;
     const main = realpathSync8(first);
-    return main !== realpathSync8(common) && statSync17(join33(main, ".git"), { throwIfNoEntry: false }) ? main : root;
+    return main !== realpathSync8(common) && statSync18(join33(main, ".git"), { throwIfNoEntry: false }) ? main : root;
   } catch {
     return root;
   }