@m8t-stack/cli 0.2.10 → 0.2.11

package/dist/cli.js

@@ -650,19 +650,47 @@ var init_foundry_agent_get = __esm({
 });
 
 // src/lib/brain-yaml-mirror.ts
+import { parse as parseYaml4 } from "yaml";
 function linkSection(args) {
   return [
     `link:`,
     `  repo: "${args.repo}"`,
     `  branch: ${args.branch}`,
     `  topology: per-worker`,
-    `  schemaVersion: "1"`,
+    `  schemaVersion: "2"`,
     `  persona: "${args.persona}"`,
-    `  agent: "${args.agent}"`,
+    `  agents:`,
+    ...args.agents.map((a) => `    - ${a}`),
     ``
   ].join("\n");
 }
+function mergeAgents(prior, incoming) {
+  return prior.includes(incoming) ? prior : [...prior, incoming];
+}
+function readLinkAgents(existing) {
+  if (!existing) return [];
+  let parsed;
+  try {
+    parsed = parseYaml4(existing);
+  } catch {
+    return [];
+  }
+  if (!parsed || typeof parsed !== "object") return [];
+  const root = parsed;
+  const link = root.link && typeof root.link === "object" ? root.link : root;
+  const raw = Array.isArray(link.agents) ? link.agents : typeof link.agent === "string" ? [link.agent] : [];
+  const out = [];
+  for (const v of raw) {
+    const s = typeof v === "string" ? v.trim() : "";
+    if (!s) continue;
+    if (/^\{\{.*\}\}$/.test(s)) continue;
+    if (!out.includes(s)) out.push(s);
+  }
+  return out;
+}
 function buildBrainYaml(existing, args) {
+  const agents = mergeAgents(readLinkAgents(existing), args.agent);
+  const link = linkSection({ repo: args.repo, branch: args.branch, persona: args.persona, agents });
   if (existing) {
     const hasAuthoritative = /^engine:/m.test(existing) || /^processes:/m.test(existing);
     if (hasAuthoritative) {
@@ -670,10 +698,10 @@ function buildBrainYaml(existing, args) {
       const linkIdx = existing.search(/^link:/m);
       const cut = mirrorIdx >= 0 ? mirrorIdx : linkIdx >= 0 ? linkIdx : existing.length;
       const authoritative = existing.slice(0, cut).replace(/\s*$/, "\n\n");
-      return authoritative + MIRROR_BANNER + "\n" + linkSection(args);
+      return authoritative + MIRROR_BANNER + "\n" + link;
     }
   }
-  return DEFAULT_AUTHORITATIVE + "\n\n" + MIRROR_BANNER + "\n" + linkSection(args);
+  return DEFAULT_AUTHORITATIVE + "\n\n" + MIRROR_BANNER + "\n" + link;
 }
 async function mirrorBrainYaml(args) {
   const minted = await mintInstallationToken({
@@ -683,58 +711,56 @@ async function mirrorBrainYaml(args) {
     repository: args.repo
   });
   const [owner, repoName] = args.repo.split("/");
-  const getRes = await fetch(
-    `https://api.github.com/repos/${owner}/${repoName}/contents/.m8t/brain.yaml`,
-    {
-      headers: {
-        Authorization: `Bearer ${minted.token}`,
-        Accept: "application/vnd.github+json",
-        "X-GitHub-Api-Version": "2022-11-28"
-      }
-    }
-  );
-  let sha;
-  let existing;
-  if (getRes.ok) {
-    const data = await getRes.json();
-    sha = data.sha;
-    if (typeof data.content === "string") {
-      existing = Buffer.from(data.content, "base64").toString("utf8");
-    }
-  }
-  const content = buildBrainYaml(existing, {
-    repo: args.repo,
-    branch: args.branch,
-    persona: args.persona,
-    agent: args.agent
-  });
-  const body = {
-    message: "chore(brain): mirror .m8t/brain.yaml (m8t brain link)",
-    content: Buffer.from(content, "utf8").toString("base64"),
-    branch: args.branch,
-    ...sha ? { sha } : {}
+  const url = `https://api.github.com/repos/${owner}/${repoName}/contents/.m8t/brain.yaml`;
+  const headers = {
+    Authorization: `Bearer ${minted.token}`,
+    Accept: "application/vnd.github+json",
+    "X-GitHub-Api-Version": "2022-11-28"
   };
-  const putRes = await fetch(
-    `https://api.github.com/repos/${owner}/${repoName}/contents/.m8t/brain.yaml`,
-    {
+  const MAX_ATTEMPTS2 = 3;
+  for (let attempt = 1; attempt <= MAX_ATTEMPTS2; attempt++) {
+    const getRes = await fetch(url, { headers });
+    let sha;
+    let existing;
+    if (getRes.ok) {
+      const data = await getRes.json();
+      sha = data.sha;
+      if (typeof data.content === "string") {
+        existing = Buffer.from(data.content, "base64").toString("utf8");
+      }
+    }
+    const content = buildBrainYaml(existing, {
+      repo: args.repo,
+      branch: args.branch,
+      persona: args.persona,
+      agent: args.agent
+    });
+    const body = {
+      message: "chore(brain): mirror .m8t/brain.yaml (m8t brain link)",
+      content: Buffer.from(content, "utf8").toString("base64"),
+      branch: args.branch,
+      ...sha ? { sha } : {}
+    };
+    const putRes = await fetch(url, {
       method: "PUT",
-      headers: {
-        Authorization: `Bearer ${minted.token}`,
-        Accept: "application/vnd.github+json",
-        "X-GitHub-Api-Version": "2022-11-28",
-        "Content-Type": "application/json"
-      },
+      headers: { ...headers, "Content-Type": "application/json" },
       body: JSON.stringify(body)
-    }
-  );
-  if (!putRes.ok) {
+    });
+    if (putRes.ok) return;
     const text = await putRes.text();
+    const retryable = putRes.status === 409 || putRes.status === 422;
+    if (retryable && attempt < MAX_ATTEMPTS2) continue;
+    const suffix = retryable ? ` after ${MAX_ATTEMPTS2.toString()} attempts` : "";
     throw new LocalCliError({
       code: "BRAIN_YAML_MIRROR_FAILED",
-      message: `PUT .m8t/brain.yaml: HTTP ${putRes.status.toString()}
+      message: `PUT .m8t/brain.yaml: HTTP ${putRes.status.toString()}${suffix}
 ${text.slice(0, 300)}`
     });
   }
+  throw new LocalCliError({
+    code: "BRAIN_YAML_MIRROR_FAILED",
+    message: `PUT .m8t/brain.yaml: retry loop exited unexpectedly`
+  });
 }
 var DEFAULT_AUTHORITATIVE, MIRROR_BANNER;
 var init_brain_yaml_mirror = __esm({
@@ -1169,7 +1195,7 @@ var init_enable_hosted_brain = __esm({
 import { Builtins, Cli } from "clipanion";
 
 // src/lib/package-version.ts
-var CLI_VERSION = "0.2.10";
+var CLI_VERSION = "0.2.11";
 
 // src/lib/render-error.ts
 init_errors();
@@ -13720,6 +13746,40 @@ ${LOADER_END}
 `;
 }
 
+// src/lib/a2a-snippet.ts
+var SNIPPET_START = "<!-- m8t:a2a:start -->";
+var SNIPPET_END = "<!-- m8t:a2a:end -->";
+var DELEGATE_SNIPPET = `${SNIPPET_START}
+## Working with other workers
+You can delegate to other m8t workers. Before you do:
+1. Call \`discover_workers\` to see who's available now \u2014 each entry's card says what
+   the worker is for, when to delegate to it, and what it accepts and returns.
+2. If one is a clear fit, call \`invoke_worker(target, task)\` \u2014 \`target\` is the name
+   from the directory; \`task\` is a complete, self-contained instruction (the worker
+   can't ask follow-ups mid-task).
+3. If invoke_worker returns status "in_progress" with a taskId, the worker is taking
+   a while \u2014 call \`check_delegation(taskId)\` to fetch the result, repeating until the
+   status is no longer "in_progress".
+4. Fold the worker's result into your own answer.
+Delegate only when another worker is genuinely better suited; otherwise answer
+directly. Don't re-delegate the same request in a loop.
+${SNIPPET_END}`;
+function esc(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function stripSnippet(instructions) {
+  const re = new RegExp(`\\n*${esc(SNIPPET_START)}[\\s\\S]*?${esc(SNIPPET_END)}\\n*`, "g");
+  return instructions.replace(re, "\n").replace(/\s+$/, "");
+}
+function appendSnippet(instructions) {
+  return `${stripSnippet(instructions).replace(/\s+$/, "")}
+
+${DELEGATE_SNIPPET}`;
+}
+function hasA2aSnippet(instructions) {
+  return instructions.includes(SNIPPET_START);
+}
+
 // src/lib/brain-link.ts
 init_foundry_agent_get();
 init_brain_yaml_mirror();
@@ -13812,7 +13872,10 @@ async function linkBrain(args) {
       progress("No local persona yaml \u2014 basing instructions on the deployed agent\u2026");
       base = current.definition.instructions ?? "";
     }
-    const instructionsWithLoader = appendBrainLoader(base, loader);
+    let instructionsWithLoader = appendBrainLoader(base, loader);
+    if (hasA2aSnippet(current.definition.instructions ?? "")) {
+      instructionsWithLoader = appendSnippet(instructionsWithLoader);
+    }
     const link = {
       repo: args.repo,
       branch: args.branch,
@@ -14944,7 +15007,7 @@ init_errors();
 // src/lib/deploy-prompt-advisor.ts
 import * as fs12 from "fs";
 import * as path11 from "path";
-import { parse as parseYaml4 } from "yaml";
+import { parse as parseYaml5 } from "yaml";
 init_foundry_agents();
 init_errors();
 function findPersonasRoot(hint) {
@@ -14972,7 +15035,7 @@ async function deployPromptAdvisor(args) {
     });
   }
   const fmMatch = /^---\n([\s\S]*?)\n---/.exec(raw);
-  const fm = fmMatch ? parseYaml4(fmMatch[1]) : {};
+  const fm = fmMatch ? parseYaml5(fmMatch[1]) : {};
   const model = args.model ?? fm.targets?.foundry?.model;
   if (!model) {
     throw new LocalCliError({
@@ -15137,7 +15200,7 @@ import { randomBytes as randomBytes2, createHash } from "crypto";
 init_errors();
 init_esm();
 import * as fs13 from "fs";
-import { parse as parseYaml5 } from "yaml";
+import { parse as parseYaml6 } from "yaml";
 function readPersonaA2aCard(personaPath) {
   let raw;
   try {
@@ -15147,7 +15210,7 @@ function readPersonaA2aCard(personaPath) {
   }
   const fm = /^---\n([\s\S]*?)\n---/.exec(raw);
   if (!fm) throw new LocalCliError({ code: "PERSONA_NO_FRONTMATTER", message: `Persona '${personaPath}' has no frontmatter.` });
-  const front = parseYaml5(fm[1]);
+  const front = parseYaml6(fm[1]);
   const role = typeof front.role === "string" ? front.role : "";
   const cardYaml = front.targets?.foundry?.["a2a-card"];
   if (!cardYaml || typeof cardYaml !== "object") {
@@ -15182,23 +15245,6 @@ var FOUNDRY_ARM_API3 = "2025-04-01-preview";
 var FOUNDRY_DATA_SCOPE3 = "https://ai.azure.com/.default";
 var ARM_SCOPE6 = "https://management.azure.com/.default";
 var A2A_TOOLS = ["discover_workers", "invoke_worker", "check_delegation"];
-var SNIPPET_START = "<!-- m8t:a2a:start -->";
-var SNIPPET_END = "<!-- m8t:a2a:end -->";
-var DELEGATE_SNIPPET = `${SNIPPET_START}
-## Working with other workers
-You can delegate to other m8t workers. Before you do:
-1. Call \`discover_workers\` to see who's available now \u2014 each entry's card says what
-   the worker is for, when to delegate to it, and what it accepts and returns.
-2. If one is a clear fit, call \`invoke_worker(target, task)\` \u2014 \`target\` is the name
-   from the directory; \`task\` is a complete, self-contained instruction (the worker
-   can't ask follow-ups mid-task).
-3. If invoke_worker returns status "in_progress" with a taskId, the worker is taking
-   a while \u2014 call \`check_delegation(taskId)\` to fetch the result, repeating until the
-   status is no longer "in_progress".
-4. Fold the worker's result into your own answer.
-Delegate only when another worker is genuinely better suited; otherwise answer
-directly. Don't re-delegate the same request in a loop.
-${SNIPPET_END}`;
 async function enableA2a(args) {
   const progress = args.onProgress ?? ((_m) => {
   });
@@ -15257,15 +15303,6 @@ async function disableA2a(args) {
   await deleteConnection2({ credential: args.credential, projectArmId: args.projectArmId, connectionName });
   return { connectionName, foundryVersion };
 }
-function appendSnippet(instructions) {
-  return `${stripSnippet(instructions).replace(/\s+$/, "")}
-
-${DELEGATE_SNIPPET}`;
-}
-function stripSnippet(instructions) {
-  const re = new RegExp(`\\n*${esc(SNIPPET_START)}[\\s\\S]*?${esc(SNIPPET_END)}\\n*`, "g");
-  return instructions.replace(re, "\n").replace(/\s+$/, "");
-}
 function withA2aTool(tools, bridgeUrl, connectionName) {
   const others = tools.filter(
     (t) => !(t.type === "mcp" && t.server_label === "a2a")
@@ -15275,9 +15312,6 @@ function withA2aTool(tools, bridgeUrl, connectionName) {
     { type: "mcp", server_label: "a2a", server_url: bridgeUrl, allowed_tools: A2A_TOOLS, require_approval: "never", project_connection_id: connectionName }
   ];
 }
-function esc(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 async function putA2aConnection(args) {
   const token = await args.credential.getToken(ARM_SCOPE6);
   if (!token?.token) throw new LocalCliError({ code: "ARM_AUTH", message: "Could not acquire ARM token" });
@@ -15655,7 +15689,7 @@ init_errors();
 import * as fs15 from "fs";
 import * as os6 from "os";
 import * as path12 from "path";
-import { parse as parseYaml6 } from "yaml";
+import { parse as parseYaml7 } from "yaml";
 var A2A_PATH = "/api/a2a/mcp";
 function resolveBridgeUrl(opts) {
   const env = opts.env ?? process.env;
@@ -15679,7 +15713,7 @@ function readConfigGatewayUrl(home) {
   const cfg = path12.join(home ?? os6.homedir(), ".m8t-stack", "config.yaml");
   if (!fs15.existsSync(cfg)) return void 0;
   try {
-    const o = parseYaml6(fs15.readFileSync(cfg, "utf8"));
+    const o = parseYaml7(fs15.readFileSync(cfg, "utf8"));
     return typeof o.gatewayUrl === "string" ? o.gatewayUrl : void 0;
   } catch {
     return void 0;
@@ -16181,7 +16215,7 @@ async function deployHostedWorker(args) {
 // src/lib/persona.ts
 import * as fs17 from "fs";
 import * as path15 from "path";
-import { parse as parseYaml7 } from "yaml";
+import { parse as parseYaml8 } from "yaml";
 function findRepoRoot(startDir) {
   let dir = path15.resolve(startDir);
   for (; ; ) {
@@ -16205,7 +16239,7 @@ function resolvePersona(persona, cwd = process.cwd()) {
   if (!match) return { persona, personaVersion: null };
   let fm = null;
   try {
-    fm = parseYaml7(match[1]);
+    fm = parseYaml8(match[1]);
   } catch {
     return { persona, personaVersion: null };
   }
@@ -18985,7 +19019,7 @@ import { Command as Command40, Option as Option38 } from "clipanion";
 // src/lib/profiles.ts
 import * as fs20 from "fs/promises";
 import * as path21 from "path";
-import { parse as parseYaml8, stringify as stringifyYaml4 } from "yaml";
+import { parse as parseYaml9, stringify as stringifyYaml4 } from "yaml";
 function profilesDir() {
   const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
   return path21.join(home, ".m8t-stack", "profiles");
@@ -19010,7 +19044,7 @@ async function listProfiles() {
 async function readProfile(name) {
   try {
     const raw = await fs20.readFile(getProfilePath(name), "utf8");
-    const parsed = parseYaml8(raw);
+    const parsed = parseYaml9(raw);
     if (!parsed || typeof parsed !== "object") return null;
     return parsed;
   } catch (e) {
@@ -21277,7 +21311,7 @@ async function emitDigest(input, deps, digest) {
 }
 
 // ../../packages/brain/engine/dist/esm/dream/config.js
-import { parse as parseYaml9 } from "yaml";
+import { parse as parseYaml10 } from "yaml";
 var DEFAULT_DREAM_MODEL = "gpt-5.4";
 function asCadence(v) {
   return v === "nightly" ? "nightly" : "off";
@@ -21285,7 +21319,7 @@ function asCadence(v) {
 function parseDreamerConfig(rawYaml, env) {
   let parsed;
   try {
-    parsed = parseYaml9(rawYaml);
+    parsed = parseYaml10(rawYaml);
   } catch {
     return { enabled: false, cadence: "off", model: env.M8T_DREAM_MODEL ?? DEFAULT_DREAM_MODEL };
   }
@@ -21302,10 +21336,10 @@ function parseDreamerConfig(rawYaml, env) {
 var ZERO_WIDTH_RE = new RegExp("\u200B|\u200C|\u200D|\uFEFF", "g");
 
 // ../../packages/brain/engine/dist/esm/librarian/janitor/frontmatter.js
-import { parse as parseYaml10, stringify as stringifyYaml5 } from "yaml";
+import { parse as parseYaml11, stringify as stringifyYaml5 } from "yaml";
 
 // ../../packages/brain/engine/dist/esm/librarian/config.js
-import { parse as parseYaml11 } from "yaml";
+import { parse as parseYaml12 } from "yaml";
 
 // src/lib/dream-discovery.ts
 init_http();