@cohortapp/agent-sdk 2.17.0 → 2.18.4

package/lib/collective/capture.test.mjs

@@ -1,121 +0,0 @@
-/**
- * capture.test.mjs — tests for session → memory-card distillation.
- * Run: node --test lib/collective/capture.test.mjs
- */
-"use strict";
-
-import { test } from "node:test";
-import assert from "node:assert/strict";
-import { mkdtempSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import {
-  transcriptToText,
-  countUserTurns,
-  buildDistillPrompt,
-  extractCardsFromModelOutput,
-  captureSession,
-} from "./capture.mjs";
-import { readRecentCards } from "./cards.mjs";
-
-function tmp() {
-  return mkdtempSync(join(tmpdir(), "collective-capture-"));
-}
-
-test("transcriptToText: flattens JSONL; passes plain text through", () => {
-  const jsonl = [
-    JSON.stringify({ role: "user", content: "do the thing" }),
-    JSON.stringify({ role: "assistant", content: [{ type: "text", text: "done" }] }),
-  ].join("\n");
-  const out = transcriptToText(jsonl);
-  assert.match(out, /user: do the thing/);
-  assert.match(out, /assistant: done/);
-  assert.equal(transcriptToText("just plain text"), "just plain text");
-});
-
-test("countUserTurns: counts user/human turns", () => {
-  assert.equal(countUserTurns("user: a\nassistant: b\nuser: c"), 2);
-  assert.equal(countUserTurns("human: hi\nassistant: yo"), 1);
-  assert.equal(countUserTurns(""), 0);
-});
-
-test("buildDistillPrompt: instructs JSON-only output", () => {
-  const p = buildDistillPrompt("user: x", 5);
-  assert.match(p, /ONLY a JSON array/);
-  assert.match(p, /at most 5 cards/i);
-  assert.match(p, /SESSION TRANSCRIPT/);
-});
-
-test("extractCardsFromModelOutput: fenced, plain, and garbage", () => {
-  assert.equal(extractCardsFromModelOutput("```json\n[{\"title\":\"a\"}]\n```").length, 1);
-  assert.equal(extractCardsFromModelOutput('prose [{"title":"a"},{"title":"b"}] more').length, 2);
-  assert.deepEqual(extractCardsFromModelOutput("no json here"), []);
-  assert.deepEqual(extractCardsFromModelOutput(""), []);
-});
-
-const longTranscript = "user: please ship billing\nassistant: shipping\nuser: confirm done\nassistant: done";
-
-test("captureSession: writes distilled cards (injected distiller)", async () => {
-  const root = tmp();
-  try {
-    const distillFn = async () => JSON.stringify([
-      { kind: "decision", title: "Shipped billing migration", salience: 0.9, tags: ["billing"] },
-      { kind: "openloop", title: "Verify invoices next run", salience: 0.6 },
-    ]);
-    const res = await captureSession({
-      agentRoot: root, sessionId: "s1", cwd: "/x/maestro",
-      transcriptText: longTranscript, cfg: { enabled: true }, distillFn,
-      nowMs: Date.parse("2026-06-03T12:00:00Z"),
-    });
-    assert.equal(res.written, 2);
-    assert.equal(res.reason, "ok");
-    const cards = readRecentCards(root, { nowMs: Date.parse("2026-06-03T13:00:00Z") });
-    assert.equal(cards.length, 2);
-    assert.equal(cards.find((c) => c.kind === "decision").repo, "maestro");
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("captureSession: skips when disabled / denylisted / too short", async () => {
-  const root = tmp();
-  const distillFn = async () => "[{\"title\":\"x\"}]";
-  try {
-    assert.equal((await captureSession({ agentRoot: root, transcriptText: longTranscript, cfg: { enabled: false }, distillFn })).reason, "disabled");
-    assert.equal((await captureSession({ agentRoot: root, cwd: "/x/secret", transcriptText: longTranscript, cfg: { repoDenylist: ["secret"] }, distillFn })).reason, "denylisted");
-    assert.equal((await captureSession({ agentRoot: root, transcriptText: "user: hi", cfg: {}, distillFn })).reason, "too-short");
-    assert.equal((await captureSession({ transcriptText: longTranscript, cfg: {}, distillFn })).reason, "no-agent-root");
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("captureSession: fail-open on bad distiller output / throw", async () => {
-  const root = tmp();
-  try {
-    const garbage = await captureSession({ agentRoot: root, transcriptText: longTranscript, cfg: {}, distillFn: async () => "not json" });
-    assert.equal(garbage.written, 0);
-    assert.equal(garbage.reason, "no-cards");
-    const thrower = await captureSession({ agentRoot: root, transcriptText: longTranscript, cfg: {}, distillFn: async () => { throw new Error("boom"); } });
-    assert.equal(thrower.written, 0);
-    assert.equal(thrower.skipped, true);
-    assert.equal(thrower.reason, "distill-failed");
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("captureSession: caps cards per session", async () => {
-  const root = tmp();
-  try {
-    const many = Array.from({ length: 20 }, (_, i) => ({ kind: "fact", title: `fact ${i}`, salience: 0.5 }));
-    const res = await captureSession({
-      agentRoot: root, transcriptText: longTranscript, cfg: {}, maxCards: 5,
-      distillFn: async () => JSON.stringify(many), nowMs: Date.parse("2026-06-03T12:00:00Z"),
-    });
-    assert.equal(res.written, 5);
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});

package/lib/collective/cards.test.mjs

@@ -1,114 +0,0 @@
-/**
- * cards.test.mjs — tests for the memory-card store.
- * Run: node --test lib/collective/cards.test.mjs
- */
-"use strict";
-
-import { test } from "node:test";
-import assert from "node:assert/strict";
-import { mkdtempSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import {
-  KINDS,
-  normalizeCard,
-  appendCards,
-  readRecentCards,
-  cardToText,
-  repoLabel,
-} from "./cards.mjs";
-
-function tmp() {
-  return mkdtempSync(join(tmpdir(), "collective-cards-"));
-}
-
-test("normalizeCard: requires a title", () => {
-  assert.equal(normalizeCard({ kind: "fact" }), null);
-  assert.equal(normalizeCard(null), null);
-  assert.ok(normalizeCard({ title: "x" }));
-});
-
-test("normalizeCard: kind fallback, salience clamp, stable id, ctx defaults", () => {
-  const c = normalizeCard(
-    { title: "Decided to ship", kind: "bogus", salience: 5 },
-    { sessionId: "s1", repo: "maestro", ts: "2026-06-01T00:00:00Z" },
-  );
-  assert.equal(c.kind, "fact", "unknown kind falls back to fact");
-  assert.equal(c.salience, 1, "salience clamped to [0,1]");
-  assert.equal(c.sessionId, "s1");
-  assert.equal(c.repo, "maestro");
-  assert.equal(c.ts, "2026-06-01T00:00:00Z");
-  // id is a stable hash of sessionId|kind|title
-  const c2 = normalizeCard({ title: "Decided to ship", kind: "bogus" }, { sessionId: "s1" });
-  assert.equal(c.id, c2.id, "same (session,kind,title) → same id");
-});
-
-test("normalizeCard: all KINDS preserved; body/tags truncated/cleaned", () => {
-  for (const k of KINDS) {
-    assert.equal(normalizeCard({ title: "t", kind: k }).kind, k);
-  }
-  const c = normalizeCard({
-    title: "t",
-    body: "x".repeat(5000),
-    tags: ["  a ", "", "b", 3, "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"],
-  });
-  assert.ok(c.body.length <= 600);
-  assert.ok(c.tags.length <= 12);
-  assert.deepEqual(c.tags.slice(0, 4), ["a", "b", "3", "c"], "trimmed, empties dropped, non-strings coerced");
-});
-
-test("appendCards + readRecentCards: round-trip, dedup, newest-first", () => {
-  const root = tmp();
-  try {
-    const n = appendCards(
-      root,
-      [
-        { title: "older", kind: "fact", ts: "2026-06-01T10:00:00Z" },
-        { title: "newer", kind: "decision", ts: "2026-06-02T10:00:00Z" },
-        { title: "older", kind: "fact", ts: "2026-06-01T10:00:00Z" }, // dup id
-      ],
-      { sessionId: "s1", repo: "r" },
-    );
-    assert.equal(n, 2, "duplicate id collapsed");
-    const cards = readRecentCards(root, { nowMs: Date.parse("2026-06-02T12:00:00Z") });
-    assert.equal(cards.length, 2);
-    assert.equal(cards[0].title, "newer", "newest first");
-    assert.equal(cards[1].title, "older");
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("readRecentCards: day-window filtering + limit", () => {
-  const root = tmp();
-  try {
-    appendCards(root, [{ title: "ancient", ts: "2026-01-01T00:00:00Z" }], { sessionId: "s" });
-    appendCards(root, [{ title: "recent", ts: "2026-06-02T00:00:00Z" }], { sessionId: "s" });
-    const recent = readRecentCards(root, { days: 30, nowMs: Date.parse("2026-06-03T00:00:00Z") });
-    assert.equal(recent.length, 1, "ancient card outside 30-day window excluded");
-    assert.equal(recent[0].title, "recent");
-    const limited = readRecentCards(root, { days: 9999, limit: 1, nowMs: Date.parse("2026-06-03T00:00:00Z") });
-    assert.equal(limited.length, 1, "limit honored");
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("appendCards: empty/!agentRoot is a safe no-op", () => {
-  assert.equal(appendCards(null, [{ title: "x" }]), 0);
-  assert.equal(appendCards(tmp(), []), 0);
-});
-
-test("cardToText: includes kind, title, body, tags", () => {
-  const txt = cardToText({ kind: "decision", title: "Ship v2", body: "after review", tags: ["release"] });
-  assert.match(txt, /decision/);
-  assert.match(txt, /Ship v2/);
-  assert.match(txt, /after review/);
-  assert.match(txt, /release/);
-});
-
-test("repoLabel: basename only, never a full path", () => {
-  assert.equal(repoLabel("/Users/x/maestro"), "maestro");
-  assert.equal(repoLabel(""), "");
-});

package/lib/collective/config.test.mjs

@@ -1,123 +0,0 @@
-/**
- * config.test.mjs — tests for collective config + agent-root resolution.
- * Run: node --test lib/collective/config.test.mjs
- */
-"use strict";
-
-import { test } from "node:test";
-import assert from "node:assert/strict";
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import {
-  DEFAULTS,
-  mergeConfig,
-  loadConfig,
-  isEnabled,
-  isRepoDenied,
-  resolveAgentRoot,
-  pointerPath,
-} from "./config.mjs";
-
-function tmp() {
-  return mkdtempSync(join(tmpdir(), "collective-cfg-"));
-}
-function makeAgentRepo() {
-  const root = tmp();
-  mkdirSync(join(root, "config"), { recursive: true });
-  writeFileSync(join(root, "config", "agent.json"), JSON.stringify({ firstName: "Test" }));
-  return root;
-}
-
-test("mergeConfig: deep-merges objects, last-wins scalars, replaces arrays", () => {
-  const out = mergeConfig(
-    { a: 1, n: { x: 1, y: 1 }, arr: [1, 2] },
-    { b: 2, n: { y: 2, z: 3 }, arr: [9] },
-  );
-  assert.deepEqual(out, { a: 1, b: 2, n: { x: 1, y: 2, z: 3 }, arr: [9] });
-});
-
-test("mergeConfig: null override returns a clone of base", () => {
-  const base = { a: 1 };
-  const out = mergeConfig(base, null);
-  assert.deepEqual(out, base);
-  out.a = 99;
-  assert.equal(base.a, 1, "clone must not alias base");
-});
-
-test("loadConfig: missing root or file falls back to DEFAULTS", async () => {
-  assert.deepEqual(await loadConfig(null), DEFAULTS);
-  assert.deepEqual(await loadConfig(tmp()), DEFAULTS);
-});
-
-test("loadConfig: yaml overrides merge over defaults", async () => {
-  const root = makeAgentRepo();
-  try {
-    writeFileSync(
-      join(root, "config", "collective.yaml"),
-      "enabled: false\ndigestBudgetTokens: 800\npresence:\n  staleSec: 120\n",
-    );
-    const cfg = await loadConfig(root);
-    assert.equal(cfg.enabled, false);
-    assert.equal(cfg.digestBudgetTokens, 800);
-    assert.equal(cfg.presence.staleSec, 120);
-    assert.equal(cfg.presence.heartbeatSec, 60, "unspecified nested key keeps default");
-    assert.equal(cfg.recencyHalfLifeDays, 30, "unspecified top key keeps default");
-  } finally {
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("isEnabled: true unless explicitly disabled", () => {
-  assert.equal(isEnabled({ enabled: true }), true);
-  assert.equal(isEnabled({}), true);
-  assert.equal(isEnabled({ enabled: false }), false);
-  assert.equal(isEnabled(null), false);
-});
-
-test("isRepoDenied: substring, basename, glob, and empty-list cases", () => {
-  assert.equal(isRepoDenied("/Users/x/client-acme", { repoDenylist: [] }), false);
-  assert.equal(isRepoDenied("/Users/x/client-acme", { repoDenylist: ["client-acme"] }), true);
-  assert.equal(isRepoDenied("/Users/x/secret-stuff", { repoDenylist: ["secret"] }), true, "substring");
-  assert.equal(isRepoDenied("/Users/x/client-acme", { repoDenylist: ["client-*"] }), true, "glob basename");
-  assert.equal(isRepoDenied("/Users/x/safe", { repoDenylist: ["client-*"] }), false);
-  assert.equal(isRepoDenied("", { repoDenylist: ["x"] }), false);
-});
-
-test("resolveAgentRoot: env override wins when it is an agent repo", () => {
-  const root = makeAgentRepo();
-  const prev = process.env.MAESTRO_AGENT_ROOT;
-  try {
-    process.env.MAESTRO_AGENT_ROOT = root;
-    assert.equal(resolveAgentRoot("/tmp"), root);
-  } finally {
-    if (prev === undefined) delete process.env.MAESTRO_AGENT_ROOT;
-    else process.env.MAESTRO_AGENT_ROOT = prev;
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("resolveAgentRoot: walks up from a nested startDir", () => {
-  const root = makeAgentRepo();
-  const nested = join(root, "a", "b", "c");
-  mkdirSync(nested, { recursive: true });
-  const prev = process.env.MAESTRO_AGENT_ROOT;
-  const prevDir = process.env.AGENT_DIR;
-  const prevRoot = process.env.AGENT_ROOT;
-  try {
-    delete process.env.MAESTRO_AGENT_ROOT;
-    delete process.env.AGENT_DIR;
-    delete process.env.AGENT_ROOT;
-    assert.equal(resolveAgentRoot(nested), root);
-  } finally {
-    if (prev !== undefined) process.env.MAESTRO_AGENT_ROOT = prev;
-    if (prevDir !== undefined) process.env.AGENT_DIR = prevDir;
-    if (prevRoot !== undefined) process.env.AGENT_ROOT = prevRoot;
-    rmSync(root, { recursive: true, force: true });
-  }
-});
-
-test("pointerPath: lives under ~/.claude", () => {
-  assert.match(pointerPath(), /\.claude\/maestro-agent\.json$/);
-});

package/lib/collective/global-config.test.mjs

@@ -1,220 +0,0 @@
-/**
- * global-config.test.mjs — tests for the global-config merge helpers.
- * Run: node --test lib/collective/global-config.test.mjs
- */
-"use strict";
-
-import { test } from "node:test";
-import assert from "node:assert/strict";
-
-import {
-  HOOK_EVENTS, HOOK_MARKER, hookCommand, mergeCollectiveHooks,
-  upsertClaudeMdBlock, buildCollectiveClaudeMd, buildPointer,
-  CLAUDE_MD_BEGIN, CLAUDE_MD_END,
-} from "./global-config.mjs";
-
-test("hookCommand: quoted node + runner + sub-command", () => {
-  const cmd = hookCommand("/repo", "/usr/bin/node", "prime");
-  assert.match(cmd, /"\/usr\/bin\/node"/);
-  assert.match(cmd, new RegExp(HOOK_MARKER.replace(/\//g, "\\/")));
-  assert.ok(cmd.trim().endsWith(" prime"));
-});
-
-test("mergeCollectiveHooks: adds 4 groups, preserves existing, is idempotent", () => {
-  const existing = {
-    SessionStart: [{ matcher: "", hooks: [{ type: "command", command: "./scripts/hooks/session-start-banner.sh" }] }],
-  };
-  const first = mergeCollectiveHooks(existing, "/repo", "node");
-  assert.equal(first.added.length, HOOK_EVENTS.length);
-  // existing banner hook preserved
-  assert.ok(first.hooks.SessionStart.some((g) => g.hooks[0].command.includes("session-start-banner")));
-  // ours added
-  assert.ok(first.hooks.SessionStart.some((g) => g.hooks[0].command.includes(HOOK_MARKER)));
-  assert.ok(Array.isArray(first.hooks.PreCompact));
-  // re-run is a no-op
-  const second = mergeCollectiveHooks(first.hooks, "/repo", "node");
-  assert.equal(second.added.length, 0, "idempotent — nothing added on re-run");
-});
-
-test("mergeCollectiveHooks: empty/garbage existing → builds fresh", () => {
-  assert.equal(mergeCollectiveHooks(null, "/r", "node").added.length, 4);
-  assert.equal(mergeCollectiveHooks({}, "/r", "node").added.length, 4);
-});
-
-test("upsertClaudeMdBlock: inserts then replaces (idempotent body update)", () => {
-  const body1 = buildCollectiveClaudeMd("/repo");
-  const r1 = upsertClaudeMdBlock("# My global rules\n\nBe concise.", body1);
-  assert.equal(r1.changed, true);
-  assert.match(r1.content, /Be concise\./, "preserves existing content");
-  assert.match(r1.content, new RegExp(CLAUDE_MD_BEGIN));
-  assert.match(r1.content, /Collective memory/);
-  // Re-applying the SAME body → no change
-  const r2 = upsertClaudeMdBlock(r1.content, body1);
-  assert.equal(r2.changed, false);
-  // A DIFFERENT body → replaced in place, only one block remains
-  const r3 = upsertClaudeMdBlock(r1.content, "## Collective memory (Maestro)\nupdated");
-  assert.equal(r3.changed, true);
-  const begins = (r3.content.match(new RegExp(CLAUDE_MD_BEGIN, "g")) || []).length;
-  const ends = (r3.content.match(new RegExp(CLAUDE_MD_END, "g")) || []).length;
-  assert.equal(begins, 1, "exactly one begin marker");
-  assert.equal(ends, 1, "exactly one end marker");
-});
-
-test("upsertClaudeMdBlock: empty file → just the block", () => {
-  const r = upsertClaudeMdBlock("", "body");
-  assert.equal(r.changed, true);
-  assert.ok(r.content.startsWith(CLAUDE_MD_BEGIN));
-});
-
-test("buildPointer: shape", () => {
-  const p = buildPointer("/repo", "Alex", Date.parse("2026-06-03T00:00:00Z"));
-  assert.equal(p.agentRepo, "/repo");
-  assert.equal(p.agentName, "Alex");
-  assert.match(p.memoryRoot, /memory\/collective$/);
-  assert.equal(p.updatedAt, "2026-06-03T00:00:00.000Z");
-});
-
-// ── WP-M4: identity block + MCP/settings mergers (front-door session, §3.7) ──
-
-import {
-  IDENTITY_BEGIN, IDENTITY_END, buildIdentityClaudeMd, upsertDelimitedBlock,
-  mergeMcpServers, mergeSessionSettings, cohortMcpEntry, PRE_SEND_HOOK_MARKER, PRE_SEND_HOOK_MATCHER,
-  SESSION_PERMISSION_ALLOW,
-} from "./global-config.mjs";
-
-const AGENT = {
-  firstName: "Alex", fullName: "Alex Rivera", title: "Chief of Staff", company: "Acme",
-  principal: { fullName: "Jordan Lee", title: "CEO", firstName: "Jordan" },
-  repoSlug: "alex-ai",
-};
-
-test("buildIdentityClaudeMd: names the agent, the seat, the main session and the commands", () => {
-  const md = buildIdentityClaudeMd(AGENT, { agentRoot: "/Users/x/alex-ai", first: "alex", slug: "alex-ai" });
-  assert.match(md, /Alex Rivera/);
-  assert.match(md, /Chief of Staff/);
-  assert.match(md, /Acme/);
-  assert.match(md, /Jordan Lee/);
-  assert.match(md, /\/Users\/x\/alex-ai/);
-  assert.match(md, /`alex-ai`/, "seat slug");
-  assert.match(md, /same entity in every session/i);
-  assert.match(md, /`alex-main`/, "main session name");
-  assert.match(md, /ListAgents/);
-  assert.match(md, /maestro session status\|spawn\|ack/);
-  assert.match(md, /maestro inbox/);
-  assert.match(md, /maestro board mine/);
-  assert.match(md, /board/i);
-  // Persona rules are present and phrased as rules the agent follows outbound.
-  assert.match(md, /never .*(assistant|session|sub-?agent)/i);
-  // Design work is routed to the harmoniser, which is what keeps the vendored
-  // craft skills from deciding the typeface (WP-M7).
-  assert.match(md, /maestro-cohort-design/);
-  assert.match(md, /DESIGN\.md/);
-  assert.match(md, /design_\*/);
-  // The identity block is a different block from the collective one.
-  assert.notEqual(IDENTITY_BEGIN, CLAUDE_MD_BEGIN);
-});
-
-test("buildIdentityClaudeMd: derives first/slug when not given; tolerates a sparse agent.json", () => {
-  const md = buildIdentityClaudeMd({ fullName: "Robin Park" }, { agentRoot: "/home/r/robin-ai" });
-  assert.match(md, /Robin Park/);
-  assert.match(md, /`robin-main`/, "first derived from fullName");
-  assert.match(md, /`robin-ai`/, "slug derived from the agent dir basename");
-  const empty = buildIdentityClaudeMd({}, { agentRoot: "/home/r/robin-ai" });
-  assert.equal(typeof empty, "string");
-  assert.ok(empty.length > 50);
-  assert.doesNotMatch(empty, /undefined/);
-});
-
-test("upsertDelimitedBlock: identity + collective blocks coexist and are each idempotent", () => {
-  const coll = upsertClaudeMdBlock("# rules", buildCollectiveClaudeMd("/repo"));
-  const idBody = buildIdentityClaudeMd(AGENT, { agentRoot: "/repo" });
-  const r1 = upsertDelimitedBlock(coll.content, idBody, { begin: IDENTITY_BEGIN, end: IDENTITY_END });
-  assert.equal(r1.changed, true);
-  assert.match(r1.content, new RegExp(CLAUDE_MD_BEGIN), "collective block preserved");
-  assert.match(r1.content, new RegExp(IDENTITY_BEGIN));
-  const r2 = upsertDelimitedBlock(r1.content, idBody, { begin: IDENTITY_BEGIN, end: IDENTITY_END });
-  assert.equal(r2.changed, false, "idempotent");
-  const r3 = upsertDelimitedBlock(r1.content, "changed body", { begin: IDENTITY_BEGIN, end: IDENTITY_END });
-  assert.equal((r3.content.match(new RegExp(IDENTITY_BEGIN, "g")) || []).length, 1);
-  assert.match(r3.content, new RegExp(CLAUDE_MD_BEGIN), "collective block still there after identity update");
-});
-
-test("cohortMcpEntry + mergeMcpServers: adds cohort once, preserves other servers, updates a stale root", () => {
-  const entry = cohortMcpEntry("/Users/x/alex-ai");
-  assert.equal(entry.command, "cohort-mcp");
-  assert.deepEqual(entry.args, []);
-  assert.equal(entry.env.COHORT_AGENT_ROOT, "/Users/x/alex-ai");
-  const existing = { mcpServers: { other: { command: "x" } }, someOtherKey: 1 };
-  const m1 = mergeMcpServers(existing, entry);
-  assert.equal(m1.changed, true);
-  assert.deepEqual(m1.config.mcpServers.other, { command: "x" });
-  assert.deepEqual(m1.config.mcpServers.cohort, entry);
-  assert.equal(m1.config.someOtherKey, 1);
-  assert.deepEqual(existing.mcpServers, { other: { command: "x" } }, "input not mutated");
-  const m2 = mergeMcpServers(m1.config, entry);
-  assert.equal(m2.changed, false, "idempotent");
-  const m3 = mergeMcpServers(m1.config, cohortMcpEntry("/Users/x/other-ai"));
-  assert.equal(m3.changed, true, "a different agent root rewrites the entry");
-  assert.equal(m3.config.mcpServers.cohort.env.COHORT_AGENT_ROOT, "/Users/x/other-ai");
-  // Garbage in → a fresh object out, never a throw.
-  assert.equal(mergeMcpServers(null, entry).config.mcpServers.cohort.command, "cohort-mcp");
-  assert.equal(mergeMcpServers("nope", entry).config.mcpServers.cohort.command, "cohort-mcp");
-});
-
-test("mergeSessionSettings: crossSessionInbound + permissions.allow + PreToolUse persona hook, idempotent, additive", () => {
-  const settings = {
-    permissions: { allow: ["Bash(git status)"], deny: ["Bash(rm -rf /)"] },
-    hooks: { PreToolUse: [{ matcher: "Bash", hooks: [{ type: "command", command: "./mine.sh" }] }] },
-    theme: "dark",
-  };
-  const r1 = mergeSessionSettings(settings, { agentRoot: "/repo" });
-  assert.equal(r1.settings.crossSessionInbound, "accept");
-  assert.ok(r1.changes.includes("crossSessionInbound"));
-  for (const p of SESSION_PERMISSION_ALLOW) assert.ok(r1.settings.permissions.allow.includes(p), `allow ${p}`);
-  assert.ok(r1.settings.permissions.allow.includes("mcp__cohort__*"));
-  assert.ok(r1.settings.permissions.allow.includes("ListAgents"));
-  assert.ok(r1.settings.permissions.allow.includes("SendMessage"));
-  assert.ok(r1.settings.permissions.allow.includes("Monitor"));
-  assert.ok(r1.settings.permissions.allow.includes("Workflow"));
-  assert.ok(r1.settings.permissions.allow.includes("Agent"));
-  assert.ok(r1.settings.permissions.allow.includes("Bash(git status)"), "existing allow preserved");
-  assert.deepEqual(r1.settings.permissions.deny, ["Bash(rm -rf /)"], "deny untouched");
-  assert.equal(r1.settings.theme, "dark");
-  // PreToolUse: our matcher added, the operator's own group preserved.
-  const pre = r1.settings.hooks.PreToolUse;
-  assert.ok(pre.some((g) => g.matcher === "Bash" && g.hooks[0].command === "./mine.sh"));
-  const ours = pre.find((g) => g.matcher === PRE_SEND_HOOK_MATCHER);
-  assert.ok(ours, "persona hook group present");
-  // The matcher is a regex that fronts EVERY outbound tool, not messaging_send alone.
-  const matcherRe = new RegExp(`^${ours.matcher}$`);
-  for (const t of ["messaging_send", "messaging_send_voice_note", "email_send", "email_draft_send", "org_rpc"]) {
-    assert.ok(matcherRe.test(`mcp__cohort__${t}`), `matcher covers ${t}`);
-  }
-  assert.ok(!matcherRe.test("mcp__cohort__board_mine"), "reads are not fronted");
-  assert.ok(!matcherRe.test("mcp__cohort__messaging_send_extra"), "anchored");
-  assert.match(ours.hooks[0].command, new RegExp(PRE_SEND_HOOK_MARKER.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")));
-  assert.match(ours.hooks[0].command, /\/repo\/scripts\/hooks\/pre-send-audit\.sh/);
-  assert.match(ours.hooks[0].command, / cohort$/, "channel arg is cohort");
-  // Input not mutated.
-  assert.equal(settings.crossSessionInbound, undefined);
-  assert.equal(settings.permissions.allow.length, 1);
-  // Idempotent.
-  const r2 = mergeSessionSettings(r1.settings, { agentRoot: "/repo" });
-  assert.deepEqual(r2.changes, []);
-  assert.deepEqual(r2.settings, r1.settings);
-  // An operator who set crossSessionInbound to something else is respected (additive, never clobber).
-  const r3 = mergeSessionSettings({ crossSessionInbound: "reject" }, { agentRoot: "/repo" });
-  assert.equal(r3.settings.crossSessionInbound, "reject");
-  assert.ok(!r3.changes.includes("crossSessionInbound"));
-  // Garbage → fresh.
-  assert.equal(mergeSessionSettings(null, { agentRoot: "/repo" }).settings.crossSessionInbound, "accept");
-});
-
-test("cohortMcpEntry: a caller that knows cohort-mcp is off PATH pins command+args; the default stays the bare command", () => {
-  const local = cohortMcpEntry("/Users/x/alex-ai", { command: "/usr/local/bin/node", args: ["/sdk/bin/cohort-mcp.mjs"] });
-  assert.deepEqual(local, { command: "/usr/local/bin/node", args: ["/sdk/bin/cohort-mcp.mjs"], env: { COHORT_AGENT_ROOT: "/Users/x/alex-ai" } });
-  assert.equal(cohortMcpEntry("/r").command, "cohort-mcp");
-  assert.deepEqual(cohortMcpEntry("/r", {}).args, []);
-  // Switching from the local pin to the bare command is a change (so a re-run after `npm i -g` rewrites it).
-  assert.equal(mergeMcpServers({ mcpServers: { cohort: local } }, cohortMcpEntry("/Users/x/alex-ai")).changed, true);
-});