@brainbase-labs/cli 0.17.0 → 0.19.0

package/dist/index.js

@@ -32012,7 +32012,7 @@ var require_schemes = __commonJS((exports, module) => {
     urnComponent.nss = (uuidComponent.uuid || "").toLowerCase();
     return urnComponent;
   }
-  var http2 = {
+  var http = {
     scheme: "http",
     domainHost: true,
     parse: httpParse,
@@ -32020,7 +32020,7 @@ var require_schemes = __commonJS((exports, module) => {
   };
   var https = {
     scheme: "https",
-    domainHost: http2.domainHost,
+    domainHost: http.domainHost,
     parse: httpParse,
     serialize: httpSerialize
   };
@@ -32049,7 +32049,7 @@ var require_schemes = __commonJS((exports, module) => {
     skipNormalize: true
   };
   var SCHEMES = {
-    http: http2,
+    http,
     https,
     ws: ws2,
     wss,
@@ -35141,7 +35141,7 @@ var require_dist2 = __commonJS((exports, module) => {
 });
 
 // src/index.ts
-var import_picocolors44 = __toESM(require_picocolors(), 1);
+var import_picocolors48 = __toESM(require_picocolors(), 1);
 import process14 from "node:process";
 import fs79 from "node:fs";
 
@@ -36008,7 +36008,7 @@ function padStart(s, n) {
 // package.json
 var package_default = {
   name: "@brainbase-labs/cli",
-  version: "0.17.0",
+  version: "0.19.0",
   description: "Pack, share, and install agent templates across harnesses (Claude Code, Codex, ...).",
   type: "module",
   bin: {
@@ -40969,9 +40969,6 @@ function writeAuthUnlocked(s) {
     fs6.chmodSync(AUTH_FILE, 384);
   } catch {}
 }
-function writeAuth(s) {
-  withAuthLock(() => writeAuthUnlocked(s));
-}
 function clearAuth() {
   withAuthLock(() => {
     if (exists(AUTH_FILE))
@@ -54248,6 +54245,22 @@ var api = {
       body: JSON.stringify({ name })
     });
   },
+  async listAgents(orgId, teamId) {
+    const path58 = `/orgs/${encodeURIComponent(orgId)}/teams/${encodeURIComponent(teamId)}/agents`;
+    let body;
+    try {
+      body = await request(path58);
+    } catch (err) {
+      if (err instanceof ApiError && err.status === 404) {
+        throw new ApiError("This control plane does not support listing agents yet. Update the server, or use the web app to find the agent id.", 404, err.body);
+      }
+      throw err;
+    }
+    if (!Array.isArray(body)) {
+      throw new ApiError(`Unexpected response listing agents: expected an array from ${path58}.`, undefined, body);
+    }
+    return body;
+  },
   createAgent(input) {
     if (usesLegacyControlPlane() && (input.machine_kind !== undefined || input.default_model !== undefined)) {
       return Promise.reject(legacyAgentConfigError());
@@ -61140,12 +61153,183 @@ function printSkillHelp() {
 }
 
 // src/cli/login.ts
-import http from "node:http";
-import net from "node:net";
-import { randomBytes } from "node:crypto";
 import { spawn } from "node:child_process";
 var import_picocolors21 = __toESM(require_picocolors(), 1);
 
+// src/core/login-poll.ts
+var DEFAULT_LOGIN_TIMEOUT_MS = 10 * 60 * 1000;
+var MIN_LOGIN_TIMEOUT_MS = 30000;
+var DEFAULT_POLL_INTERVAL_MS = 2000;
+var MIN_POLL_INTERVAL_MS = 500;
+var REQUEST_TIMEOUT_MS = 1e4;
+var MAX_CONSECUTIVE_FAILURES = 20;
+
+class LoginTimeoutError extends Error {
+  constructor(timeoutMs, lastError) {
+    super(`Login timed out after ${Math.round(timeoutMs / 1000)}s` + (lastError ? ` (last error: ${lastError})` : ""));
+    this.name = "LoginTimeoutError";
+  }
+}
+function sleep(ms2) {
+  return new Promise((resolve) => setTimeout(resolve, ms2));
+}
+var MAX_POLL_INTERVAL_MS = 60000;
+function backoffInterval(res, current) {
+  const header = Number(res.headers.get("Retry-After"));
+  const suggested = Number.isFinite(header) && header > 0 ? header * 1000 : current * 2;
+  return Math.min(Math.max(suggested, current), MAX_POLL_INTERVAL_MS);
+}
+function clamp2(value, min2, max2) {
+  if (!Number.isFinite(value))
+    return min2;
+  return Math.min(Math.max(value, min2), max2);
+}
+function unsupportedDeployment(webBase) {
+  return new Error(`${webBase} does not support device login. Update the Brainbase console, or point at another deployment with \`brainbase login --web <url>\`.`);
+}
+var UNSAFE_URI_CHARS = /[\s"'`$&|;<>^(){}\\!*]/;
+function resolveVerificationUri(webBase, uri) {
+  const fallback = `${webBase}/cli/auth`;
+  let base2;
+  try {
+    base2 = new URL(`${webBase}/`);
+  } catch {
+    return fallback;
+  }
+  let resolved;
+  try {
+    resolved = new URL(uri, base2);
+  } catch {
+    return fallback;
+  }
+  if (resolved.origin !== base2.origin)
+    return fallback;
+  if (resolved.protocol !== "http:" && resolved.protocol !== "https:") {
+    return fallback;
+  }
+  const path73 = `${resolved.pathname}${resolved.search}${resolved.hash}`;
+  if (UNSAFE_URI_CHARS.test(path73))
+    return fallback;
+  return resolved.toString();
+}
+async function readJson2(res) {
+  try {
+    const body = await res.json();
+    return body && typeof body === "object" ? body : null;
+  } catch {
+    return null;
+  }
+}
+var JSON_HEADERS = {
+  "Content-Type": "application/json",
+  Accept: "application/json"
+};
+async function startDeviceAuthorization(options) {
+  const { webBase, fetchImpl = fetch } = options;
+  const url = `${webBase}/api/cli/auth/device`;
+  let res;
+  try {
+    res = await fetchImpl(url, {
+      method: "POST",
+      headers: JSON_HEADERS,
+      body: "{}",
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+    });
+  } catch (err) {
+    throw new Error(`Could not reach ${url}: ${err.message}`);
+  }
+  if (res.status === 404)
+    throw unsupportedDeployment(webBase);
+  if (!res.ok) {
+    throw new Error(`Could not start login (${webBase} returned ${res.status}).`);
+  }
+  const body = await readJson2(res);
+  if (!body?.device_code || !body.user_code) {
+    throw unsupportedDeployment(webBase);
+  }
+  return {
+    deviceCode: body.device_code,
+    userCode: body.user_code,
+    verificationUri: resolveVerificationUri(webBase, body.verification_uri ?? "/cli/auth"),
+    intervalMs: clamp2(body.interval ? body.interval * 1000 : DEFAULT_POLL_INTERVAL_MS, MIN_POLL_INTERVAL_MS, MAX_POLL_INTERVAL_MS),
+    expiresInMs: clamp2(body.expires_in ? body.expires_in * 1000 : DEFAULT_LOGIN_TIMEOUT_MS, MIN_LOGIN_TIMEOUT_MS, DEFAULT_LOGIN_TIMEOUT_MS)
+  };
+}
+async function awaitDeviceSession(options) {
+  const {
+    webBase,
+    authorization,
+    timeoutMs = Math.min(authorization.expiresInMs, DEFAULT_LOGIN_TIMEOUT_MS),
+    now: now2 = Date.now,
+    wait = sleep,
+    fetchImpl = fetch
+  } = options;
+  const url = `${webBase}/api/cli/auth/device/token`;
+  const deadline = now2() + timeoutMs;
+  let consecutiveFailures = 0;
+  let intervalMs = authorization.intervalMs;
+  let lastError;
+  while (now2() < deadline) {
+    let res;
+    try {
+      res = await fetchImpl(url, {
+        method: "POST",
+        headers: JSON_HEADERS,
+        body: JSON.stringify({ device_code: authorization.deviceCode }),
+        signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
+      });
+    } catch (err) {
+      lastError = err.message;
+      if (++consecutiveFailures >= MAX_CONSECUTIVE_FAILURES) {
+        throw new Error(`Could not reach ${url}: ${lastError}`);
+      }
+      await wait(intervalMs);
+      continue;
+    }
+    if (res.status === 410) {
+      throw new Error("This login expired. Run `brainbase login` again.");
+    }
+    if (res.status === 409) {
+      throw new Error("This login was already completed on another device. Run `brainbase login` again.");
+    }
+    if (res.status === 404)
+      throw unsupportedDeployment(webBase);
+    if (res.status === 429) {
+      consecutiveFailures = 0;
+      intervalMs = backoffInterval(res, intervalMs);
+      lastError = "the server asked us to slow down";
+      await wait(intervalMs);
+      continue;
+    }
+    if (!res.ok) {
+      lastError = `poll returned ${res.status}`;
+      if (res.status >= 400 && res.status < 500) {
+        const detail = (await readJson2(res))?.error;
+        throw new Error(typeof detail === "string" ? detail : `The server rejected this login (${res.status}). Run \`brainbase login\` again.`);
+      }
+      if (++consecutiveFailures >= MAX_CONSECUTIVE_FAILURES) {
+        throw new Error(`Could not reach ${url}: ${lastError}`);
+      }
+      await wait(intervalMs);
+      continue;
+    }
+    consecutiveFailures = 0;
+    const body = await readJson2(res);
+    if (!body) {
+      throw unsupportedDeployment(webBase);
+    }
+    if (body.status === "ready") {
+      const session = body.session;
+      if (!session) {
+        throw new Error("The server said the login was ready but sent no session. Run `brainbase login` again.");
+      }
+      return session;
+    }
+    await wait(intervalMs);
+  }
+  throw new LoginTimeoutError(timeoutMs, lastError);
+}
+
 // src/ui/ink/WelcomeCard.tsx
 var jsx_dev_runtime14 = __toESM(require_jsx_dev_runtime(), 1);
 function WelcomeCard(props) {
@@ -61224,143 +61408,132 @@ async function showWelcomeCard(props) {
 
 // src/cli/login.ts
 var DEFAULT_WEB_URL = "https://app.brainbaselabs.com";
-var LOGIN_TIMEOUT_MS = 5 * 60 * 1000;
 function resolveLoginWebBase(web, envWeb = process.env.BRAINBASE_WEB_URL) {
   const override = web?.trim() || envWeb?.trim() || DEFAULT_WEB_URL;
   return override.replace(/\/+$/, "");
 }
+function isInsecureWebBase(webBase) {
+  let url;
+  try {
+    url = new URL(webBase);
+  } catch {
+    return false;
+  }
+  if (url.protocol !== "http:")
+    return false;
+  return !["127.0.0.1", "localhost", "[::1]", "::1"].includes(url.hostname);
+}
 function openInBrowser(url) {
-  const platform2 = process.platform;
-  const cmd = platform2 === "darwin" ? "open" : platform2 === "win32" ? "cmd" : "xdg-open";
-  const args = platform2 === "win32" ? ["/c", "start", '""', url] : [url];
-  spawn(cmd, args, { stdio: "ignore", detached: true }).unref();
-}
-function getFreePort() {
-  return new Promise((resolve, reject2) => {
-    const srv = net.createServer();
-    srv.unref();
-    srv.on("error", reject2);
-    srv.listen(0, "127.0.0.1", () => {
-      const addr = srv.address();
-      if (typeof addr === "object" && addr) {
-        const port = addr.port;
-        srv.close(() => resolve(port));
-      } else {
-        srv.close();
-        reject2(new Error("no port"));
-      }
+  const [cmd, args] = process.platform === "darwin" ? ["open", [url]] : process.platform === "win32" ? ["rundll32.exe", ["url.dll,FileProtocolHandler", url]] : ["xdg-open", [url]];
+  try {
+    const child = spawn(cmd, args, {
+      stdio: "ignore",
+      detached: true
     });
-  });
+    child.on("error", () => {});
+    child.unref();
+  } catch {}
 }
-async function readBody(req) {
-  return new Promise((resolve, reject2) => {
-    const chunks = [];
-    req.on("data", (c2) => chunks.push(c2));
-    req.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
-    req.on("error", reject2);
-  });
+function displayUserCode(code) {
+  return code.replace(/[^A-Za-z0-9-]/g, "");
+}
+function isLoopbackUrl(url) {
+  return ["127.0.0.1", "localhost", "[::1]", "::1"].includes(url.hostname);
+}
+function assertNoTransportDowngrade(session, webBase) {
+  let base2;
+  try {
+    base2 = new URL(webBase);
+  } catch {
+    return;
+  }
+  if (base2.protocol !== "https:")
+    return;
+  for (const [field, value] of [
+    ["server", session.server],
+    ["control_plane_url", session.control_plane_url],
+    ["supabase_url", session.supabase_url]
+  ]) {
+    if (!value)
+      continue;
+    let url;
+    try {
+      url = new URL(value);
+    } catch {
+      throw new Error(`The server returned an unusable ${field} (${value}).`);
+    }
+    if (url.protocol !== "https:" && !isLoopbackUrl(url)) {
+      throw new Error(`${webBase} returned a plaintext ${field} (${value}). Refusing to store it — every later command would send your token over an unencrypted connection.`);
+    }
+  }
+}
+function toAuthSession(session, webBase) {
+  if (!session.access_token || !session.user_id) {
+    throw new Error("The server returned an incomplete session.");
+  }
+  assertNoTransportDowngrade(session, webBase);
+  const optional = (value) => value ?? undefined;
+  const stored = {
+    schemaVersion: 1,
+    access_token: session.access_token,
+    refresh_token: optional(session.refresh_token),
+    expires_at: optional(session.expires_at),
+    user_id: session.user_id,
+    email: optional(session.email),
+    server: optional(session.server),
+    control_plane_url: normalizeControlPlaneUrl(optional(session.control_plane_url)),
+    supabase_url: optional(session.supabase_url),
+    supabase_anon_key: optional(session.supabase_anon_key),
+    authedAt: new Date().toISOString()
+  };
+  const parsed = AuthSessionSchema.safeParse(stored);
+  if (!parsed.success) {
+    throw new Error(`The server returned a session this CLI cannot store (${parsed.error.issues[0]?.path.join(".") || "unknown field"}).`);
+  }
+  return parsed.data;
+}
+async function withCancelOnInterrupt(body) {
+  const onInterrupt = () => {
+    f2.warn("Cancelled. Nothing was saved.");
+    process.exit(130);
+  };
+  process.prependListener("SIGINT", onInterrupt);
+  try {
+    return await body();
+  } finally {
+    process.removeListener("SIGINT", onInterrupt);
+  }
 }
 async function runLogin(_cwd, args) {
   banner("login — connect this device to brainbase");
   const webBase = resolveLoginWebBase(args.web);
-  const expectedState = randomBytes(16).toString("hex");
-  const port = await getFreePort();
-  const callback = `http://127.0.0.1:${port}/cb`;
-  const url = `${webBase}/cli/auth?callback=${encodeURIComponent(callback)}&state=${expectedState}`;
-  let resolveResult;
-  let rejectResult;
-  const result2 = new Promise((res, rej) => {
-    resolveResult = res;
-    rejectResult = rej;
-  });
-  const corsOrigin = webBase;
-  const server = http.createServer(async (req, res) => {
-    const reqOrigin = req.headers.origin ?? corsOrigin;
-    res.setHeader("Access-Control-Allow-Origin", reqOrigin);
-    res.setHeader("Access-Control-Allow-Methods", "POST, OPTIONS");
-    res.setHeader("Access-Control-Allow-Headers", "Content-Type");
-    res.setHeader("Vary", "Origin");
-    if (req.method === "OPTIONS") {
-      res.writeHead(204).end();
-      return;
-    }
-    if (req.method === "GET" && (req.url === "/" || req.url === "/cb")) {
-      res.writeHead(200, { "Content-Type": "text/plain" });
-      res.end("brainbase login server is alive. Complete sign-in in your browser.");
-      return;
-    }
-    if (req.method === "POST" && req.url === "/cb") {
-      try {
-        const body = await readBody(req);
-        const payload = JSON.parse(body);
-        if (payload.state !== expectedState) {
-          res.writeHead(400, { "Content-Type": "application/json" });
-          res.end(JSON.stringify({ error: "state mismatch" }));
-          return;
-        }
-        if (!payload.access_token || !payload.user_id) {
-          res.writeHead(400, { "Content-Type": "application/json" });
-          res.end(JSON.stringify({ error: "missing fields" }));
-          return;
-        }
-        const session = {
-          schemaVersion: 1,
-          access_token: payload.access_token,
-          refresh_token: payload.refresh_token,
-          expires_at: payload.expires_at,
-          user_id: payload.user_id,
-          email: payload.email,
-          server: payload.server,
-          control_plane_url: normalizeControlPlaneUrl(payload.control_plane_url),
-          supabase_url: payload.supabase_url,
-          supabase_anon_key: payload.supabase_anon_key,
-          authedAt: new Date().toISOString()
-        };
-        writeAuth(session);
-        res.writeHead(200, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ ok: true }));
-        resolveResult(session);
-      } catch (err) {
-        res.writeHead(500, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ error: err.message }));
-        rejectResult(err);
-      }
-      return;
-    }
-    res.writeHead(404).end();
-  });
-  await new Promise((resolve, reject2) => {
-    server.once("error", reject2);
-    server.listen(port, "127.0.0.1", () => resolve());
-  });
-  f2.info(`Opening ${import_picocolors21.default.cyan(`${webBase}/cli/auth`)} in your browser…`);
-  f2.info(import_picocolors21.default.dim(`If it doesn't open, visit:`));
-  console.log(import_picocolors21.default.dim("  ") + url);
-  openInBrowser(url);
   const spinner = de();
-  spinner.start("Waiting for browser sign-in (Ctrl-C to cancel)");
-  const timeout = setTimeout(() => {
-    spinner.stop("Timed out.");
-    server.close();
-    rejectResult(new Error(`Login timed out after ${LOGIN_TIMEOUT_MS / 1000}s`));
-  }, LOGIN_TIMEOUT_MS);
+  let spinning = false;
+  if (isInsecureWebBase(webBase)) {
+    f2.warn(import_picocolors21.default.yellow(`${webBase} is not HTTPS — your session would cross the network in the clear.`));
+  }
   try {
-    const session = await result2;
-    clearTimeout(timeout);
-    server.close();
+    const authorization = await startDeviceAuthorization({ webBase });
+    f2.step(`Your code: ${import_picocolors21.default.bold(import_picocolors21.default.cyan(displayUserCode(authorization.userCode)))}`);
+    f2.info(`Enter it at ${import_picocolors21.default.cyan(authorization.verificationUri)}`);
+    f2.info(import_picocolors21.default.dim("Opening your browser…"));
+    openInBrowser(authorization.verificationUri);
+    spinner.start("Waiting for you to approve in the browser (Ctrl-C to cancel)");
+    spinning = true;
+    const session = await withCancelOnInterrupt(() => awaitDeviceSession({ webBase, authorization }));
+    const stored = toAuthSession(session, webBase);
     spinner.stop("Authorized.");
+    spinning = false;
     $e("Welcome to brainbase.");
-    if (session) {
-      await showWelcomeCard({
-        email: session.email ?? session.user_id,
-        controlPlaneUrl: controlPlaneBaseUrl(session),
-        expiresAt: session.expires_at,
-        hint: "brainbase template pack — bundle your first agent"
-      });
-    }
+    await showWelcomeCard({
+      email: stored.email ?? stored.user_id,
+      controlPlaneUrl: controlPlaneBaseUrl(stored),
+      expiresAt: stored.expires_at,
+      hint: "brainbase template pack — bundle your first agent"
+    });
   } catch (err) {
-    clearTimeout(timeout);
-    server.close();
+    if (spinning)
+      spinner.stop("Login failed.");
     f2.error(err.message);
     process.exit(1);
   }
@@ -63027,7 +63200,7 @@ function runHarnessInstall(harnessId, components, opts, agentName) {
 }
 
 // src/cli/agent.ts
-var import_picocolors32 = __toESM(require_picocolors(), 1);
+var import_picocolors34 = __toESM(require_picocolors(), 1);
 
 // src/cli/agent-pull.ts
 import { spawn as spawn2 } from "node:child_process";
@@ -65336,7 +65509,7 @@ function formatExport(shell, key2, value) {
 
 // src/cli/agent-create.ts
 import path81 from "node:path";
-var import_picocolors31 = __toESM(require_picocolors(), 1);
+var import_picocolors32 = __toESM(require_picocolors(), 1);
 
 // src/ui/box.ts
 var import_picocolors30 = __toESM(require_picocolors(), 1);
@@ -65362,110 +65535,189 @@ function tip(text2, indent = 2) {
   return " ".repeat(indent) + import_picocolors30.default.dim("›") + " " + import_picocolors30.default.dim(text2);
 }
 
-// src/cli/agent-create.ts
-async function runAgentCreate(cwd2, args) {
-  banner("agent create — claim a brainbase.agent.yaml and link this folder");
-  let manifest = await loadOrScaffoldManifest(cwd2, args);
-  if (!manifest)
-    return;
-  if (manifest.id) {
-    f2.warn(`This folder already belongs to an agent — ${import_picocolors31.default.bold(manifest.agent.name)} (${import_picocolors31.default.dim(manifest.id)}).`);
-    f2.info(`If you want to detach it, run ${import_picocolors31.default.cyan("brainbase unlink")} first; or move to a different directory.`);
-    return;
+// src/core/org-team.ts
+var import_picocolors31 = __toESM(require_picocolors(), 1);
+class OrgTeamError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "OrgTeamError";
   }
-  const orgsSpinner = de();
-  orgsSpinner.start("Loading your organizations…");
-  let orgs;
+}
+async function loading(announce, message, done, fetch2) {
+  if (!announce)
+    return await fetch2();
+  const sp = de();
+  sp.start(message);
   try {
-    orgs = await api.listOrgs();
+    const value = await fetch2();
+    sp.stop(done(value));
+    return value;
   } catch (err) {
-    orgsSpinner.stop("Failed.");
-    handleApiError4(err);
-    return;
+    sp.stop("Failed.");
+    throw err;
   }
-  orgsSpinner.stop(`Found ${orgs.length} organization${orgs.length === 1 ? "" : "s"}.`);
+}
+async function chooseOne(opts) {
+  if (!opts.allowPrompt) {
+    throw new NonInteractiveError(`${opts.message} cannot be answered while emitting JSON. ${opts.flagHint}`);
+  }
+  return await select({
+    message: opts.message,
+    options: opts.options,
+    flagHint: opts.flagHint
+  });
+}
+async function resolveOrg(orgRef, opts = {}) {
+  if (orgRef === "") {
+    throw new OrgTeamError("--org needs a value: an organization id or slug.");
+  }
+  const orgs = await loading(opts.announce, "Loading your organizations…", (found) => `Found ${found.length} organization${found.length === 1 ? "" : "s"}.`, () => api.listOrgs());
   if (orgs.length === 0) {
-    f2.warn("You are not in any organizations yet.");
-    $e("Create one on the web app first, then come back.");
-    return;
+    throw new OrgTeamError("You are not a member of any organization. Create one in the web app first.");
   }
-  let org;
-  if (args.orgId) {
-    const found = orgs.find((o2) => o2.id === args.orgId || o2.slug === args.orgId);
+  if (orgRef) {
+    const found = orgs.find((o2) => o2.id === orgRef || o2.slug === orgRef);
     if (!found) {
-      f2.error(`Org ${args.orgId} not found or you're not a member.`);
-      return;
+      throw new OrgTeamError(`Org ${orgRef} not found, or you're not a member of it.`);
     }
-    org = found;
-  } else if (orgs.length === 1) {
-    org = orgs[0];
-    f2.info(`Using organization ${import_picocolors31.default.bold(org.name)}.`);
-  } else {
-    const orgId = await select({
-      message: "Pick an organization",
-      options: orgs.map((o2) => ({ value: o2.id, label: o2.name, hint: o2.role })),
-      flagHint: "Pass --org <id-or-slug> to choose non-interactively."
-    });
-    org = orgs.find((o2) => o2.id === orgId);
+    return found;
   }
-  const teamsSpinner = de();
-  teamsSpinner.start(`Loading teams in ${org.name}…`);
-  let teams;
-  try {
-    teams = await api.listTeams(org.id);
-  } catch (err) {
-    teamsSpinner.stop("Failed.");
-    handleApiError4(err);
-    return;
+  if (orgs.length === 1) {
+    const org = orgs[0];
+    if (opts.announce)
+      f2.info(`Using organization ${import_picocolors31.default.bold(org.name)}.`);
+    return org;
   }
-  teamsSpinner.stop(`Found ${teams.length} team${teams.length === 1 ? "" : "s"}.`);
-  let team;
+  const orgId = await chooseOne({
+    message: "Which organization?",
+    options: orgs.map((o2) => ({ value: o2.id, label: o2.name, hint: o2.role })),
+    flagHint: "Pass --org <id-or-slug>.",
+    allowPrompt: opts.allowPrompt !== false
+  });
+  return orgs.find((o2) => o2.id === orgId);
+}
+function canOfferTeamCreation(opts) {
+  return !!opts.offerCreateTeam && opts.allowPrompt !== false && opts.interactive;
+}
+function shouldAutoPickLoneTeam(opts) {
+  return opts.teamCount === 1 && !opts.canCreate;
+}
+async function resolveOrgAndTeam(args) {
+  if (args.orgId === "") {
+    throw new OrgTeamError("--org needs a value: an organization id or slug.");
+  }
+  if (args.teamId === "") {
+    throw new OrgTeamError("--team needs a value: a team id.");
+  }
+  if (args.teamId && !args.orgId) {
+    return await findTeamAcrossOrgs(args.teamId);
+  }
+  const org = await resolveOrg(args.orgId, {
+    allowPrompt: args.allowPrompt,
+    announce: args.announce
+  });
+  const teams = await loading(args.announce, `Loading teams in ${org.name}…`, (found) => `Found ${found.length} team${found.length === 1 ? "" : "s"}.`, () => api.listTeams(org.id));
   if (args.teamId) {
     const found = teams.find((t) => t.id === args.teamId);
     if (!found) {
-      f2.error(`Team ${args.teamId} not found in this org.`);
-      return;
+      throw new OrgTeamError(`Team ${args.teamId} not found in ${org.name}.`);
     }
-    team = found;
-  } else if (!isInteractive()) {
-    if (teams.length === 1) {
-      team = teams[0];
+    return { org, team: found };
+  }
+  const canCreate = canOfferTeamCreation({
+    offerCreateTeam: args.offerCreateTeam,
+    allowPrompt: args.allowPrompt,
+    interactive: isInteractive()
+  });
+  if (teams.length === 0 && !canCreate) {
+    throw new OrgTeamError(`${org.name} has no teams yet. Create one in the web app first.`);
+  }
+  if (shouldAutoPickLoneTeam({ teamCount: teams.length, canCreate })) {
+    const team = teams[0];
+    if (args.announce)
       f2.info(`Using team ${import_picocolors31.default.bold(team.name)}.`);
-    } else if (teams.length === 0) {
-      throw new NonInteractiveError(`No teams in ${org.name} yet — create one in the web app, then re-run.`);
-    } else {
-      throw new NonInteractiveError(`Multiple teams in ${org.name}. Pass --team <id> to choose non-interactively.`);
-    }
-  } else {
-    const teamOptions = [
-      ...teams.map((t) => ({ value: t.id, label: t.name, hint: t.role })),
-      { value: "__new__", label: "+ Create a new team" }
-    ];
-    const teamChoice = await ie({
-      message: "Pick a team (or create one)",
-      options: teamOptions
+    return { org, team };
+  }
+  if (!canCreate) {
+    const teamId = await chooseOne({
+      message: "Which team?",
+      options: teams.map((t) => ({ value: t.id, label: t.name, hint: t.role })),
+      flagHint: "Pass --team <id>.",
+      allowPrompt: args.allowPrompt !== false
     });
-    const picked = ensureNotCancelled(teamChoice);
-    if (picked === "__new__") {
-      const name = await te({
-        message: "New team name",
-        validate: (v3) => !v3?.trim() ? "Required" : undefined
-      });
-      const teamName = ensureNotCancelled(name);
-      const createSpinner2 = de();
-      createSpinner2.start("Creating team…");
-      try {
-        team = await api.createTeam(org.id, teamName.trim());
-        createSpinner2.stop(`Created team ${import_picocolors31.default.bold(team.name)}.`);
-      } catch (err) {
-        createSpinner2.stop("Failed.");
-        handleApiError4(err);
-        return;
-      }
+    return { org, team: teams.find((t) => t.id === teamId) };
+  }
+  return { org, team: await pickOrCreateTeam(org, teams) };
+}
+var CREATE_TEAM = "__new__";
+async function pickOrCreateTeam(org, teams) {
+  const picked = ensureNotCancelled(await ie({
+    message: "Pick a team (or create one)",
+    options: [
+      ...teams.map((t) => ({ value: t.id, label: t.name, hint: t.role })),
+      { value: CREATE_TEAM, label: "+ Create a new team" }
+    ]
+  }));
+  if (picked !== CREATE_TEAM)
+    return teams.find((t) => t.id === picked);
+  const name = ensureNotCancelled(await te({
+    message: "New team name",
+    validate: (v3) => !v3?.trim() ? "Required" : undefined
+  }));
+  return await loading(true, "Creating team…", (created) => `Created team ${import_picocolors31.default.bold(created.name)}.`, () => api.createTeam(org.id, name.trim()));
+}
+async function findTeamAcrossOrgs(teamId) {
+  const orgs = await api.listOrgs();
+  if (orgs.length === 0) {
+    throw new OrgTeamError("You are not a member of any organization.");
+  }
+  const { resolved, failures } = await listTeamsPerOrg(orgs);
+  for (const { org, teams } of resolved) {
+    const team = teams.find((t) => t.id === teamId);
+    if (team)
+      return { org, team };
+  }
+  if (failures.length > 0)
+    throw failures[0].error;
+  throw new OrgTeamError(`Team ${teamId} not found in any of your organizations. Run \`brainbase team list\` to see the ids you can use.`);
+}
+async function listTeamsPerOrg(orgs) {
+  const settled = await Promise.allSettled(orgs.map((org) => api.listTeams(org.id)));
+  const entries = [];
+  const resolved = [];
+  const failures = [];
+  settled.forEach((outcome, index) => {
+    const org = orgs[index];
+    if (outcome.status === "fulfilled") {
+      const entry = { org, teams: outcome.value };
+      entries.push(entry);
+      resolved.push(entry);
     } else {
-      team = teams.find((t) => t.id === picked);
+      const error = outcome.reason;
+      entries.push({ org, teams: [], error: error.message });
+      failures.push({ org, error });
     }
+  });
+  return { entries, resolved, failures };
+}
+
+// src/cli/agent-create.ts
+async function runAgentCreate(cwd2, args) {
+  banner("agent create — claim a brainbase.agent.yaml and link this folder");
+  let manifest = await loadOrScaffoldManifest(cwd2, args);
+  if (!manifest)
+    return;
+  if (manifest.id) {
+    f2.warn(`This folder already belongs to an agent — ${import_picocolors32.default.bold(manifest.agent.name)} (${import_picocolors32.default.dim(manifest.id)}).`);
+    f2.info(`If you want to detach it, run ${import_picocolors32.default.cyan("brainbase unlink")} first; or move to a different directory.`);
+    return;
   }
+  const { org, team } = await resolveOrgAndTeam({
+    orgId: args.orgId,
+    teamId: args.teamId,
+    announce: true,
+    offerCreateTeam: true
+  });
   const harness = normalizeHarnessId(args.harness ?? manifest.harness ?? await pickHarness2(cwd2));
   let agentName = args.name?.trim() || manifest.agent.name.trim();
   if (!agentName) {
@@ -65488,11 +65740,11 @@ async function runAgentCreate(cwd2, args) {
   }
   if (!autoProceed(args.yes)) {
     le([
-      `${import_picocolors31.default.dim("org")}      ${import_picocolors31.default.bold(org.name)}`,
-      `${import_picocolors31.default.dim("team")}     ${import_picocolors31.default.bold(team.name)}`,
-      `${import_picocolors31.default.dim("harness")}  ${import_picocolors31.default.bold(harness)}`,
-      `${import_picocolors31.default.dim("agent")}    ${import_picocolors31.default.bold(agentName)}`,
-      ...tagline ? [`${import_picocolors31.default.dim("tagline")}  ${tagline}`] : []
+      `${import_picocolors32.default.dim("org")}      ${import_picocolors32.default.bold(org.name)}`,
+      `${import_picocolors32.default.dim("team")}     ${import_picocolors32.default.bold(team.name)}`,
+      `${import_picocolors32.default.dim("harness")}  ${import_picocolors32.default.bold(harness)}`,
+      `${import_picocolors32.default.dim("agent")}    ${import_picocolors32.default.bold(agentName)}`,
+      ...tagline ? [`${import_picocolors32.default.dim("tagline")}  ${tagline}`] : []
     ].join(`
 `), "Will create");
     const confirmed = await se({ message: "Create this agent?", initialValue: true });
@@ -65506,7 +65758,7 @@ async function runAgentCreate(cwd2, args) {
     const body = resolveEntrypoint(cwd2, manifest);
     if (body === null) {
       if (manifest.entrypoint.file) {
-        f2.error(`Entrypoint file ${import_picocolors31.default.bold(manifest.entrypoint.file)} not found.`);
+        f2.error(`Entrypoint file ${import_picocolors32.default.bold(manifest.entrypoint.file)} not found.`);
       } else {
         f2.error("Entrypoint block is empty.");
       }
@@ -65528,10 +65780,11 @@ async function runAgentCreate(cwd2, args) {
       ...manifest.machine_kind !== undefined ? { machine_kind: manifest.machine_kind } : {},
       ...manifest.default_model !== undefined ? { default_model: manifest.default_model } : {}
     });
-    createSpinner.stop(`Created ${import_picocolors31.default.bold(agent.name)}.`);
+    createSpinner.stop(`Created ${import_picocolors32.default.bold(agent.name)}.`);
   } catch (err) {
     createSpinner.stop("Failed.");
     handleApiError4(err);
+    process.exitCode = 1;
     return;
   }
   const machineConfigMissing = manifest.machine_kind !== undefined && agent.machine_kind !== manifest.machine_kind;
@@ -65544,15 +65797,15 @@ async function runAgentCreate(cwd2, args) {
       ...machineConfigMissing ? ["machine_kind"] : [],
       ...modelConfigMissing ? ["default_model"] : []
     ];
-    f2.error(`Agent ${import_picocolors31.default.bold(agent.id)} was created, but this control plane did not apply ${fields.join(" / ")}.`);
+    f2.error(`Agent ${import_picocolors32.default.bold(agent.id)} was created, but this control plane did not apply ${fields.join(" / ")}.`);
     if (machineConfigMissing) {
       if (agent.machine_kind) {
-        f2.info(`machine_kind is immutable. Run ${import_picocolors31.default.cyan("brainbase agent pull --force")} to accept ${agent.machine_kind}, or delete this agent and recreate it after upgrading the control plane.`);
+        f2.info(`machine_kind is immutable. Run ${import_picocolors32.default.cyan("brainbase agent pull --force")} to accept ${agent.machine_kind}, or delete this agent and recreate it after upgrading the control plane.`);
       } else {
         f2.info("machine_kind is immutable and this server did not report the provider it created. Upgrade the control plane, delete this agent, and recreate it.");
       }
     } else {
-      f2.info(`Upgrade the control plane, then run ${import_picocolors31.default.cyan("brainbase agent push")} to apply default_model.`);
+      f2.info(`Upgrade the control plane, then run ${import_picocolors32.default.cyan("brainbase agent push")} to apply default_model.`);
     }
     process.exitCode = 1;
     return;
@@ -65566,12 +65819,12 @@ async function runAgentCreate(cwd2, args) {
       wantsTracking = true;
     } else if (!isInteractive()) {
       wantsTracking = false;
-      f2.info(`Tracking left off (non-interactive). Re-run with ${import_picocolors31.default.cyan("--track")} to route ${harness} LLM traffic through brainbase.`);
+      f2.info(`Tracking left off (non-interactive). Re-run with ${import_picocolors32.default.cyan("--track")} to route ${harness} LLM traffic through brainbase.`);
     } else if (args.yes) {
       wantsTracking = true;
     } else {
       const ans = await se({
-        message: `Track ${harness} conversations on the brainbase platform? ${import_picocolors31.default.dim("(routes LLM calls through brainbase so they appear under this agent)")}`,
+        message: `Track ${harness} conversations on the brainbase platform? ${import_picocolors32.default.dim("(routes LLM calls through brainbase so they appear under this agent)")}`,
         initialValue: true
       });
       wantsTracking = ensureNotCancelled(ans);
@@ -65631,7 +65884,7 @@ async function runAgentCreate(cwd2, args) {
   if (hasContent) {
     const outgoing = await buildOutgoingComponents(cwd2, manifest, null);
     if (outgoing === null) {
-      f2.warn(`Agent created, but local content wasn't uploaded. Fix the issue above and run ${import_picocolors31.default.cyan("brainbase agent push")}.`);
+      f2.warn(`Agent created, but local content wasn't uploaded. Fix the issue above and run ${import_picocolors32.default.cyan("brainbase agent push")}.`);
     } else if (outgoing.length > 0) {
       const pushSpinner = de();
       pushSpinner.start("Pushing local content…");
@@ -65645,9 +65898,9 @@ async function runAgentCreate(cwd2, args) {
       } catch (err) {
         pushSpinner.stop("Failed.");
         if (err instanceof ApiError) {
-          f2.warn(`Content upload failed: ${err.message}. Run ${import_picocolors31.default.cyan("brainbase agent push")} to retry.`);
+          f2.warn(`Content upload failed: ${err.message}. Run ${import_picocolors32.default.cyan("brainbase agent push")} to retry.`);
         } else {
-          f2.warn(`Content upload failed: ${err.message}. Run ${import_picocolors31.default.cyan("brainbase agent push")} to retry.`);
+          f2.warn(`Content upload failed: ${err.message}. Run ${import_picocolors32.default.cyan("brainbase agent push")} to retry.`);
         }
       }
     }
@@ -65685,7 +65938,7 @@ async function runAgentCreate(cwd2, args) {
     }
   };
   writeSyncState(cwd2, state);
-  $e(`Created ${import_picocolors31.default.bold(agent.name)} and linked this folder.`);
+  $e(`Created ${import_picocolors32.default.bold(agent.name)} and linked this folder.`);
   await showResultCard({
     title: "CREATED",
     tone: "ok",
@@ -65698,9 +65951,9 @@ async function runAgentCreate(cwd2, args) {
   });
   console.log();
   if (tracking && harness === "codex") {
-    console.log(tip(`Run ${import_picocolors31.default.cyan("codex")} once in this folder and approve trust ${import_picocolors31.default.dim("— Codex only loads project-scope config in trusted projects.")}`));
+    console.log(tip(`Run ${import_picocolors32.default.cyan("codex")} once in this folder and approve trust ${import_picocolors32.default.dim("— Codex only loads project-scope config in trusted projects.")}`));
   }
-  console.log(tip(`brainbase agent unpack ${import_picocolors31.default.dim("— install harness files (skills/mcps) under .claude/, .codex/, …")}`));
+  console.log(tip(`brainbase agent unpack ${import_picocolors32.default.dim("— install harness files (skills/mcps) under .claude/, .codex/, …")}`));
   console.log();
 }
 async function loadOrScaffoldManifest(cwd2, args) {
@@ -65712,13 +65965,13 @@ async function loadOrScaffoldManifest(cwd2, args) {
       return null;
     }
   }
-  f2.warn(`No ${import_picocolors31.default.bold(AGENT_MANIFEST_FILE)} here.`);
+  f2.warn(`No ${import_picocolors32.default.bold(AGENT_MANIFEST_FILE)} here.`);
   if (!args.yes) {
     if (!isInteractive()) {
       throw new NonInteractiveError(`No ${AGENT_MANIFEST_FILE} here. Create one first, or re-run with --yes to scaffold a minimal one.`);
     }
     const ans = await se({
-      message: `Scaffold a minimal ${import_picocolors31.default.bold(AGENT_MANIFEST_FILE)} and continue?`,
+      message: `Scaffold a minimal ${import_picocolors32.default.bold(AGENT_MANIFEST_FILE)} and continue?`,
       initialValue: true
     });
     if (!ensureNotCancelled(ans)) {
@@ -65739,7 +65992,7 @@ async function loadOrScaffoldManifest(cwd2, args) {
   };
   try {
     writeManifest(cwd2, scaffold);
-    f2.info(`Wrote ${import_picocolors31.default.bold(AGENT_MANIFEST_FILE)}.`);
+    f2.info(`Wrote ${import_picocolors32.default.bold(AGENT_MANIFEST_FILE)}.`);
   } catch (err) {
     f2.error(`Failed to write manifest: ${err.message}`);
     return null;
@@ -65750,7 +66003,7 @@ async function pickHarness2(cwd2) {
   const detections = await detectHarnesses(cwd2);
   const detected = detections.filter((d3) => d3.detection.detected);
   if (detected.length === 1) {
-    f2.info(`Detected harness: ${import_picocolors31.default.bold(detected[0].adapter.displayName)}.`);
+    f2.info(`Detected harness: ${import_picocolors32.default.bold(detected[0].adapter.displayName)}.`);
     return detected[0].adapter.id;
   }
   return await select({
@@ -65776,6 +66029,46 @@ function handleApiError4(err) {
   $e("Aborted.");
 }
 
+// src/cli/agent-list.ts
+var import_picocolors33 = __toESM(require_picocolors(), 1);
+async function runAgentList(args) {
+  if (!args.json)
+    banner("agent list — agents in this team");
+  const { org, team } = await resolveOrgAndTeam({
+    orgId: args.orgId,
+    teamId: args.teamId,
+    allowPrompt: !args.json,
+    announce: !args.json
+  });
+  const agents = await api.listAgents(org.id, team.id);
+  if (args.json) {
+    console.log(JSON.stringify(agents, null, 2));
+    return;
+  }
+  console.log(formatAgentList(agents, { orgName: org.name, teamName: team.name }));
+}
+function formatAgentList(agents, labels) {
+  const lines = [""];
+  if (agents.length === 0) {
+    lines.push(`  ${import_picocolors33.default.dim(`No agents in ${labels.orgName} → ${labels.teamName} yet.`)}`, "", `  ${import_picocolors33.default.dim("create one with")} ${import_picocolors33.default.cyan("brainbase agent create")}`, "");
+    return lines.join(`
+`);
+  }
+  for (const agent of agents) {
+    lines.push(`  ${import_picocolors33.default.bold(agent.name)}  ${import_picocolors33.default.dim(agent.slug)}`);
+    if (agent.tagline)
+      lines.push(`    ${import_picocolors33.default.dim(agent.tagline)}`);
+    const meta = [agent.harness, agent.machine_kind, agent.default_model].filter((value) => !!value).join(" · ");
+    if (meta)
+      lines.push(`    ${import_picocolors33.default.dim(meta)}`);
+    lines.push(`    ${import_picocolors33.default.dim(agent.id)}`);
+    lines.push("");
+  }
+  lines.push(`  ${import_picocolors33.default.dim("link this folder to one with")} ${import_picocolors33.default.cyan("brainbase link --agent <id>")}`, "");
+  return lines.join(`
+`);
+}
+
 // src/cli/agent.ts
 async function runAgent(cwd2, sub, args, opts) {
   if (args.some((arg) => arg === "--help" || arg === "-h")) {
@@ -65795,6 +66088,13 @@ async function runAgent(cwd2, sub, args, opts) {
         track: opts.track
       });
       return;
+    case "list":
+      await runAgentList({
+        orgId: opts.orgId,
+        teamId: opts.teamId,
+        json: opts.json
+      });
+      return;
     case "pull":
       await runAgentPull(cwd2, {
         yes: opts.yes,
@@ -65838,26 +66138,111 @@ async function runAgent(cwd2, sub, args, opts) {
 function printHelp() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors32.default.bold("brainbase agent")} ${import_picocolors32.default.dim("<sub> [options]")}`);
+  out.push(`  ${import_picocolors34.default.bold("brainbase agent")} ${import_picocolors34.default.dim("<sub> [options]")}`);
   out.push("");
-  out.push(`  ${import_picocolors32.default.cyan("create")}             ${import_picocolors32.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
-  out.push(`  ${import_picocolors32.default.cyan("pull")} ${import_picocolors32.default.dim("[<id>]")}      ${import_picocolors32.default.dim("apply cloud changes into this folder — pass <id> to switch (--force to override); --run-entrypoint to also execute the agent entrypoint")}`);
-  out.push(`  ${import_picocolors32.default.cyan("push")}               ${import_picocolors32.default.dim("send local changes to the cloud — instructions, playbooks, skills, MCPs, entrypoint (--force to overwrite cloud-side conflicts with local)")}`);
-  out.push(`  ${import_picocolors32.default.cyan("unpack")}             ${import_picocolors32.default.dim("install the claimed agent into a harness layout (--harness to override)")}`);
-  out.push(`  ${import_picocolors32.default.cyan("status")}             ${import_picocolors32.default.dim("show what would push and what would pull")}`);
-  out.push(`  ${import_picocolors32.default.cyan("env")}                ${import_picocolors32.default.dim('print export statements — use with `eval "$(brainbase agent env)"`')}`);
+  out.push(`  ${import_picocolors34.default.cyan("list")}               ${import_picocolors34.default.dim("show the agents in a team, with the ids `brainbase link` takes (--json for scripts)")}`);
+  out.push(`  ${import_picocolors34.default.cyan("create")}             ${import_picocolors34.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
+  out.push(`  ${import_picocolors34.default.cyan("pull")} ${import_picocolors34.default.dim("[<id>]")}      ${import_picocolors34.default.dim("apply cloud changes into this folder — pass <id> to switch (--force to override); --run-entrypoint to also execute the agent entrypoint")}`);
+  out.push(`  ${import_picocolors34.default.cyan("push")}               ${import_picocolors34.default.dim("send local changes to the cloud — instructions, playbooks, skills, MCPs, entrypoint (--force to overwrite cloud-side conflicts with local)")}`);
+  out.push(`  ${import_picocolors34.default.cyan("unpack")}             ${import_picocolors34.default.dim("install the claimed agent into a harness layout (--harness to override)")}`);
+  out.push(`  ${import_picocolors34.default.cyan("status")}             ${import_picocolors34.default.dim("show what would push and what would pull")}`);
+  out.push(`  ${import_picocolors34.default.cyan("env")}                ${import_picocolors34.default.dim('print export statements — use with `eval "$(brainbase agent env)"`')}`);
+  out.push("");
+  console.log(out.join(`
+`));
+}
+
+// src/cli/team.ts
+var import_picocolors36 = __toESM(require_picocolors(), 1);
+
+// src/cli/team-list.ts
+var import_picocolors35 = __toESM(require_picocolors(), 1);
+async function runTeamList(args) {
+  if (!args.json)
+    banner("team list — teams you can put agents in");
+  const orgs = args.orgId !== undefined ? [await resolveOrg(args.orgId)] : await api.listOrgs();
+  const { entries, resolved, failures } = await listTeamsPerOrg(orgs);
+  if (resolved.length === 0 && failures.length > 0)
+    throw failures[0].error;
+  if (args.json) {
+    for (const { org, error } of failures) {
+      console.error(`Could not load teams in ${org.name}: ${error.message}`);
+    }
+    console.log(JSON.stringify(entries, null, 2));
+    return;
+  }
+  console.log(formatTeamList(entries));
+}
+function formatTeamList(grouped) {
+  const lines = [""];
+  if (grouped.length === 0) {
+    lines.push(`  ${import_picocolors35.default.dim("You are not a member of any organization.")}`, "");
+    return lines.join(`
+`);
+  }
+  const nameWidth = Math.max(...grouped.flatMap(({ teams }) => teams.map((t) => t.name.length)), 0);
+  for (const { org, teams, error } of grouped) {
+    const slug = org.slug ? `  ${import_picocolors35.default.dim(org.slug)}` : "";
+    lines.push(`  ${import_picocolors35.default.bold(org.name)}${slug}`);
+    if (error) {
+      lines.push(`    ${import_picocolors35.default.red(`could not load teams: ${error}`)}`);
+    } else if (teams.length === 0) {
+      lines.push(`    ${import_picocolors35.default.dim("no teams yet — create one in the web app")}`);
+    }
+    for (const team of teams) {
+      lines.push(`    ${team.name.padEnd(nameWidth)}  ${import_picocolors35.default.dim(team.id)}`);
+    }
+    lines.push("");
+  }
+  lines.push(`  ${import_picocolors35.default.dim("list a team’s agents with")} ${import_picocolors35.default.cyan("brainbase agent list --team <id>")}`, "");
+  return lines.join(`
+`);
+}
+
+// src/cli/team.ts
+async function runTeam(sub, args, opts) {
+  if (args.some((arg) => arg === "--help" || arg === "-h")) {
+    printHelp2();
+    return;
+  }
+  switch (sub) {
+    case "list":
+      await runTeamList({ orgId: opts.orgId, json: opts.json });
+      return;
+    case undefined:
+    case "help":
+    case "-h":
+    case "--help":
+      printHelp2();
+      return;
+    default:
+      console.error(`Unknown team subcommand: ${sub}
+`);
+      printHelp2();
+      process.exit(1);
+  }
+}
+function printHelp2() {
+  const out = [];
+  out.push("");
+  out.push(`  ${import_picocolors36.default.bold("brainbase team")} ${import_picocolors36.default.dim("<sub> [options]")}`);
+  out.push("");
+  out.push(`  ${import_picocolors36.default.cyan("list")}   ${import_picocolors36.default.dim("show the teams you can create agents in, grouped by organization")}`);
+  out.push("");
+  out.push(`  ${import_picocolors36.default.dim("--org <id-or-slug>")}  ${import_picocolors36.default.dim("limit to one organization")}`);
+  out.push(`  ${import_picocolors36.default.dim("--json")}              ${import_picocolors36.default.dim("machine-readable output")}`);
   out.push("");
   console.log(out.join(`
 `));
 }
 
 // src/cli/orchestration.ts
-var import_picocolors39 = __toESM(require_picocolors(), 1);
+var import_picocolors43 = __toESM(require_picocolors(), 1);
 
 // src/cli/orchestration-pull.ts
 import path85 from "node:path";
 import fs76 from "node:fs";
-var import_picocolors33 = __toESM(require_picocolors(), 1);
+var import_picocolors37 = __toESM(require_picocolors(), 1);
 
 // src/core/orchestration-manifest.ts
 import path82 from "node:path";
@@ -66360,8 +66745,8 @@ async function runOrchestrationPull(cwd2, args) {
     orchId = args.orchestrationId;
   } else {
     f2.warn("This folder is not linked to any orchestration.");
-    f2.info(`Run ${import_picocolors33.default.cyan("brainbase orchestration pull <id>")} with an orchestration id,
-  or ${import_picocolors33.default.cyan("brainbase orchestration list")} to find one.`);
+    f2.info(`Run ${import_picocolors37.default.cyan("brainbase orchestration pull <id>")} with an orchestration id,
+  or ${import_picocolors37.default.cyan("brainbase orchestration list")} to find one.`);
     return;
   }
   const sp = de();
@@ -66380,24 +66765,24 @@ async function runOrchestrationPull(cwd2, args) {
   const slugFor = (agentId) => slugByAgent.get(agentId) ?? agentId;
   const planLines = [];
   planLines.push("");
-  planLines.push(`  ${import_picocolors33.default.bold(cloud.name)} ${import_picocolors33.default.dim(`(${cloud.id})`)}`);
+  planLines.push(`  ${import_picocolors37.default.bold(cloud.name)} ${import_picocolors37.default.dim(`(${cloud.id})`)}`);
   if (cloud.description)
-    planLines.push(`  ${import_picocolors33.default.dim(cloud.description)}`);
+    planLines.push(`  ${import_picocolors37.default.dim(cloud.description)}`);
   planLines.push("");
-  planLines.push(`  ${import_picocolors33.default.dim("members:")}`);
+  planLines.push(`  ${import_picocolors37.default.dim("members:")}`);
   for (const m3 of cloud.members) {
     const skipped = !m3.manifest;
-    const tail2 = skipped ? import_picocolors33.default.red(" (manifest unavailable — skipped)") : "";
-    planLines.push(`    ${import_picocolors33.default.cyan("•")} ${import_picocolors33.default.bold(slugFor(m3.agent_id))} ${import_picocolors33.default.dim(`(${m3.name})`)}${tail2}`);
+    const tail2 = skipped ? import_picocolors37.default.red(" (manifest unavailable — skipped)") : "";
+    planLines.push(`    ${import_picocolors37.default.cyan("•")} ${import_picocolors37.default.bold(slugFor(m3.agent_id))} ${import_picocolors37.default.dim(`(${m3.name})`)}${tail2}`);
   }
   if (cloud.edges.length) {
     planLines.push("");
-    planLines.push(`  ${import_picocolors33.default.dim("edges:")}`);
+    planLines.push(`  ${import_picocolors37.default.dim("edges:")}`);
     for (const e2 of cloud.edges) {
       const from = slugFor(e2.from_agent_id);
       const to2 = slugFor(e2.to_agent_id);
-      const desc = e2.description ? `  ${import_picocolors33.default.dim("— " + e2.description)}` : "";
-      planLines.push(`    ${import_picocolors33.default.cyan(from)} ${import_picocolors33.default.dim("→")} ${import_picocolors33.default.cyan(to2)}${desc}`);
+      const desc = e2.description ? `  ${import_picocolors37.default.dim("— " + e2.description)}` : "";
+      planLines.push(`    ${import_picocolors37.default.cyan(from)} ${import_picocolors37.default.dim("→")} ${import_picocolors37.default.cyan(to2)}${desc}`);
     }
   }
   planLines.push("");
@@ -66406,7 +66791,7 @@ async function runOrchestrationPull(cwd2, args) {
   const isRefresh = !!existingLink;
   if (!autoProceed(args.yes) && !isRefresh) {
     const ok = await se({
-      message: `Pull into ${import_picocolors33.default.bold(cwd2)}?`,
+      message: `Pull into ${import_picocolors37.default.bold(cwd2)}?`,
       initialValue: true
     });
     if (!ensureNotCancelled(ok)) {
@@ -66450,7 +66835,7 @@ async function runOrchestrationPull(cwd2, args) {
         scope: "project",
         pullSecrets: true
       });
-      memberSp.stop(`Installed ${import_picocolors33.default.bold(slug)} ${import_picocolors33.default.dim(`(${m3.manifest.components.length} components)`)}.`);
+      memberSp.stop(`Installed ${import_picocolors37.default.bold(slug)} ${import_picocolors37.default.dim(`(${m3.manifest.components.length} components)`)}.`);
       installedMembers.push({
         agent_id: m3.agent_id,
         slug,
@@ -66511,7 +66896,7 @@ async function runOrchestrationPull(cwd2, args) {
       payload_schema: e2.payload_schema ?? {}
     }))
   });
-  $e(`Pulled ${cloud.name} at revision ${cloud.revision} into ${path85.basename(cwd2)}/ ${import_picocolors33.default.dim(`(${installedMembers.length}/${cloud.members.length} members)`)}.`);
+  $e(`Pulled ${cloud.name} at revision ${cloud.revision} into ${path85.basename(cwd2)}/ ${import_picocolors37.default.dim(`(${installedMembers.length}/${cloud.members.length} members)`)}.`);
 }
 function handleApiError5(err) {
   if (err instanceof ApiError) {
@@ -66528,7 +66913,7 @@ function handleApiError5(err) {
 }
 
 // src/cli/orchestration-push.ts
-var import_picocolors34 = __toESM(require_picocolors(), 1);
+var import_picocolors38 = __toESM(require_picocolors(), 1);
 
 // src/core/orchestration-outgoing.ts
 function buildOrchestrationGraphPayload(manifest, slugToAgentId) {
@@ -66598,12 +66983,12 @@ async function runOrchestrationPush(cwd2, args) {
   const link2 = readOrchLink(cwd2);
   if (!link2) {
     f2.warn("This folder is not linked to any orchestration.");
-    f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull <id>")} first.`);
+    f2.info(`Run ${import_picocolors38.default.cyan("brainbase orchestration pull <id>")} first.`);
     return;
   }
   if (!hasOrchManifest(cwd2)) {
-    f2.warn(`No ${import_picocolors34.default.bold(ORCH_MANIFEST_FILE)} here.`);
-    f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull")} to materialise the manifest before pushing.`);
+    f2.warn(`No ${import_picocolors38.default.bold(ORCH_MANIFEST_FILE)} here.`);
+    f2.info(`Run ${import_picocolors38.default.cyan("brainbase orchestration pull")} to materialise the manifest before pushing.`);
     return;
   }
   let manifest;
@@ -66627,7 +67012,7 @@ async function runOrchestrationPush(cwd2, args) {
   }
   if (missing.length) {
     f2.error(`Missing local checkouts for: ${missing.join(", ")}.`);
-    f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull")} to materialise the missing folders.`);
+    f2.info(`Run ${import_picocolors38.default.cyan("brainbase orchestration pull")} to materialise the missing folders.`);
     return;
   }
   let graph;
@@ -66639,13 +67024,13 @@ async function runOrchestrationPush(cwd2, args) {
     return;
   }
   const plan = [""];
-  plan.push(`  ${import_picocolors34.default.bold(link2.name)} ${import_picocolors34.default.dim(`(${link2.orchestration_id})`)}`);
-  plan.push(`  ${import_picocolors34.default.dim(`${manifest.members.length} member${manifest.members.length === 1 ? "" : "s"}, ${manifest.edges.length} edge${manifest.edges.length === 1 ? "" : "s"}, ${graph.triggers.length} trigger${graph.triggers.length === 1 ? "" : "s"}`)}`);
+  plan.push(`  ${import_picocolors38.default.bold(link2.name)} ${import_picocolors38.default.dim(`(${link2.orchestration_id})`)}`);
+  plan.push(`  ${import_picocolors38.default.dim(`${manifest.members.length} member${manifest.members.length === 1 ? "" : "s"}, ${manifest.edges.length} edge${manifest.edges.length === 1 ? "" : "s"}, ${graph.triggers.length} trigger${graph.triggers.length === 1 ? "" : "s"}`)}`);
   plan.push("");
   if (!args.graphOnly) {
-    plan.push(`  ${import_picocolors34.default.dim("per-member agent push:")}`);
+    plan.push(`  ${import_picocolors38.default.dim("per-member agent push:")}`);
     for (const m3 of manifest.members) {
-      plan.push(`    ${import_picocolors34.default.cyan("•")} ${import_picocolors34.default.bold(m3.slug)}`);
+      plan.push(`    ${import_picocolors38.default.cyan("•")} ${import_picocolors38.default.bold(m3.slug)}`);
     }
     plan.push("");
   }
@@ -66665,7 +67050,7 @@ async function runOrchestrationPush(cwd2, args) {
     for (const m3 of manifest.members) {
       const dir = memberDir(cwd2, m3.slug);
       console.log("");
-      console.log(`${import_picocolors34.default.dim("───")} ${import_picocolors34.default.bold(m3.slug)} ${import_picocolors34.default.dim("───")}`);
+      console.log(`${import_picocolors38.default.dim("───")} ${import_picocolors38.default.bold(m3.slug)} ${import_picocolors38.default.dim("───")}`);
       try {
         await runAgentPush(dir, { yes: true });
       } catch (err) {
@@ -66723,7 +67108,7 @@ function handleApiError6(err) {
       f2.error("You do not have access to this orchestration.");
     } else if (err.status === 409) {
       f2.error(err.message);
-      f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull")} to reconcile, then push again.`);
+      f2.info(`Run ${import_picocolors38.default.cyan("brainbase orchestration pull")} to reconcile, then push again.`);
     } else {
       f2.error(err.message);
     }
@@ -66733,13 +67118,13 @@ function handleApiError6(err) {
 }
 
 // src/cli/orchestration-status.ts
-var import_picocolors35 = __toESM(require_picocolors(), 1);
+var import_picocolors39 = __toESM(require_picocolors(), 1);
 async function runOrchestrationStatus(cwd2) {
   banner("orchestration status — what changed locally, remotely, both");
   const link2 = readOrchLink(cwd2);
   if (!link2) {
     f2.warn("This folder is not linked to any orchestration.");
-    f2.info(`Run ${import_picocolors35.default.cyan("brainbase orchestration pull <id>")} first.`);
+    f2.info(`Run ${import_picocolors39.default.cyan("brainbase orchestration pull <id>")} first.`);
     return;
   }
   const localManifest = hasOrchManifest(cwd2) ? readOrchManifest(cwd2) : null;
@@ -66762,8 +67147,8 @@ async function runOrchestrationStatus(cwd2) {
   }
   const lines = [];
   lines.push("");
-  lines.push(`  ${import_picocolors35.default.bold(link2.name)} ${import_picocolors35.default.dim(`(${link2.orchestration_id})`)}`);
-  lines.push(`  ${import_picocolors35.default.dim("revision")}  cloud ${cloud.revision}${lock ? ` · lock ${lock.revision}` : " · never pulled"}`);
+  lines.push(`  ${import_picocolors39.default.bold(link2.name)} ${import_picocolors39.default.dim(`(${link2.orchestration_id})`)}`);
+  lines.push(`  ${import_picocolors39.default.dim("revision")}  cloud ${cloud.revision}${lock ? ` · lock ${lock.revision}` : " · never pulled"}`);
   lines.push("");
   const localSlugByAgentId = new Map;
   for (const m3 of localManifest?.members ?? []) {
@@ -66777,12 +67162,12 @@ async function runOrchestrationStatus(cwd2) {
   const membersAdded = [...localMemberSet].filter((s3) => !cloudMemberSet.has(s3));
   const membersRemoved = [...cloudMemberSet].filter((s3) => !localMemberSet.has(s3));
   if (membersAdded.length || membersRemoved.length) {
-    lines.push(`  ${import_picocolors35.default.bold("members")}`);
+    lines.push(`  ${import_picocolors39.default.bold("members")}`);
     for (const slug of membersAdded) {
-      lines.push(`    ${import_picocolors35.default.yellow("→ push")}  added in yaml: ${import_picocolors35.default.bold(slug)}`);
+      lines.push(`    ${import_picocolors39.default.yellow("→ push")}  added in yaml: ${import_picocolors39.default.bold(slug)}`);
     }
     for (const slug of membersRemoved) {
-      lines.push(`    ${import_picocolors35.default.cyan("← pull")}  added on cloud: ${import_picocolors35.default.bold(slug)}`);
+      lines.push(`    ${import_picocolors39.default.cyan("← pull")}  added on cloud: ${import_picocolors39.default.bold(slug)}`);
     }
     lines.push("");
   }
@@ -66797,11 +67182,11 @@ async function runOrchestrationStatus(cwd2) {
   const edgesAdded = [...localEdges.keys()].filter((k3) => !cloudEdges.has(k3));
   const edgesRemoved = [...cloudEdges.keys()].filter((k3) => !localEdges.has(k3));
   if (edgesAdded.length || edgesRemoved.length) {
-    lines.push(`  ${import_picocolors35.default.bold("edges")}`);
+    lines.push(`  ${import_picocolors39.default.bold("edges")}`);
     for (const k3 of edgesAdded)
-      lines.push(`    ${import_picocolors35.default.yellow("→ push")}  added in yaml: ${k3}`);
+      lines.push(`    ${import_picocolors39.default.yellow("→ push")}  added in yaml: ${k3}`);
     for (const k3 of edgesRemoved)
-      lines.push(`    ${import_picocolors35.default.cyan("← pull")}  added on cloud: ${k3}`);
+      lines.push(`    ${import_picocolors39.default.cyan("← pull")}  added on cloud: ${k3}`);
     lines.push("");
   }
   const cloudTriggerKey = (t) => {
@@ -66839,11 +67224,11 @@ async function runOrchestrationStatus(cwd2) {
   const triggersAdded = [...localTriggers.keys()].filter((k3) => !cloudTriggers.has(k3));
   const triggersRemoved = [...cloudTriggers.keys()].filter((k3) => !localTriggers.has(k3));
   if (triggersAdded.length || triggersRemoved.length) {
-    lines.push(`  ${import_picocolors35.default.bold("schedule triggers")}`);
+    lines.push(`  ${import_picocolors39.default.bold("schedule triggers")}`);
     for (const k3 of triggersAdded)
-      lines.push(`    ${import_picocolors35.default.yellow("→ push")}  added/changed in yaml: ${localTriggers.get(k3) ?? k3}`);
+      lines.push(`    ${import_picocolors39.default.yellow("→ push")}  added/changed in yaml: ${localTriggers.get(k3) ?? k3}`);
     for (const k3 of triggersRemoved)
-      lines.push(`    ${import_picocolors35.default.cyan("← pull")}  added/changed on cloud: ${cloudTriggers.get(k3) ?? k3}`);
+      lines.push(`    ${import_picocolors39.default.cyan("← pull")}  added/changed on cloud: ${cloudTriggers.get(k3) ?? k3}`);
     lines.push("");
   }
   const lockByAgentId = new Map((lock?.members ?? []).map((m3) => [m3.agent_id, m3]));
@@ -66866,27 +67251,27 @@ async function runOrchestrationStatus(cwd2) {
     }
   }
   if (memberDrift.length) {
-    lines.push(`  ${import_picocolors35.default.bold("member content drift")}`);
+    lines.push(`  ${import_picocolors39.default.bold("member content drift")}`);
     for (const d3 of memberDrift) {
-      lines.push(`    ${import_picocolors35.default.cyan("?")} ${import_picocolors35.default.bold(d3.slug)}  ${import_picocolors35.default.dim("— " + d3.reason)}`);
+      lines.push(`    ${import_picocolors39.default.cyan("?")} ${import_picocolors39.default.bold(d3.slug)}  ${import_picocolors39.default.dim("— " + d3.reason)}`);
     }
-    lines.push(`    ${import_picocolors35.default.dim("cd into each member folder and run")} ${import_picocolors35.default.cyan("brainbase agent status")}`);
+    lines.push(`    ${import_picocolors39.default.dim("cd into each member folder and run")} ${import_picocolors39.default.cyan("brainbase agent status")}`);
     lines.push("");
   }
   const revisionDrift = lock?.revision != null && cloud.revision !== lock.revision;
   if (revisionDrift) {
-    lines.push(`  ${import_picocolors35.default.bold("cloud revision")}`);
-    lines.push(`    ${import_picocolors35.default.cyan("← pull")}  cloud changed since last pull: ${import_picocolors35.default.dim(`lock ${lock.revision} → cloud ${cloud.revision}`)}`);
+    lines.push(`  ${import_picocolors39.default.bold("cloud revision")}`);
+    lines.push(`    ${import_picocolors39.default.cyan("← pull")}  cloud changed since last pull: ${import_picocolors39.default.dim(`lock ${lock.revision} → cloud ${cloud.revision}`)}`);
     lines.push("");
   }
   if (!membersAdded.length && !membersRemoved.length && !edgesAdded.length && !edgesRemoved.length && !triggersAdded.length && !triggersRemoved.length && !memberDrift.length && !revisionDrift) {
-    lines.push(`  ${import_picocolors35.default.green("✓")} everything is in sync`);
+    lines.push(`  ${import_picocolors39.default.green("✓")} everything is in sync`);
     lines.push("");
     console.log(lines.join(`
 `));
     return;
   }
-  lines.push(`  ${import_picocolors35.default.dim("run")} ${import_picocolors35.default.cyan("brainbase orchestration pull")} ${import_picocolors35.default.dim("to apply cloud changes,")} ${import_picocolors35.default.cyan("brainbase orchestration push")} ${import_picocolors35.default.dim("to send yours")}`);
+  lines.push(`  ${import_picocolors39.default.dim("run")} ${import_picocolors39.default.cyan("brainbase orchestration pull")} ${import_picocolors39.default.dim("to apply cloud changes,")} ${import_picocolors39.default.cyan("brainbase orchestration push")} ${import_picocolors39.default.dim("to send yours")}`);
   lines.push("");
   console.log(lines.join(`
 `));
@@ -66901,108 +67286,45 @@ function stableJson(value) {
 }
 
 // src/cli/orchestration-list.ts
-var import_picocolors36 = __toESM(require_picocolors(), 1);
+var import_picocolors40 = __toESM(require_picocolors(), 1);
 async function runOrchestrationList(args) {
   banner("orchestration list — orchestrations under a team");
-  let orgId = args.orgId;
-  let teamId = args.teamId;
-  if (!orgId || !isUuid(orgId)) {
-    let orgs;
-    try {
-      orgs = await api.listOrgs();
-    } catch (err) {
-      handleApiError7(err);
-      return;
-    }
-    if (orgs.length === 0) {
-      f2.warn("You are not a member of any organization.");
-      return;
-    }
-    if (orgId) {
-      const found = orgs.find((o2) => o2.id === orgId || o2.slug === orgId);
-      if (!found) {
-        f2.error(`Org ${orgId} not found or you're not a member.`);
-        return;
-      }
-      orgId = found.id;
-    } else if (orgs.length === 1) {
-      orgId = orgs[0].id;
-    } else {
-      orgId = await select({
-        message: "Which organization?",
-        options: orgs.map((o2) => ({ value: o2.id, label: o2.name, hint: o2.role })),
-        flagHint: "Pass --org <id-or-slug>."
-      });
-    }
-  }
-  if (!teamId) {
-    let teams;
-    try {
-      teams = await api.listTeams(orgId);
-    } catch (err) {
-      handleApiError7(err);
-      return;
-    }
-    if (teams.length === 0) {
-      f2.warn("No teams under this organization. Create one in the web app first.");
-      return;
-    }
-    if (teams.length === 1) {
-      teamId = teams[0].id;
-    } else {
-      teamId = await select({
-        message: "Which team?",
-        options: teams.map((t) => ({ value: t.id, label: t.name })),
-        flagHint: "Pass --team <id>."
-      });
-    }
-  }
-  let items;
+  const { org, team } = await resolveOrgAndTeam({
+    orgId: args.orgId,
+    teamId: args.teamId,
+    announce: true
+  });
   const sp = de();
   sp.start("Fetching orchestrations…");
+  let items;
   try {
-    items = await api.listOrchestrations(orgId, teamId);
-    sp.stop(`${items.length} orchestration${items.length === 1 ? "" : "s"}.`);
+    items = await api.listOrchestrations(org.id, team.id);
   } catch (err) {
     sp.stop("Failed.");
-    handleApiError7(err);
-    return;
+    throw err;
   }
+  sp.stop(`${items.length} orchestration${items.length === 1 ? "" : "s"}.`);
   if (items.length === 0) {
     f2.info("This team has no orchestrations yet.");
     return;
   }
   const lines = [""];
   for (const o2 of items) {
-    lines.push(`  ${import_picocolors36.default.bold(o2.name)}  ${import_picocolors36.default.dim(o2.id)}`);
+    lines.push(`  ${import_picocolors40.default.bold(o2.name)}  ${import_picocolors40.default.dim(o2.id)}`);
     if (o2.description)
-      lines.push(`    ${import_picocolors36.default.dim(o2.description)}`);
-    lines.push(`    ${import_picocolors36.default.dim(`${o2.member_count} member${o2.member_count === 1 ? "" : "s"} · ${o2.edge_count} edge${o2.edge_count === 1 ? "" : "s"}`)}`);
+      lines.push(`    ${import_picocolors40.default.dim(o2.description)}`);
+    lines.push(`    ${import_picocolors40.default.dim(`${o2.member_count} member${o2.member_count === 1 ? "" : "s"} · ${o2.edge_count} edge${o2.edge_count === 1 ? "" : "s"}`)}`);
     lines.push("");
   }
-  lines.push(`  ${import_picocolors36.default.dim("pull one with")} ${import_picocolors36.default.cyan("brainbase orchestration pull <id>")}`);
+  lines.push(`  ${import_picocolors40.default.dim("pull one with")} ${import_picocolors40.default.cyan("brainbase orchestration pull <id>")}`);
   lines.push("");
   console.log(lines.join(`
 `));
 }
-function isUuid(value) {
-  return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-9a-f][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value);
-}
-function handleApiError7(err) {
-  if (err instanceof ApiError) {
-    if (err.status === 401) {
-      f2.error("Your session is invalid. Run `brainbase login` and try again.");
-    } else {
-      f2.error(err.message);
-    }
-  } else {
-    f2.error(err.message);
-  }
-}
 
 // src/cli/orchestration-add-agent.ts
 import fs77 from "node:fs";
-var import_picocolors37 = __toESM(require_picocolors(), 1);
+var import_picocolors41 = __toESM(require_picocolors(), 1);
 
 // src/core/orchestration-add.ts
 function resolveOrgIdForGroup(groupId, orgsWithTeams) {
@@ -67067,7 +67389,7 @@ async function runOrchestrationAddAgent(cwd2, args) {
   const link2 = readOrchLink(cwd2);
   if (!link2 || !hasOrchManifest(cwd2)) {
     f2.warn("This folder is not a linked orchestration.");
-    f2.info(`Run ${import_picocolors37.default.cyan("brainbase orchestration pull <id>")} first.`);
+    f2.info(`Run ${import_picocolors41.default.cyan("brainbase orchestration pull <id>")} first.`);
     return;
   }
   let manifest;
@@ -67093,7 +67415,7 @@ async function runOrchestrationAddAgent(cwd2, args) {
     while (manifest.members.some((m3) => m3.slug === candidate) || fs77.existsSync(memberDir(cwd2, candidate))) {
       candidate = `${slug}-${++n}`;
     }
-    f2.info(`Slug ${import_picocolors37.default.bold(slug)} is taken — using ${import_picocolors37.default.bold(candidate)}.`);
+    f2.info(`Slug ${import_picocolors41.default.bold(slug)} is taken — using ${import_picocolors41.default.bold(candidate)}.`);
     slug = candidate;
   }
   let payloadSchema;
@@ -67117,7 +67439,7 @@ async function runOrchestrationAddAgent(cwd2, args) {
       const resolved = resolveOrgIdForGroup(link2.group_id, orgsWithTeams);
       if (!resolved) {
         sp.stop("Failed.");
-        f2.error(`Could not find an org that owns group ${import_picocolors37.default.bold(link2.group_id)}. ` + `Pass ${import_picocolors37.default.cyan("--org <id>")} explicitly.`);
+        f2.error(`Could not find an org that owns group ${import_picocolors41.default.bold(link2.group_id)}. ` + `Pass ${import_picocolors41.default.cyan("--org <id>")} explicitly.`);
         return;
       }
       orgId = resolved;
@@ -67134,14 +67456,14 @@ async function runOrchestrationAddAgent(cwd2, args) {
   if (from.length === 0 && to2.length === 0 && isInteractive() && manifest.members.length > 0) {
     const memberOptions = manifest.members.map((m3) => ({ value: m3.slug, label: m3.slug }));
     const pickedFrom = await ae({
-      message: `Connect ${import_picocolors37.default.bold(slug)} FROM which member(s)? — edges INTO ${slug} (space to select, enter to skip)`,
+      message: `Connect ${import_picocolors41.default.bold(slug)} FROM which member(s)? — edges INTO ${slug} (space to select, enter to skip)`,
       options: memberOptions,
       required: false
     });
     if (Array.isArray(pickedFrom))
       from = pickedFrom;
     const pickedTo = await ae({
-      message: `Connect ${import_picocolors37.default.bold(slug)} TO which member(s)? — edges OUT of ${slug} (space to select, enter to skip)`,
+      message: `Connect ${import_picocolors41.default.bold(slug)} TO which member(s)? — edges OUT of ${slug} (space to select, enter to skip)`,
       options: memberOptions,
       required: false
     });
@@ -67180,23 +67502,23 @@ async function runOrchestrationAddAgent(cwd2, args) {
   }
   writeOrchManifest(cwd2, updated);
   if (args.noPush) {
-    f2.info(`Manifest updated. Run ${import_picocolors37.default.cyan("brainbase orchestration push")} to apply.`);
+    f2.info(`Manifest updated. Run ${import_picocolors41.default.cyan("brainbase orchestration push")} to apply.`);
     return;
   }
   await runOrchestrationPush(cwd2, { yes: true, graphOnly: true });
 }
 
 // src/cli/orchestration-create.ts
-var import_picocolors38 = __toESM(require_picocolors(), 1);
+var import_picocolors42 = __toESM(require_picocolors(), 1);
 async function runOrchestrationCreate(cwd2, args) {
   banner("orchestration create — claim a brainbase-orchestration.yaml");
   if (readOrchLink(cwd2)) {
     f2.warn("This folder is already linked to an orchestration.");
-    f2.info(`Run ${import_picocolors38.default.cyan("brainbase orchestration push")} to update it.`);
+    f2.info(`Run ${import_picocolors42.default.cyan("brainbase orchestration push")} to update it.`);
     return;
   }
   if (!hasOrchManifest(cwd2)) {
-    f2.warn(`No ${import_picocolors38.default.bold(ORCH_MANIFEST_FILE)} here.`);
+    f2.warn(`No ${import_picocolors42.default.bold(ORCH_MANIFEST_FILE)} here.`);
     f2.info(`Create one, or pull an existing orchestration first.`);
     return;
   }
@@ -67222,15 +67544,17 @@ async function runOrchestrationCreate(cwd2, args) {
     process.exitCode = 1;
     return;
   }
-  const target = await resolveOrgAndTeam(args);
-  if (!target)
-    return;
+  const target = await resolveOrgAndTeam({
+    orgId: args.orgId,
+    teamId: args.teamId,
+    announce: true
+  });
   const plan = [
     "",
-    `  ${import_picocolors38.default.bold(manifest.orchestration.name)}`,
-    `  ${import_picocolors38.default.dim("org")}      ${import_picocolors38.default.bold(target.org.name)}`,
-    `  ${import_picocolors38.default.dim("team")}     ${import_picocolors38.default.bold(target.team.name)}`,
-    `  ${import_picocolors38.default.dim("graph")}    ${manifest.members.length} member${manifest.members.length === 1 ? "" : "s"}, ${manifest.edges.length} edge${manifest.edges.length === 1 ? "" : "s"}, ${graph.triggers.length} trigger${graph.triggers.length === 1 ? "" : "s"}`,
+    `  ${import_picocolors42.default.bold(manifest.orchestration.name)}`,
+    `  ${import_picocolors42.default.dim("org")}      ${import_picocolors42.default.bold(target.org.name)}`,
+    `  ${import_picocolors42.default.dim("team")}     ${import_picocolors42.default.bold(target.team.name)}`,
+    `  ${import_picocolors42.default.dim("graph")}    ${manifest.members.length} member${manifest.members.length === 1 ? "" : "s"}, ${manifest.edges.length} edge${manifest.edges.length === 1 ? "" : "s"}, ${graph.triggers.length} trigger${graph.triggers.length === 1 ? "" : "s"}`,
     ""
   ];
   console.log(plan.join(`
@@ -67260,7 +67584,7 @@ async function runOrchestrationCreate(cwd2, args) {
       edges: graph.edges,
       triggers: graph.triggers
     });
-    sp.stop(`Created ${import_picocolors38.default.bold(created.name)}.`);
+    sp.stop(`Created ${import_picocolors42.default.bold(created.name)}.`);
     writeOrchLink(cwd2, {
       schemaVersion: 1,
       orchestration_id: created.id,
@@ -67291,92 +67615,11 @@ async function runOrchestrationCreate(cwd2, args) {
     $e(`Created ${created.name} at revision ${created.revision}.`);
   } catch (err) {
     sp.stop("Failed.");
-    handleApiError8(err);
-    process.exitCode = 1;
-  }
-}
-async function resolveOrgAndTeam(args) {
-  const orgsSpinner = de();
-  orgsSpinner.start("Loading your organizations…");
-  let orgs;
-  try {
-    orgs = await api.listOrgs();
-  } catch (err) {
-    orgsSpinner.stop("Failed.");
-    handleApiError8(err);
-    process.exitCode = 1;
-    return null;
-  }
-  orgsSpinner.stop(`Found ${orgs.length} organization${orgs.length === 1 ? "" : "s"}.`);
-  if (orgs.length === 0) {
-    f2.warn("You are not in any organizations yet.");
-    process.exitCode = 1;
-    return null;
-  }
-  let org;
-  if (args.orgId) {
-    const found = orgs.find((o2) => o2.id === args.orgId || o2.slug === args.orgId);
-    if (!found) {
-      f2.error(`Org ${args.orgId} not found or you're not a member.`);
-      process.exitCode = 1;
-      return null;
-    }
-    org = found;
-  } else if (orgs.length === 1) {
-    org = orgs[0];
-    f2.info(`Using organization ${import_picocolors38.default.bold(org.name)}.`);
-  } else if (!isInteractive()) {
-    throw new NonInteractiveError("Multiple organizations. Pass --org <id-or-slug> to choose non-interactively.");
-  } else {
-    const orgId = await select({
-      message: "Pick an organization",
-      options: orgs.map((o2) => ({ value: o2.id, label: o2.name, hint: o2.role })),
-      flagHint: "Pass --org <id-or-slug> to choose non-interactively."
-    });
-    org = orgs.find((o2) => o2.id === orgId);
-  }
-  const teamsSpinner = de();
-  teamsSpinner.start(`Loading teams in ${org.name}…`);
-  let teams;
-  try {
-    teams = await api.listTeams(org.id);
-  } catch (err) {
-    teamsSpinner.stop("Failed.");
-    handleApiError8(err);
+    handleApiError7(err);
     process.exitCode = 1;
-    return null;
   }
-  teamsSpinner.stop(`Found ${teams.length} team${teams.length === 1 ? "" : "s"}.`);
-  if (teams.length === 0) {
-    f2.warn(`No teams in ${org.name} yet.`);
-    process.exitCode = 1;
-    return null;
-  }
-  let team;
-  if (args.teamId) {
-    const found = teams.find((t) => t.id === args.teamId);
-    if (!found) {
-      f2.error(`Team ${args.teamId} not found in this org.`);
-      process.exitCode = 1;
-      return null;
-    }
-    team = found;
-  } else if (teams.length === 1) {
-    team = teams[0];
-    f2.info(`Using team ${import_picocolors38.default.bold(team.name)}.`);
-  } else if (!isInteractive()) {
-    throw new NonInteractiveError("Multiple teams. Pass --team <id> to choose non-interactively.");
-  } else {
-    const teamId = await select({
-      message: "Pick a team",
-      options: teams.map((t) => ({ value: t.id, label: t.name, hint: t.role })),
-      flagHint: "Pass --team <id> to choose non-interactively."
-    });
-    team = teams.find((t) => t.id === teamId);
-  }
-  return { org, team };
 }
-function handleApiError8(err) {
+function handleApiError7(err) {
   if (err instanceof ApiError) {
     if (err.status === 401) {
       f2.error("Your session is invalid. Run `brainbase login` and try again.");
@@ -67393,7 +67636,7 @@ function handleApiError8(err) {
 // src/cli/orchestration.ts
 async function runOrchestration(cwd2, sub, args, opts) {
   if (args.some((arg) => arg === "--help" || arg === "-h")) {
-    printHelp2();
+    printHelp3();
     return;
   }
   switch (sub) {
@@ -67442,33 +67685,33 @@ async function runOrchestration(cwd2, sub, args, opts) {
     case "help":
     case "-h":
     case "--help":
-      printHelp2();
+      printHelp3();
       return;
     default:
       console.error(`Unknown orchestration subcommand: ${sub}
 `);
-      printHelp2();
+      printHelp3();
       process.exit(1);
   }
 }
-function printHelp2() {
+function printHelp3() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors39.default.bold("brainbase orchestration")} ${import_picocolors39.default.dim("<sub> [options]")}`);
+  out.push(`  ${import_picocolors43.default.bold("brainbase orchestration")} ${import_picocolors43.default.dim("<sub> [options]")}`);
   out.push("");
-  out.push(`  ${import_picocolors39.default.cyan("create")}           ${import_picocolors39.default.dim("claim a local orchestration manifest and create it in the cloud")}`);
-  out.push(`  ${import_picocolors39.default.cyan("pull")} ${import_picocolors39.default.dim("<id>")}      ${import_picocolors39.default.dim("fetch orchestration + every member agent into this folder")}`);
-  out.push(`  ${import_picocolors39.default.cyan("push")}             ${import_picocolors39.default.dim("push each member, then update the orchestration graph")}`);
-  out.push(`  ${import_picocolors39.default.cyan("add-agent")} ${import_picocolors39.default.dim("<name>")}    ${import_picocolors39.default.dim("create a member agent, wire edges (--from/--to), and push")}`);
-  out.push(`  ${import_picocolors39.default.cyan("status")}           ${import_picocolors39.default.dim("show what would push and what would pull")}`);
-  out.push(`  ${import_picocolors39.default.cyan("list")}             ${import_picocolors39.default.dim("list orchestrations under a team")}`);
+  out.push(`  ${import_picocolors43.default.cyan("create")}           ${import_picocolors43.default.dim("claim a local orchestration manifest and create it in the cloud")}`);
+  out.push(`  ${import_picocolors43.default.cyan("pull")} ${import_picocolors43.default.dim("<id>")}      ${import_picocolors43.default.dim("fetch orchestration + every member agent into this folder")}`);
+  out.push(`  ${import_picocolors43.default.cyan("push")}             ${import_picocolors43.default.dim("push each member, then update the orchestration graph")}`);
+  out.push(`  ${import_picocolors43.default.cyan("add-agent")} ${import_picocolors43.default.dim("<name>")}    ${import_picocolors43.default.dim("create a member agent, wire edges (--from/--to), and push")}`);
+  out.push(`  ${import_picocolors43.default.cyan("status")}           ${import_picocolors43.default.dim("show what would push and what would pull")}`);
+  out.push(`  ${import_picocolors43.default.cyan("list")}             ${import_picocolors43.default.dim("list orchestrations under a team")}`);
   out.push("");
-  out.push(`  ${import_picocolors39.default.bold("Flags")}`);
-  out.push(`    ${import_picocolors39.default.dim("--yes, -y")}        skip confirmations`);
-  out.push(`    ${import_picocolors39.default.dim("--harness <id>")}   harness for newly-created member folders (default claude-code)`);
-  out.push(`    ${import_picocolors39.default.dim("--graph-only")}     for push: only update members + edges, skip per-member push`);
-  out.push(`    ${import_picocolors39.default.dim("--org <id>")}       for create/list: org id or slug (CLI vocab — DB teams.id)`);
-  out.push(`    ${import_picocolors39.default.dim("--team <id>")}      for create/list: team id (CLI vocab — DB groups.id)`);
+  out.push(`  ${import_picocolors43.default.bold("Flags")}`);
+  out.push(`    ${import_picocolors43.default.dim("--yes, -y")}        skip confirmations`);
+  out.push(`    ${import_picocolors43.default.dim("--harness <id>")}   harness for newly-created member folders (default claude-code)`);
+  out.push(`    ${import_picocolors43.default.dim("--graph-only")}     for push: only update members + edges, skip per-member push`);
+  out.push(`    ${import_picocolors43.default.dim("--org <id>")}       for create/list: org id or slug (CLI vocab — DB teams.id)`);
+  out.push(`    ${import_picocolors43.default.dim("--team <id>")}      for create/list: team id (CLI vocab — DB groups.id)`);
   out.push("");
   console.log(out.join(`
 `));
@@ -67513,16 +67756,16 @@ async function runRun(cwd2, args) {
 }
 
 // src/cli/publish.ts
-var import_picocolors40 = __toESM(require_picocolors(), 1);
+var import_picocolors44 = __toESM(require_picocolors(), 1);
 async function runPublish(cwd2, _args) {
   banner("publish — send your changes to the team");
   const link2 = readLink(cwd2);
   if (!link2) {
     f2.warn("This folder is not linked to any agent.");
-    f2.info(`Run ${import_picocolors40.default.cyan("brainbase link")} first.`);
+    f2.info(`Run ${import_picocolors44.default.cyan("brainbase link")} first.`);
     return;
   }
-  f2.info(`${import_picocolors40.default.bold("publish")} is coming soon — for now, edit the agent on the web app and run ${import_picocolors40.default.cyan("brainbase sync")} to bring changes here.`);
+  f2.info(`${import_picocolors44.default.bold("publish")} is coming soon — for now, edit the agent on the web app and run ${import_picocolors44.default.cyan("brainbase sync")} to bring changes here.`);
 }
 
 // src/ui/ink/StatusCard.tsx
@@ -67820,7 +68063,7 @@ async function runStatus(cwd2) {
 }
 
 // src/cli/token.ts
-var import_picocolors41 = __toESM(require_picocolors(), 1);
+var import_picocolors45 = __toESM(require_picocolors(), 1);
 
 // src/ui/ink/TokenCards.tsx
 var jsx_dev_runtime17 = __toESM(require_jsx_dev_runtime(), 1);
@@ -68114,7 +68357,7 @@ async function runTokenRevoke(args) {
   }
   if (!autoProceed(args.yes)) {
     const ok = await se({
-      message: `Revoke token ${import_picocolors41.default.bold(args.id)}? CIs and machines using it will stop working.`,
+      message: `Revoke token ${import_picocolors45.default.bold(args.id)}? CIs and machines using it will stop working.`,
       initialValue: false
     });
     if (!ensureNotCancelled(ok))
@@ -68129,7 +68372,7 @@ async function runTokenRevoke(args) {
 }
 async function runTokenClear() {
   if (!readToken()) {
-    console.log(import_picocolors41.default.dim("No local token stored."));
+    console.log(import_picocolors45.default.dim("No local token stored."));
     return;
   }
   clearToken();
@@ -68180,24 +68423,24 @@ async function runToken(sub, rest2, args) {
 function printTokenHelp() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors41.default.bold("brainbase token")} ${import_picocolors41.default.dim("<command>")}`);
+  out.push(`  ${import_picocolors45.default.bold("brainbase token")} ${import_picocolors45.default.dim("<command>")}`);
   out.push("");
-  out.push(`  ${import_picocolors41.default.cyan("create")}                        ${import_picocolors41.default.dim("issue a new long-lived CLI key (PAT)")}`);
-  out.push(`  ${import_picocolors41.default.cyan("list")}                          ${import_picocolors41.default.dim("show your active tokens")}`);
-  out.push(`  ${import_picocolors41.default.cyan("revoke")} ${import_picocolors41.default.dim("<id>")}                  ${import_picocolors41.default.dim("revoke a token by id")}`);
-  out.push(`  ${import_picocolors41.default.cyan("clear")}                         ${import_picocolors41.default.dim("forget the local token (does not revoke)")}`);
+  out.push(`  ${import_picocolors45.default.cyan("create")}                        ${import_picocolors45.default.dim("issue a new long-lived CLI key (PAT)")}`);
+  out.push(`  ${import_picocolors45.default.cyan("list")}                          ${import_picocolors45.default.dim("show your active tokens")}`);
+  out.push(`  ${import_picocolors45.default.cyan("revoke")} ${import_picocolors45.default.dim("<id>")}                  ${import_picocolors45.default.dim("revoke a token by id")}`);
+  out.push(`  ${import_picocolors45.default.cyan("clear")}                         ${import_picocolors45.default.dim("forget the local token (does not revoke)")}`);
   out.push("");
-  out.push(`  ${import_picocolors41.default.bold("create flags")}`);
-  out.push(`  ${import_picocolors41.default.cyan("--name, -n")} ${import_picocolors41.default.dim("<label>")}        ${import_picocolors41.default.dim("token label (prompted if omitted)")}`);
-  out.push(`  ${import_picocolors41.default.cyan("--scopes")} ${import_picocolors41.default.dim("<list>")}           ${import_picocolors41.default.dim("comma-separated; allowed: read, publish, admin")}`);
-  out.push(`                                ${import_picocolors41.default.dim("default: read,publish")}`);
+  out.push(`  ${import_picocolors45.default.bold("create flags")}`);
+  out.push(`  ${import_picocolors45.default.cyan("--name, -n")} ${import_picocolors45.default.dim("<label>")}        ${import_picocolors45.default.dim("token label (prompted if omitted)")}`);
+  out.push(`  ${import_picocolors45.default.cyan("--scopes")} ${import_picocolors45.default.dim("<list>")}           ${import_picocolors45.default.dim("comma-separated; allowed: read, publish, admin")}`);
+  out.push(`                                ${import_picocolors45.default.dim("default: read,publish")}`);
   out.push("");
   console.log(out.join(`
 `));
 }
 
 // src/cli/mcp.ts
-var import_picocolors42 = __toESM(require_picocolors(), 1);
+var import_picocolors46 = __toESM(require_picocolors(), 1);
 
 // src/core/mcp-check/collect-servers.ts
 import path86 from "node:path";
@@ -74660,8 +74903,8 @@ async function random2(size2) {
   const evenDistCutoff = Math.pow(2, 8) - Math.pow(2, 8) % mask.length;
   let result2 = "";
   while (result2.length < size2) {
-    const randomBytes2 = await getRandomValues(size2 - result2.length);
-    for (const randomByte of randomBytes2) {
+    const randomBytes = await getRandomValues(size2 - result2.length);
+    for (const randomByte of randomBytes) {
       if (randomByte < evenDistCutoff) {
         result2 += mask[randomByte % mask.length];
       }
@@ -76545,17 +76788,17 @@ async function runMcpCheck(cwd2, options) {
 function renderHuman(report) {
   const lines = [];
   if (report.check_status === "skipped") {
-    lines.push(import_picocolors42.default.dim("No MCP servers configured — nothing to check."));
+    lines.push(import_picocolors46.default.dim("No MCP servers configured — nothing to check."));
     return lines.join(`
 `) + `
 `;
   }
   for (const s3 of report.servers) {
-    const mark = s3.status === "ok" ? import_picocolors42.default.green("✓") : s3.status === "auth_failed" ? import_picocolors42.default.red("✗") : import_picocolors42.default.yellow("⚠");
-    const detail = s3.status === "ok" ? import_picocolors42.default.dim(`${s3.tool_count} tool${s3.tool_count === 1 ? "" : "s"}`) : import_picocolors42.default.dim(s3.status + (s3.error ? ` — ${s3.error}` : ""));
+    const mark = s3.status === "ok" ? import_picocolors46.default.green("✓") : s3.status === "auth_failed" ? import_picocolors46.default.red("✗") : import_picocolors46.default.yellow("⚠");
+    const detail = s3.status === "ok" ? import_picocolors46.default.dim(`${s3.tool_count} tool${s3.tool_count === 1 ? "" : "s"}`) : import_picocolors46.default.dim(s3.status + (s3.error ? ` — ${s3.error}` : ""));
     lines.push(`  ${mark} ${s3.name}  ${detail}`);
   }
-  const summary = report.check_status === "ok" ? import_picocolors42.default.green("All MCP servers connected.") : import_picocolors42.default.yellow("Some MCP servers are unhealthy.");
+  const summary = report.check_status === "ok" ? import_picocolors46.default.green("All MCP servers connected.") : import_picocolors46.default.yellow("Some MCP servers are unhealthy.");
   lines.push("", summary);
   return lines.join(`
 `) + `
@@ -76578,7 +76821,7 @@ async function runMcp(cwd2, sub, _argv, options) {
 }
 
 // src/cli/task.ts
-var import_picocolors43 = __toESM(require_picocolors(), 1);
+var import_picocolors47 = __toESM(require_picocolors(), 1);
 
 // src/cli/task-create.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
@@ -76742,7 +76985,7 @@ async function runTask(cwd2, sub, args) {
     case "create": {
       const parsed = parseCreateArgs(args);
       if (parsed.help) {
-        printHelp3();
+        printHelp4();
         return;
       }
       await runTaskCreate(cwd2, parsed.options);
@@ -76752,30 +76995,30 @@ async function runTask(cwd2, sub, args) {
     case "help":
     case "-h":
     case "--help":
-      printHelp3();
+      printHelp4();
       return;
     default:
       console.error(`Unknown task subcommand: ${sub}
 `);
-      printHelp3();
+      printHelp4();
       process.exit(1);
   }
 }
-function printHelp3() {
+function printHelp4() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors43.default.bold("brainbase task")} ${import_picocolors43.default.dim("<sub> [options]")}`);
+  out.push(`  ${import_picocolors47.default.bold("brainbase task")} ${import_picocolors47.default.dim("<sub> [options]")}`);
   out.push("");
-  out.push(`  ${import_picocolors43.default.cyan("create")} ${import_picocolors43.default.dim("--message <text>")}   ${import_picocolors43.default.dim("create a task and start its first run")}`);
+  out.push(`  ${import_picocolors47.default.cyan("create")} ${import_picocolors47.default.dim("--message <text>")}   ${import_picocolors47.default.dim("create a task and start its first run")}`);
   out.push("");
-  out.push(`  ${import_picocolors43.default.bold("create flags")}`);
-  out.push(`  ${import_picocolors43.default.dim("--message <text>")}   required first user message`);
-  out.push(`  ${import_picocolors43.default.dim("--agent <id>")}       override the claimed agent in brainbase.agent.yaml`);
-  out.push(`  ${import_picocolors43.default.dim("--title <text>")}     optional task title`);
-  out.push(`  ${import_picocolors43.default.dim("--model <id>")}       optional model override`);
-  out.push(`  ${import_picocolors43.default.dim("--json")}             print task_id, agent_id, and status as JSON`);
+  out.push(`  ${import_picocolors47.default.bold("create flags")}`);
+  out.push(`  ${import_picocolors47.default.dim("--message <text>")}   required first user message`);
+  out.push(`  ${import_picocolors47.default.dim("--agent <id>")}       override the claimed agent in brainbase.agent.yaml`);
+  out.push(`  ${import_picocolors47.default.dim("--title <text>")}     optional task title`);
+  out.push(`  ${import_picocolors47.default.dim("--model <id>")}       optional model override`);
+  out.push(`  ${import_picocolors47.default.dim("--json")}             print task_id, agent_id, and status as JSON`);
   out.push("");
-  out.push(`  ${import_picocolors43.default.dim("Flag-like values:")} use ${import_picocolors43.default.cyan("--flag=value")} or ${import_picocolors43.default.cyan("--flag -- <value>")}`);
+  out.push(`  ${import_picocolors47.default.dim("Flag-like values:")} use ${import_picocolors47.default.cyan("--flag=value")} or ${import_picocolors47.default.cyan("--flag -- <value>")}`);
   out.push("");
   console.log(out.join(`
 `));
@@ -76801,108 +77044,115 @@ var STORED_PAT_COMMANDS = new Set([
 function help() {
   const out = [];
   out.push("");
-  out.push(`  ${brandTint("◆")}  ${import_picocolors44.default.bold("brainbase")}  ${import_picocolors44.default.dim(`v${VERSION}`)}`);
-  out.push(`     ${import_picocolors44.default.dim("connect your local agent to the brainbase platform")}`);
+  out.push(`  ${brandTint("◆")}  ${import_picocolors48.default.bold("brainbase")}  ${import_picocolors48.default.dim(`v${VERSION}`)}`);
+  out.push(`     ${import_picocolors48.default.dim("connect your local agent to the brainbase platform")}`);
   out.push("");
   out.push(divider("USAGE"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.bold("brainbase")} ${import_picocolors44.default.dim("<command> [options]")}`);
+  out.push(`  ${import_picocolors48.default.bold("brainbase")} ${import_picocolors48.default.dim("<command> [options]")}`);
   out.push("");
   out.push(divider("AUTH"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("login")}     ${import_picocolors44.default.dim("  open the web app and connect this device")}`);
-  out.push(`  ${import_picocolors44.default.cyan("logout")}    ${import_picocolors44.default.dim("  clear the local session")}`);
-  out.push(`  ${import_picocolors44.default.cyan("whoami")}    ${import_picocolors44.default.dim("  show the current user")}`);
+  out.push(`  ${import_picocolors48.default.cyan("login")}     ${import_picocolors48.default.dim("  open the web app and connect this device")}`);
+  out.push(`  ${import_picocolors48.default.cyan("logout")}    ${import_picocolors48.default.dim("  clear the local session")}`);
+  out.push(`  ${import_picocolors48.default.cyan("whoami")}    ${import_picocolors48.default.dim("  show the current user")}`);
+  out.push("");
+  out.push(divider("DISCOVERY"));
+  out.push("");
+  out.push(`  ${import_picocolors48.default.cyan("team list")}                  ${import_picocolors48.default.dim("show the teams you can create agents in")}`);
+  out.push(`  ${import_picocolors48.default.cyan("agent list")}                 ${import_picocolors48.default.dim("show a team's agents and their ids")}`);
   out.push("");
   out.push(divider("LINKED AGENT"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("agent create")}               ${import_picocolors44.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
-  out.push(`  ${import_picocolors44.default.cyan("agent pull")} ${import_picocolors44.default.dim("[<id>]")}          ${import_picocolors44.default.dim("bring cloud changes into this folder (--force to override; --run-entrypoint to also execute the agent entrypoint)")}`);
-  out.push(`  ${import_picocolors44.default.cyan("agent push")}                 ${import_picocolors44.default.dim("send local changes to the cloud (--force to overwrite cloud-side conflicts with local)")}`);
-  out.push(`  ${import_picocolors44.default.cyan("agent unpack")}               ${import_picocolors44.default.dim("install the claimed agent into a harness layout")}`);
-  out.push(`  ${import_picocolors44.default.cyan("link")}                       ${import_picocolors44.default.dim("attach this folder to an existing agent")}`);
-  out.push(`  ${import_picocolors44.default.cyan("agent status")}               ${import_picocolors44.default.dim("show what would pull and what would push")}`);
-  out.push(`  ${import_picocolors44.default.cyan("agent env")}                  ${import_picocolors44.default.dim("print export lines for `eval $(brainbase agent env)`")}`);
-  out.push(`  ${import_picocolors44.default.cyan("run")} ${import_picocolors44.default.dim("<cmd> [args...]")}         ${import_picocolors44.default.dim("run <cmd> with secrets.env loaded into env")}`);
-  out.push(`  ${import_picocolors44.default.cyan("status")}                     ${import_picocolors44.default.dim("show what this folder is linked to")}`);
-  out.push(`  ${import_picocolors44.default.cyan("unlink")}                     ${import_picocolors44.default.dim("disconnect this folder")}`);
+  out.push(`  ${import_picocolors48.default.cyan("agent create")}               ${import_picocolors48.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
+  out.push(`  ${import_picocolors48.default.cyan("agent pull")} ${import_picocolors48.default.dim("[<id>]")}          ${import_picocolors48.default.dim("bring cloud changes into this folder (--force to override; --run-entrypoint to also execute the agent entrypoint)")}`);
+  out.push(`  ${import_picocolors48.default.cyan("agent push")}                 ${import_picocolors48.default.dim("send local changes to the cloud (--force to overwrite cloud-side conflicts with local)")}`);
+  out.push(`  ${import_picocolors48.default.cyan("agent unpack")}               ${import_picocolors48.default.dim("install the claimed agent into a harness layout")}`);
+  out.push(`  ${import_picocolors48.default.cyan("link")}                       ${import_picocolors48.default.dim("attach this folder to an existing agent")}`);
+  out.push(`  ${import_picocolors48.default.cyan("agent status")}               ${import_picocolors48.default.dim("show what would pull and what would push")}`);
+  out.push(`  ${import_picocolors48.default.cyan("agent env")}                  ${import_picocolors48.default.dim("print export lines for `eval $(brainbase agent env)`")}`);
+  out.push(`  ${import_picocolors48.default.cyan("run")} ${import_picocolors48.default.dim("<cmd> [args...]")}         ${import_picocolors48.default.dim("run <cmd> with secrets.env loaded into env")}`);
+  out.push(`  ${import_picocolors48.default.cyan("status")}                     ${import_picocolors48.default.dim("show what this folder is linked to")}`);
+  out.push(`  ${import_picocolors48.default.cyan("unlink")}                     ${import_picocolors48.default.dim("disconnect this folder")}`);
   out.push("");
   out.push(divider("TASKS"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("task create")} ${import_picocolors44.default.dim("--message <text>")}   ${import_picocolors44.default.dim("create a managed task and start its first run")}`);
+  out.push(`  ${import_picocolors48.default.cyan("task create")} ${import_picocolors48.default.dim("--message <text>")}   ${import_picocolors48.default.dim("create a managed task and start its first run")}`);
   out.push("");
   out.push(divider("ORCHESTRATIONS"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("orchestration create")}           ${import_picocolors44.default.dim("claim a local orchestration manifest and create it in the cloud")}`);
-  out.push(`  ${import_picocolors44.default.cyan("orchestration list")}             ${import_picocolors44.default.dim("list orchestrations under a team")}`);
-  out.push(`  ${import_picocolors44.default.cyan("orchestration pull")} ${import_picocolors44.default.dim("<id>")}        ${import_picocolors44.default.dim("recursively fetch an orchestration + every member agent")}`);
-  out.push(`  ${import_picocolors44.default.cyan("orchestration push")}             ${import_picocolors44.default.dim("recursively push each member, then update the graph")}`);
-  out.push(`  ${import_picocolors44.default.cyan("orchestration status")}           ${import_picocolors44.default.dim("show what would push and what would pull")}`);
+  out.push(`  ${import_picocolors48.default.cyan("orchestration create")}           ${import_picocolors48.default.dim("claim a local orchestration manifest and create it in the cloud")}`);
+  out.push(`  ${import_picocolors48.default.cyan("orchestration list")}             ${import_picocolors48.default.dim("list orchestrations under a team")}`);
+  out.push(`  ${import_picocolors48.default.cyan("orchestration pull")} ${import_picocolors48.default.dim("<id>")}        ${import_picocolors48.default.dim("recursively fetch an orchestration + every member agent")}`);
+  out.push(`  ${import_picocolors48.default.cyan("orchestration push")}             ${import_picocolors48.default.dim("recursively push each member, then update the graph")}`);
+  out.push(`  ${import_picocolors48.default.cyan("orchestration status")}           ${import_picocolors48.default.dim("show what would push and what would pull")}`);
   out.push("");
   out.push(divider("TEMPLATES"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("template pack")}                       ${import_picocolors44.default.dim("bundle the current agent into a template")}`);
-  out.push(`  ${import_picocolors44.default.cyan("template publish")}                    ${import_picocolors44.default.dim("upload a template to the registry")}`);
-  out.push(`  ${import_picocolors44.default.cyan("template search")} ${import_picocolors44.default.dim("[query]")}             ${import_picocolors44.default.dim("search the registry")}`);
-  out.push(`  ${import_picocolors44.default.cyan("template info")}    ${import_picocolors44.default.dim("<creator/slug>")}     ${import_picocolors44.default.dim("show registry details for a template")}`);
-  out.push(`  ${import_picocolors44.default.cyan("template onboard")} ${import_picocolors44.default.dim("<creator/slug>")}     ${import_picocolors44.default.dim("install (or refresh) a template")}`);
-  out.push(`  ${import_picocolors44.default.cyan("template list")}                       ${import_picocolors44.default.dim("show installed templates")}`);
-  out.push(`  ${import_picocolors44.default.cyan("template remove")}  ${import_picocolors44.default.dim("<creator/slug>")}     ${import_picocolors44.default.dim("uninstall a template")}`);
+  out.push(`  ${import_picocolors48.default.cyan("template pack")}                       ${import_picocolors48.default.dim("bundle the current agent into a template")}`);
+  out.push(`  ${import_picocolors48.default.cyan("template publish")}                    ${import_picocolors48.default.dim("upload a template to the registry")}`);
+  out.push(`  ${import_picocolors48.default.cyan("template search")} ${import_picocolors48.default.dim("[query]")}             ${import_picocolors48.default.dim("search the registry")}`);
+  out.push(`  ${import_picocolors48.default.cyan("template info")}    ${import_picocolors48.default.dim("<creator/slug>")}     ${import_picocolors48.default.dim("show registry details for a template")}`);
+  out.push(`  ${import_picocolors48.default.cyan("template onboard")} ${import_picocolors48.default.dim("<creator/slug>")}     ${import_picocolors48.default.dim("install (or refresh) a template")}`);
+  out.push(`  ${import_picocolors48.default.cyan("template list")}                       ${import_picocolors48.default.dim("show installed templates")}`);
+  out.push(`  ${import_picocolors48.default.cyan("template remove")}  ${import_picocolors48.default.dim("<creator/slug>")}     ${import_picocolors48.default.dim("uninstall a template")}`);
   out.push("");
   out.push(divider("SKILLS"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("skill add")} ${import_picocolors44.default.dim("<source>")}                  ${import_picocolors44.default.dim("install a skill (github / git / brainbase)")}`);
-  out.push(`  ${import_picocolors44.default.cyan("skill list")}                            ${import_picocolors44.default.dim("show locally installed skills + their source")}`);
-  out.push(`  ${import_picocolors44.default.cyan("skill update")} ${import_picocolors44.default.dim("<slug>")}                  ${import_picocolors44.default.dim("re-fetch a skill from its recorded source")}`);
-  out.push(`  ${import_picocolors44.default.cyan("skill remove")} ${import_picocolors44.default.dim("<slug>")}                  ${import_picocolors44.default.dim("uninstall a skill")}`);
-  out.push(`  ${import_picocolors44.default.cyan("skill search")} ${import_picocolors44.default.dim("[query]")}                 ${import_picocolors44.default.dim("search the brainbase skill registry")}`);
-  out.push(`  ${import_picocolors44.default.cyan("skill info")} ${import_picocolors44.default.dim("<creator/slug>")}            ${import_picocolors44.default.dim("show registry details for a skill")}`);
-  out.push(`  ${import_picocolors44.default.cyan("skill publish")} ${import_picocolors44.default.dim("[dir]")}                  ${import_picocolors44.default.dim("publish a SKILL.md folder (defaults to .)")}`);
+  out.push(`  ${import_picocolors48.default.cyan("skill add")} ${import_picocolors48.default.dim("<source>")}                  ${import_picocolors48.default.dim("install a skill (github / git / brainbase)")}`);
+  out.push(`  ${import_picocolors48.default.cyan("skill list")}                            ${import_picocolors48.default.dim("show locally installed skills + their source")}`);
+  out.push(`  ${import_picocolors48.default.cyan("skill update")} ${import_picocolors48.default.dim("<slug>")}                  ${import_picocolors48.default.dim("re-fetch a skill from its recorded source")}`);
+  out.push(`  ${import_picocolors48.default.cyan("skill remove")} ${import_picocolors48.default.dim("<slug>")}                  ${import_picocolors48.default.dim("uninstall a skill")}`);
+  out.push(`  ${import_picocolors48.default.cyan("skill search")} ${import_picocolors48.default.dim("[query]")}                 ${import_picocolors48.default.dim("search the brainbase skill registry")}`);
+  out.push(`  ${import_picocolors48.default.cyan("skill info")} ${import_picocolors48.default.dim("<creator/slug>")}            ${import_picocolors48.default.dim("show registry details for a skill")}`);
+  out.push(`  ${import_picocolors48.default.cyan("skill publish")} ${import_picocolors48.default.dim("[dir]")}                  ${import_picocolors48.default.dim("publish a SKILL.md folder (defaults to .)")}`);
   out.push("");
   out.push(divider("CLI TOKENS"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("token create")}                        ${import_picocolors44.default.dim("issue a long-lived CLI key for CI / scripts")}`);
-  out.push(`  ${import_picocolors44.default.cyan("token list")}                          ${import_picocolors44.default.dim("show your active tokens")}`);
-  out.push(`  ${import_picocolors44.default.cyan("token revoke")} ${import_picocolors44.default.dim("<id>")}                  ${import_picocolors44.default.dim("revoke a token")}`);
+  out.push(`  ${import_picocolors48.default.cyan("token create")}                        ${import_picocolors48.default.dim("issue a long-lived CLI key for CI / scripts")}`);
+  out.push(`  ${import_picocolors48.default.cyan("token list")}                          ${import_picocolors48.default.dim("show your active tokens")}`);
+  out.push(`  ${import_picocolors48.default.cyan("token revoke")} ${import_picocolors48.default.dim("<id>")}                  ${import_picocolors48.default.dim("revoke a token")}`);
   out.push("");
   out.push(divider("MCP"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.cyan("mcp check")} ${import_picocolors44.default.dim("[--json]")}              ${import_picocolors44.default.dim("verify MCP server connectivity through the brainbase proxy (runs at sandbox bootstrap)")}`);
+  out.push(`  ${import_picocolors48.default.cyan("mcp check")} ${import_picocolors48.default.dim("[--json]")}              ${import_picocolors48.default.dim("verify MCP server connectivity through the brainbase proxy (runs at sandbox bootstrap)")}`);
   out.push("");
   out.push(divider("FLAGS"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.dim("--harness <id>")}     force harness for onboard / sync (e.g. claude-code)`);
-  out.push(`  ${import_picocolors44.default.dim("--scope <s>")}        force scope: global | project`);
-  out.push(`  ${import_picocolors44.default.dim("--yes, -y")}          skip confirmations / auto-overwrite`);
-  out.push(`  ${import_picocolors44.default.dim("--agent <id>")}       for link/task create: use this agent id explicitly`);
-  out.push(`  ${import_picocolors44.default.dim("--message <text>")}   for task create: required first user message`);
-  out.push(`  ${import_picocolors44.default.dim("--title <text>")}     for task create: optional task title`);
-  out.push(`  ${import_picocolors44.default.dim("--model <id>")}       for task create: optional model override`);
-  out.push(`  ${import_picocolors44.default.dim("--json")}             for task create/mcp check: machine-readable output`);
-  out.push(`  ${import_picocolors44.default.dim("--no-tracking")}      for link: skip routing LLM traffic through brainbase`);
-  out.push(`  ${import_picocolors44.default.dim("--track")}            for agent create: enable tracking non-interactively (off without a TTY)`);
-  out.push(`  ${import_picocolors44.default.dim("--shell <sh|fish>")}  for agent env: pick output format (auto-detected from $SHELL)`);
-  out.push(`  ${import_picocolors44.default.dim("--all")}              for template list: include installs from other folders`);
-  out.push(`  ${import_picocolors44.default.dim("--web <url>")}        for login: web app URL (default https://app.brainbaselabs.com)`);
+  out.push(`  ${import_picocolors48.default.dim("--harness <id>")}     force harness for onboard / sync (e.g. claude-code)`);
+  out.push(`  ${import_picocolors48.default.dim("--scope <s>")}        force scope: global | project`);
+  out.push(`  ${import_picocolors48.default.dim("--yes, -y")}          skip confirmations / auto-overwrite`);
+  out.push(`  ${import_picocolors48.default.dim("--agent <id>")}       for link/task create: use this agent id explicitly`);
+  out.push(`  ${import_picocolors48.default.dim("--message <text>")}   for task create: required first user message`);
+  out.push(`  ${import_picocolors48.default.dim("--title <text>")}     for task create: optional task title`);
+  out.push(`  ${import_picocolors48.default.dim("--model <id>")}       for task create: optional model override`);
+  out.push(`  ${import_picocolors48.default.dim("--org <id-or-slug>")} pick the organization (team/agent list, agent create, orchestration create/list)`);
+  out.push(`  ${import_picocolors48.default.dim("--team <id>")}        pick the team, same commands (works without --org)`);
+  out.push(`  ${import_picocolors48.default.dim("--json")}             for team/agent list, task create, mcp check: machine-readable output`);
+  out.push(`  ${import_picocolors48.default.dim("--no-tracking")}      for link: skip routing LLM traffic through brainbase`);
+  out.push(`  ${import_picocolors48.default.dim("--track")}            for agent create: enable tracking non-interactively (off without a TTY)`);
+  out.push(`  ${import_picocolors48.default.dim("--shell <sh|fish>")}  for agent env: pick output format (auto-detected from $SHELL)`);
+  out.push(`  ${import_picocolors48.default.dim("--all")}              for template list: include installs from other folders`);
+  out.push(`  ${import_picocolors48.default.dim("--web <url>")}        for login: web app URL (default https://app.brainbaselabs.com)`);
   out.push("");
   out.push(divider("ENV"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_HOME")}         override the local config dir (default ~/.brainbase)`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_WEB_URL")}      override the web app URL used by login`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_CONTROL_PLANE_URL")} override the MAS host (/v2/cli; task create uses /v2/tasks)`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_API_URL")}      legacy KLS host override (uses /api/cli; proxy/registry fallback)`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_PROXY_URL")}    override the model-proxy URL used by harness traffic (default https://api.v1.brainbaselabs.com)`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_REGISTRY_URL")} override the registry API URL (default https://api.v1.brainbaselabs.com)`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_TOKEN")}        long-lived CLI PAT (overrides token.json)`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_SKIP_AUTH")}    bypass the auth gate for development`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_NON_INTERACTIVE")} force non-interactive mode — skip/auto-default prompts (CI & agents)`);
-  out.push(`  ${import_picocolors44.default.dim("BRAINBASE_RUN_ENTRYPOINT")} =1 → agent pull executes the agent entrypoint (sandbox boots; or pass --run-entrypoint)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_HOME")}         override the local config dir (default ~/.brainbase)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_WEB_URL")}      override the web app URL used by login`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_CONTROL_PLANE_URL")} override the MAS host (/v2/cli; task create uses /v2/tasks)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_API_URL")}      legacy KLS host override (uses /api/cli; proxy/registry fallback)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_PROXY_URL")}    override the model-proxy URL used by harness traffic (default https://api.v1.brainbaselabs.com)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_REGISTRY_URL")} override the registry API URL (default https://api.v1.brainbaselabs.com)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_TOKEN")}        long-lived CLI PAT (overrides token.json)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_SKIP_AUTH")}    bypass the auth gate for development`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_NON_INTERACTIVE")} force non-interactive mode — skip/auto-default prompts (CI & agents)`);
+  out.push(`  ${import_picocolors48.default.dim("BRAINBASE_RUN_ENTRYPOINT")} =1 → agent pull executes the agent entrypoint (sandbox boots; or pass --run-entrypoint)`);
   out.push("");
   out.push(divider("HARNESSES"));
   out.push("");
-  out.push(`  ${import_picocolors44.default.dim("•")} ${import_picocolors44.default.bold("claude-code")}  ${import_picocolors44.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors44.default.dim("•")} ${import_picocolors44.default.bold("codex")}        ${import_picocolors44.default.dim("skills, mcps, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors44.default.dim("•")} ${import_picocolors44.default.bold("kafka")}        ${import_picocolors44.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
+  out.push(`  ${import_picocolors48.default.dim("•")} ${import_picocolors48.default.bold("claude-code")}  ${import_picocolors48.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
+  out.push(`  ${import_picocolors48.default.dim("•")} ${import_picocolors48.default.bold("codex")}        ${import_picocolors48.default.dim("skills, mcps, commands, playbooks, instructions, files")}`);
+  out.push(`  ${import_picocolors48.default.dim("•")} ${import_picocolors48.default.bold("kafka")}        ${import_picocolors48.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
   out.push("");
   console.log(out.join(`
 `));
@@ -76966,13 +77216,13 @@ async function requireAuth(cmd) {
   if (STORED_PAT_COMMANDS.has(cmd) && readToken())
     return;
   console.error("");
-  console.error(`  ${brandTint("◆")}  ${import_picocolors44.default.bold("brainbase")}`);
+  console.error(`  ${brandTint("◆")}  ${import_picocolors48.default.bold("brainbase")}`);
   console.error("");
-  console.error(`  ${import_picocolors44.default.red("✗")}  You need to sign in to use ${import_picocolors44.default.bold("brainbase " + cmd)}.`);
+  console.error(`  ${import_picocolors48.default.red("✗")}  You need to sign in to use ${import_picocolors48.default.bold("brainbase " + cmd)}.`);
   if (status.reason)
-    console.error(`     ${import_picocolors44.default.dim(status.reason)}`);
+    console.error(`     ${import_picocolors48.default.dim(status.reason)}`);
   console.error("");
-  console.error(`     Run ${import_picocolors44.default.cyan("brainbase login")} to connect this device.`);
+  console.error(`     Run ${import_picocolors48.default.cyan("brainbase login")} to connect this device.`);
   console.error("");
   process14.exit(1);
 }
@@ -77097,6 +77347,7 @@ async function main() {
         const sub = argv.shift();
         await runAgent(cwd2, sub, argv, {
           yes,
+          json: jsonFlag,
           scope: scopeFlag,
           shell: shellFlag,
           harness,
@@ -77112,6 +77363,12 @@ async function main() {
         });
         break;
       }
+      case "team":
+      case "teams": {
+        const sub = argv.shift();
+        await runTeam(sub, argv, { orgId: orgIdFlag, json: jsonFlag });
+        break;
+      }
       case "task": {
         const sub = argv.shift();
         await runTask(cwd2, sub, argv);
@@ -77156,8 +77413,11 @@ async function main() {
         process14.exit(1);
     }
   } catch (err) {
-    console.error(import_picocolors44.default.red(`
+    console.error(import_picocolors48.default.red(`
 ${err.message}`));
+    if (err instanceof ApiError && err.status === 401) {
+      console.error(`  Run ${import_picocolors48.default.cyan("brainbase login")} to connect this device.`);
+    }
     if (process14.env.BRAINBASE_DEBUG)
       console.error(err.stack);
     process14.exit(1);