@m8t-stack/cli 0.2.11 → 0.2.13

package/dist/cli.js

@@ -1195,7 +1195,7 @@ var init_enable_hosted_brain = __esm({
 import { Builtins, Cli } from "clipanion";
 
 // src/lib/package-version.ts
-var CLI_VERSION = "0.2.11";
+var CLI_VERSION = "0.2.13";
 
 // src/lib/render-error.ts
 init_errors();
@@ -15064,10 +15064,9 @@ async function deployPromptAdvisor(args) {
   const fillableFields = fm["fillable-fields"] ?? [];
   const valuesMap = {};
   for (const field of fillableFields) {
-    if (field.default !== void 0) {
-      valuesMap[field.name] = field.default;
-    }
+    if (field.default !== void 0) valuesMap[field.name] = field.default;
   }
+  for (const [k, v] of Object.entries(args.fieldOverrides ?? {})) valuesMap[k] = v;
   const instructions = renderPersonaBody(personaPath, valuesMap);
   return createPromptVersion({
     credential: args.credential,
@@ -15196,6 +15195,109 @@ init_errors();
 init_foundry_agent_get();
 import { randomBytes as randomBytes2, createHash } from "crypto";
 
+// src/lib/data-plane-ready.ts
+init_errors();
+async function awaitDataPlaneReady(opts) {
+  const consecutive = opts.consecutive ?? 3;
+  const attempts = opts.attempts ?? 60;
+  const intervalMs = opts.intervalMs ?? 5e3;
+  const sleep2 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
+  let streak = 0;
+  for (let i = 1; i <= attempts; i++) {
+    const r = await opts.probe();
+    if (r.ok) {
+      streak++;
+      opts.onProgress?.(`data-plane ok (${streak.toString()}/${consecutive.toString()})`);
+      if (streak >= consecutive) return { ready: true, attempts: i };
+    } else {
+      const cls = classifyFoundryError({ status: r.status, message: r.message ?? "" });
+      const forcedRetryable = r.status !== void 0 && (opts.retryableStatuses?.includes(r.status) ?? false);
+      if (!forcedRetryable && !cls.retryable) {
+        throw new LocalCliError({
+          code: "FOUNDRY_NOT_READY_FATAL",
+          message: `Foundry data plane returned a non-retryable error: ${cls.message}`,
+          hint: "This is not a transient data-plane delay \u2014 check `az login`/permissions and the endpoint.",
+          retryable: false
+        });
+      }
+      streak = 0;
+      opts.onProgress?.(`data-plane not ready (${forcedRetryable ? `status ${(r.status ?? 0).toString()}` : cls.category}), waiting\u2026`);
+    }
+    if (i < attempts) await sleep2(intervalMs);
+  }
+  return { ready: false, attempts };
+}
+
+// src/lib/foundry-ready-probe.ts
+init_http();
+var FOUNDRY_SCOPE3 = "https://ai.azure.com/.default";
+function makeAgentsProbe(credential2, endpoint) {
+  return async () => {
+    try {
+      const r = await authedJsonResult({
+        credential: credential2,
+        scope: FOUNDRY_SCOPE3,
+        method: "GET",
+        url: `${endpoint}/agents?api-version=v1`,
+        okStatuses: [404, 500, 502, 503]
+        // don't throw — return the status so the loop classifies it
+      });
+      if (r.status === 200) return { ok: true, status: 200, message: "" };
+      const body = r.data?.error?.message ?? "";
+      return { ok: false, status: r.status, message: `${r.status.toString()} ${body}`.trim() };
+    } catch (e) {
+      return { ok: false, message: e instanceof Error ? e.message : String(e) };
+    }
+  };
+}
+function makeAgentProbe(credential2, endpoint, agentName) {
+  return async () => {
+    try {
+      const r = await authedJsonResult({
+        credential: credential2,
+        scope: FOUNDRY_SCOPE3,
+        method: "GET",
+        url: `${endpoint}/agents/${agentName}?api-version=v1`,
+        okStatuses: [404, 500, 502, 503]
+        // don't throw — return the status so the loop classifies it
+      });
+      if (r.status === 200) return { ok: true, status: 200, message: "" };
+      const body = r.data?.error?.message ?? "";
+      return { ok: false, status: r.status, message: `${r.status.toString()} ${body}`.trim() };
+    } catch (e) {
+      return { ok: false, message: e instanceof Error ? e.message : String(e) };
+    }
+  };
+}
+
+// src/lib/agent-ready.ts
+init_errors();
+async function awaitAgentQueryable(args) {
+  const attemptsMax = args.attempts ?? 40;
+  const intervalMs = args.intervalMs ?? 3e3;
+  const probe = args.probe ?? makeAgentProbe(args.credential, args.projectEndpoint, args.agentName);
+  const { ready, attempts } = await awaitDataPlaneReady({
+    probe,
+    consecutive: args.consecutive ?? 2,
+    attempts: attemptsMax,
+    intervalMs,
+    sleep: args.sleep,
+    onProgress: args.onProgress,
+    retryableStatuses: [404]
+  });
+  if (!ready) {
+    const approxSec = Math.round(attemptsMax * intervalMs / 1e3);
+    throw new LocalCliError({
+      code: "AGENT_NOT_QUERYABLE",
+      message: `Agent '${args.agentName}' did not become queryable within ${attempts.toString()} probes (~${approxSec.toString()}s) after deploy.`,
+      hint: "Foundry agent registration propagates asynchronously after deploy; a retry usually clears it. Re-run shortly (e.g. 'm8t bootstrap launch' or 'm8t a2a enable <name>').",
+      category: "data_plane_not_ready",
+      retryable: false
+    });
+  }
+  return { attempts };
+}
+
 // src/lib/persona-a2a.ts
 init_errors();
 init_esm();
@@ -15251,6 +15353,13 @@ async function enableA2a(args) {
   const connectionName = `a2a-${args.agentName}`;
   progress("Reading persona a2a-card\u2026");
   const { serialized: a2aCardJson } = readPersonaA2aCard(args.personaPath);
+  progress("Waiting for the agent to become queryable\u2026");
+  await awaitAgentQueryable({
+    credential: args.credential,
+    projectEndpoint: args.projectEndpoint,
+    agentName: args.agentName,
+    onProgress: args.onProgress
+  });
   progress("Reading current agent definition\u2026");
   const current = await getAgentVersion({ credential: args.credential, projectEndpoint: args.projectEndpoint, agentName: args.agentName });
   if (current.definition.kind === "hosted") {
@@ -22147,62 +22256,6 @@ var FoundryCreateCommand = class extends M8tCommand {
 // src/commands/foundry/await-ready.ts
 import { Command as Command44, Option as Option42 } from "clipanion";
 import { AzureCliCredential as AzureCliCredential2 } from "@azure/identity";
-
-// src/lib/data-plane-ready.ts
-init_errors();
-async function awaitDataPlaneReady(opts) {
-  const consecutive = opts.consecutive ?? 3;
-  const attempts = opts.attempts ?? 60;
-  const intervalMs = opts.intervalMs ?? 5e3;
-  const sleep2 = opts.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-  let streak = 0;
-  for (let i = 1; i <= attempts; i++) {
-    const r = await opts.probe();
-    if (r.ok) {
-      streak++;
-      opts.onProgress?.(`data-plane ok (${streak.toString()}/${consecutive.toString()})`);
-      if (streak >= consecutive) return { ready: true, attempts: i };
-    } else {
-      const cls = classifyFoundryError({ status: r.status, message: r.message ?? "" });
-      if (!cls.retryable) {
-        throw new LocalCliError({
-          code: "FOUNDRY_NOT_READY_FATAL",
-          message: `Foundry data plane returned a non-retryable error: ${cls.message}`,
-          hint: "This is not a transient data-plane delay \u2014 check `az login`/permissions and the endpoint."
-        });
-      }
-      streak = 0;
-      opts.onProgress?.(`data-plane not ready (${cls.category}), waiting\u2026`);
-    }
-    if (i < attempts) await sleep2(intervalMs);
-  }
-  return { ready: false, attempts };
-}
-
-// src/lib/foundry-ready-probe.ts
-init_http();
-var FOUNDRY_SCOPE3 = "https://ai.azure.com/.default";
-function makeAgentsProbe(credential2, endpoint) {
-  return async () => {
-    try {
-      const r = await authedJsonResult({
-        credential: credential2,
-        scope: FOUNDRY_SCOPE3,
-        method: "GET",
-        url: `${endpoint}/agents?api-version=v1`,
-        okStatuses: [404, 500, 502, 503]
-        // don't throw — return the status so the loop classifies it
-      });
-      if (r.status === 200) return { ok: true, status: 200, message: "" };
-      const body = r.data?.error?.message ?? "";
-      return { ok: false, status: r.status, message: `${r.status.toString()} ${body}`.trim() };
-    } catch (e) {
-      return { ok: false, message: e instanceof Error ? e.message : String(e) };
-    }
-  };
-}
-
-// src/commands/foundry/await-ready.ts
 init_errors();
 var FoundryAwaitReadyCommand = class extends M8tCommand {
   static paths = [["foundry", "await-ready"]];
@@ -23106,9 +23159,9 @@ function companyProfileBodyEquals(a, b) {
   const strip = (s) => s.replace(/^(created|updated):.*$/gm, "").trim();
   return strip(a) === strip(b);
 }
-function upsertMemoryIndex(existing, line2) {
+function upsertMemoryIndex(existing, line2, targetPath2 = COMPANY_PROFILE_PATH) {
   const lines = existing.split("\n");
-  const existingIdx = lines.findIndex((l) => l.includes(`\`${COMPANY_PROFILE_PATH}\``));
+  const existingIdx = lines.findIndex((l) => l.includes(`\`${targetPath2}\``));
   if (existingIdx >= 0) {
     lines[existingIdx] = line2;
     return lines.join("\n");
@@ -23120,6 +23173,88 @@ function upsertMemoryIndex(existing, line2) {
   }
   return existing.replace(/\s*$/, "\n\n") + line2 + "\n";
 }
+var FOUNDER_RECORD_PATH = "memory/founder.md";
+var NOT_CAPTURED = "_not captured yet \u2014 add it anytime (run `m8t bootstrap seed-profile`, or just tell me)_";
+function renderFounderRecord(block, inputs, now = (/* @__PURE__ */ new Date()).toISOString()) {
+  const pick = (...vals) => vals.map((v) => v?.trim()).find(Boolean) ?? "";
+  const founderName = pick(block.founder_name, inputs.azIdentity?.name);
+  const founderEmail = pick(block.founder_email, inputs.azIdentity?.email);
+  const advisorName = (block.advisor_name ?? "").trim();
+  const advisorEmail = (block.advisor_email ?? "").trim();
+  const subscription = (inputs.subscriptionId ?? "").trim();
+  const teamSize = (block.team_size ?? "").trim();
+  const advisorRendered = advisorName || advisorEmail ? [advisorName, advisorEmail ? `<${advisorEmail}>` : ""].filter(Boolean).join(" ") : NOT_CAPTURED;
+  const founderMd = [
+    `---`,
+    `type: memory`,
+    `title: "Founder & install context"`,
+    `created: ${now}`,
+    `updated: ${now}`,
+    `tags: [founder, install-context, onboarding]`,
+    `origin: operator`,
+    `---`,
+    ``,
+    `# Founder & install context`,
+    ``,
+    `_Seeded at onboarding from your Azure identity + the questionnaire. Authoritative \u2014 read it; don't rewrite it (origin: operator)._`,
+    ``,
+    `- **Founder:** ${founderName || NOT_CAPTURED}`,
+    `- **Founder email (company_email):** ${founderEmail || NOT_CAPTURED}`,
+    `- **Microsoft Startup Advisor (SA):** ${advisorRendered}`,
+    `- **Azure subscription:** ${subscription || NOT_CAPTURED}`,
+    `- **Team size:** ${teamSize || "\u2014"}`,
+    ``
+  ].join("\n");
+  const idxAdvisor = advisorEmail || advisorName || "\u2014";
+  const idxSub = subscription ? `${subscription.slice(0, 8)}\u2026` : "\u2014";
+  const memoryIndexLine = `- \`${FOUNDER_RECORD_PATH}\` \u2014 **Founder & install context**: ${founderName || "founder"} \xB7 advisor ${idxAdvisor} \xB7 sub ${idxSub}. (seeded from onboarding)`;
+  return { founderMd, memoryIndexLine };
+}
+function founderRecordBodyEquals(a, b) {
+  const strip = (s) => s.replace(/^(created|updated):.*$/gm, "").trim();
+  return strip(a) === strip(b);
+}
+
+// src/lib/founder-identity.ts
+function deriveEmailCandidate(raw) {
+  const mail = (raw.mail ?? "").trim();
+  if (mail) return mail;
+  const upn = (raw.upn ?? "").trim();
+  if (!upn) return "";
+  const ext = upn.indexOf("#EXT#");
+  if (ext > 0) {
+    const local = upn.slice(0, ext);
+    const at = local.lastIndexOf("_");
+    return at > 0 ? `${local.slice(0, at)}@${local.slice(at + 1)}` : "";
+  }
+  return upn.includes("@") ? upn : "";
+}
+async function getSignedInUserIdentity(runAzImpl = runAz) {
+  try {
+    const raw = await runAzImpl([
+      "ad",
+      "signed-in-user",
+      "show",
+      "--query",
+      "{displayName:displayName, mail:mail, upn:userPrincipalName}",
+      "-o",
+      "json"
+    ]);
+    const p = JSON.parse(raw);
+    return { name: (p.displayName ?? "").trim(), email: deriveEmailCandidate({ mail: p.mail, upn: p.upn }) };
+  } catch {
+    return { name: "", email: "" };
+  }
+}
+function composeFounderIdentityNote(id) {
+  if (id.name && id.email) {
+    return `You're speaking with **${id.name}**, signed in to Azure (their email looks like **${id.email}**). Open by confirming both, in your own voice \u2014 e.g. "I see you're signed in as ${id.name}, and I'll use ${id.email} for your advisor handoffs and cost reports \u2014 is that right, or should I change either?" Record exactly what they approve or correct.`;
+  }
+  if (id.name) {
+    return `You're speaking with **${id.name}** (signed in to Azure). Confirm their name, then ask for the best contact email to reach them (that's where advisor handoffs and cost reports go).`;
+  }
+  return `Ask the founder their name and the best contact email to reach them (that's where advisor handoffs and cost reports go).`;
+}
 
 // src/lib/company-profile-seed.ts
 function readGithubAppCreds(credsPath) {
@@ -23134,18 +23269,21 @@ async function resolveSeedContext(opts) {
   const appCreds = opts.appCredsOverride ?? readGithubAppCreds(opts.credsPath);
   if (!appCreds) return null;
   let endpoint = opts.endpointOverride;
+  let subscriptionId = opts.subscriptionId;
   if (!endpoint) {
     const state = await readBootstrapState();
     if (!state) {
       throw new LocalCliError({ code: "BOOTSTRAP_NO_STATE", message: "No bootstrap state found.", hint: "Run 'm8t bootstrap launch' first, or pass --endpoint." });
     }
+    subscriptionId ??= state.subscriptionId;
     const doc = await readStatusBlob({ saName: state.statusSaName, resourceGroup: state.resourceGroup, subscriptionId: state.subscriptionId });
     endpoint = doc.result?.foundryEndpoint;
     if (!endpoint) {
       throw new LocalCliError({ code: "SEED_NO_ENDPOINT", message: "Could not resolve the Foundry endpoint from the install status.", hint: "Pass --endpoint <foundryEndpoint>." });
     }
   }
-  return { endpoint, brainRepo: opts.brainOverride ?? `${appCreds.org}/stacey-brain`, appCreds };
+  const brainRepos = opts.brainOverride ? [opts.brainOverride] : [`${appCreds.org}/stacey-brain`, `${appCreds.org}/azzy-brain`];
+  return { endpoint, brainRepos, appCreds, subscriptionId };
 }
 async function applyProfileToBrain(args) {
   const token = await mintInstallationTokenFromPem({
@@ -23154,20 +23292,31 @@ async function applyProfileToBrain(args) {
     installationId: args.appCreds.installationId,
     fetchImpl: args.fetchImpl
   });
-  const { profileMd, memoryIndexLine } = renderCompanyProfile(args.block, args.now);
-  const existingProfile = await readRepoFileViaApp({ token, repo: args.brainRepo, path: COMPANY_PROFILE_PATH, fetchImpl: args.fetchImpl });
-  const existingIndex = await readRepoFileViaApp({ token, repo: args.brainRepo, path: "memory/MEMORY.md", fetchImpl: args.fetchImpl }) ?? DEFAULT_MEMORY_INDEX_HEADER;
-  const nextIndex = upsertMemoryIndex(existingIndex, memoryIndexLine);
-  if (existingProfile && companyProfileBodyEquals(existingProfile, profileMd) && nextIndex === existingIndex) {
+  const { profileMd, memoryIndexLine: companyLine } = renderCompanyProfile(args.block, args.now);
+  const { founderMd, memoryIndexLine: founderLine } = renderFounderRecord(
+    args.block,
+    { subscriptionId: args.subscriptionId, azIdentity: args.azIdentity },
+    args.now
+  );
+  const read = (p) => readRepoFileViaApp({ token, repo: args.brainRepo, path: p, fetchImpl: args.fetchImpl });
+  const existingProfile = await read(COMPANY_PROFILE_PATH);
+  const existingFounder = await read(FOUNDER_RECORD_PATH);
+  const existingIndex = await read("memory/MEMORY.md") ?? DEFAULT_MEMORY_INDEX_HEADER;
+  let nextIndex = upsertMemoryIndex(existingIndex, companyLine, COMPANY_PROFILE_PATH);
+  nextIndex = upsertMemoryIndex(nextIndex, founderLine, FOUNDER_RECORD_PATH);
+  const profileSame = existingProfile != null && companyProfileBodyEquals(existingProfile, profileMd);
+  const founderSame = existingFounder != null && founderRecordBodyEquals(existingFounder, founderMd);
+  if (profileSame && founderSame && nextIndex === existingIndex) {
     return;
   }
   await commitFilesViaApp({
     token,
     repo: args.brainRepo,
     branch: args.branch,
-    message: "seed(brain): company profile from onboarding questionnaire",
+    message: "seed(brain): founder + company profile from onboarding",
     files: [
       { path: COMPANY_PROFILE_PATH, content: profileMd },
+      { path: FOUNDER_RECORD_PATH, content: founderMd },
       { path: "memory/MEMORY.md", content: nextIndex }
     ],
     fetchImpl: args.fetchImpl
@@ -23187,20 +23336,31 @@ function spawnDetachedSeedWatch() {
   }
 }
 async function reactiveSeedOnFinish(args) {
-  const ctx = await resolveSeedContext({ endpointOverride: args.endpoint, appCredsOverride: args.appCredsOverride });
+  const ctx = await resolveSeedContext({ endpointOverride: args.endpoint, appCredsOverride: args.appCredsOverride, subscriptionId: args.subscriptionId });
   if (!ctx) return;
   const token = await (args.getFoundryTokenImpl ?? getFoundryToken)();
   const { hadIntake, block } = await findOnboardingProfile({ endpoint: ctx.endpoint, token, fetchImpl: args.fetchImpl });
   if (block) {
-    await applyProfileToBrain({ block, brainRepo: ctx.brainRepo, branch: "main", appCreds: ctx.appCreds, fetchImpl: args.fetchImpl });
-    args.stdout(`${colors.success("\u2713")} Clever Stacey now knows your company (seeded ${ctx.brainRepo}).
+    const azIdentity = args.azIdentity ?? await (args.getSignedInUserIdentityImpl ?? getSignedInUserIdentity)();
+    for (const brainRepo of ctx.brainRepos) {
+      await applyProfileToBrain({
+        block,
+        brainRepo,
+        branch: "main",
+        appCreds: ctx.appCreds,
+        subscriptionId: ctx.subscriptionId,
+        azIdentity,
+        fetchImpl: args.fetchImpl
+      });
+    }
+    args.stdout(`${colors.success("\u2713")} Your advisors now know your company + how to reach you (seeded ${ctx.brainRepos.join(", ")}).
 `);
     return;
   }
   if (!hadIntake) return;
   (args.spawnWatch ?? spawnDetachedSeedWatch)();
   args.stdout(
-    `${colors.dim("\u2139 Stacey will pick up your company profile when you finish the questionnaire (watching in the background).")}
+    `${colors.dim("\u2139 Your advisors will pick up your company profile when you finish the questionnaire (watching in the background).")}
   ${colors.hint("or run:")} m8t bootstrap seed-profile
 `
   );
@@ -23317,6 +23477,7 @@ ${colors.field("Then open a brand new chat/session")} \u2014 new skills + MCP se
     try {
       await reactiveSeedOnFinish({
         endpoint: doc.result?.foundryEndpoint,
+        subscriptionId,
         stdout: (s) => this.context.stdout.write(s)
       });
     } catch (e) {
@@ -23563,7 +23724,8 @@ async function deploySimpleStacey(args) {
       endpoint: args.endpoint,
       repoRoot: args.repoRoot,
       persona: SIMPLE_STACEY_PERSONA,
-      agentName: SIMPLE_STACEY_AGENT
+      agentName: SIMPLE_STACEY_AGENT,
+      fieldOverrides: args.fieldOverrides
     });
   } catch (e) {
     if (e && typeof e === "object" && "code" in e) {
@@ -23681,7 +23843,13 @@ var BootstrapUiCommand = class extends M8tCommand {
     const oid = await getSignedInUserOid();
     await ensureFounderFoundryRole({ credential: credential2, subscriptionId: state.subscriptionId, principalId: oid, accountScope });
     out("deploying Simple Stacey (stacey-intake)\u2026");
-    const version = await deploySimpleStacey({ credential: credential2, endpoint, repoRoot });
+    const identity = await getSignedInUserIdentity();
+    const version = await deploySimpleStacey({
+      credential: credential2,
+      endpoint,
+      repoRoot,
+      fieldOverrides: { founder_identity_note: composeFounderIdentityNote(identity) }
+    });
     const envPath = writeWebEnvLocal({
       repoRoot,
       tenantId: account.tenantId,
@@ -23734,8 +23902,8 @@ import { Command as Command51, Option as Option49 } from "clipanion";
 var BootstrapSeedProfileCommand = class extends M8tCommand {
   static paths = [["bootstrap", "seed-profile"]];
   static usage = Command51.Usage({
-    description: "Seed Clever Stacey's brain with the company profile from the onboarding questionnaire.",
-    details: "Reads the latest stacey-intake conversation, renders memory/company-profile.md (+ its MEMORY.md index line), and commits both to <org>/stacey-brain via the GitHub App. Idempotent. --watch polls until the founder completes the questionnaire.",
+    description: "Seed your advisors' brains with the founder + company profile from the onboarding questionnaire.",
+    details: "Reads the latest stacey-intake conversation, renders memory/founder.md + memory/company-profile.md (+ their MEMORY.md index lines), and commits them to both <org>/stacey-brain and <org>/azzy-brain via the GitHub App. Idempotent. --watch polls until the founder completes the questionnaire.",
     examples: [
       ["Seed now (idempotent)", "$0 bootstrap seed-profile"],
       ["Wait for the founder to finish", "$0 bootstrap seed-profile --watch"]
@@ -23767,8 +23935,11 @@ var BootstrapSeedProfileCommand = class extends M8tCommand {
       const token = await getFoundryToken();
       const { hadIntake, block } = await findOnboardingProfile({ endpoint: ctx.endpoint, token });
       if (block) {
-        await applyProfileToBrain({ block, brainRepo: ctx.brainRepo, branch: "main", appCreds: ctx.appCreds });
-        this.context.stdout.write(`${colors.success("\u2713")} seeded Clever Stacey's brain (${ctx.brainRepo}) from your questionnaire.
+        const azIdentity = await getSignedInUserIdentity();
+        for (const brainRepo of ctx.brainRepos) {
+          await applyProfileToBrain({ block, brainRepo, branch: "main", appCreds: ctx.appCreds, subscriptionId: ctx.subscriptionId, azIdentity });
+        }
+        this.context.stdout.write(`${colors.success("\u2713")} seeded your advisors' brains (${ctx.brainRepos.join(", ")}) from your questionnaire.
 `);
         return 0;
       }