@brainbase-labs/cli 0.16.5 → 0.18.0

package/dist/index.js

@@ -35141,7 +35141,7 @@ var require_dist2 = __commonJS((exports, module) => {
 });
 
 // src/index.ts
-var import_picocolors43 = __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.16.5",
+  version: "0.18.0",
   description: "Pack, share, and install agent templates across harnesses (Claude Code, Codex, ...).",
   type: "module",
   bin: {
@@ -53841,9 +53841,80 @@ function apiErrorMessage(body, status) {
   return `HTTP ${status}`;
 }
 
+// src/core/token.ts
+import path57 from "node:path";
+import fs47 from "node:fs";
+var TOKEN_FILE = path57.join(BRAINBASE_HOME, "token.json");
+var TOKEN_PREFIX = "bbpat_";
+var TOKEN_PREFIX_LEN = 14;
+function tokenPrefix(token) {
+  if (!token.startsWith(TOKEN_PREFIX)) {
+    throw new Error(`not a brainbase PAT: missing ${TOKEN_PREFIX} prefix`);
+  }
+  return token.slice(0, TOKEN_PREFIX_LEN);
+}
+function isValidTokenFormat(token) {
+  if (typeof token !== "string")
+    return false;
+  if (!token.startsWith(TOKEN_PREFIX))
+    return false;
+  return /^bbpat_[A-Za-z0-9]{20,}$/.test(token);
+}
+var StoredTokenSchema = exports_external.object({
+  schemaVersion: exports_external.literal(1),
+  token: exports_external.string(),
+  prefix: exports_external.string(),
+  name: exports_external.string().optional(),
+  createdAt: exports_external.string()
+});
+function readToken() {
+  if (!exists(TOKEN_FILE))
+    return null;
+  try {
+    return StoredTokenSchema.parse(readJson(TOKEN_FILE));
+  } catch {
+    return null;
+  }
+}
+function writeToken(token, name) {
+  if (!isValidTokenFormat(token)) {
+    throw new Error("refusing to store token: invalid format");
+  }
+  ensureDir(BRAINBASE_HOME);
+  const stored = {
+    schemaVersion: 1,
+    token,
+    prefix: tokenPrefix(token),
+    name,
+    createdAt: new Date().toISOString()
+  };
+  writeJson(TOKEN_FILE, stored);
+  try {
+    fs47.chmodSync(TOKEN_FILE, 384);
+  } catch {}
+  return stored;
+}
+function clearToken() {
+  if (exists(TOKEN_FILE))
+    fs47.rmSync(TOKEN_FILE);
+}
+
 // src/core/api.ts
 var DEFAULT_CONTROL_PLANE_BASE = "https://api.brainbaselabs.com";
 var DEFAULT_PROXY_BASE = "https://api.v1.brainbaselabs.com";
+var MAS_IN_PROGRESS_MAX_WAIT_MS = 15000;
+var MAS_REQUEST_TIMEOUT_MS = 30000;
+var MAS_MIN_RETRY_DELAY_MS = 100;
+var MAS_MAX_RETRY_DELAY_MS = 2000;
+var DEFINITELY_UNSENT_NETWORK_CODES = new Set([
+  "ConnectionRefused",
+  "ECONNREFUSED",
+  "ENOTFOUND",
+  "EAI_AGAIN",
+  "ERR_INVALID_URL",
+  "FailedToOpenSocket",
+  "UND_ERR_CONNECT_TIMEOUT"
+]);
 
 class ApiError extends Error {
   status;
@@ -53855,6 +53926,17 @@ class ApiError extends Error {
     this.name = "ApiError";
   }
 }
+
+class NetworkApiError extends ApiError {
+  definitelyUnsent;
+  constructor(message, definitelyUnsent) {
+    super(message);
+    this.definitelyUnsent = definitelyUnsent;
+  }
+}
+
+class TaskRecoveryDeadlineError extends ApiError {
+}
 function normalizeControlPlaneUrl(url) {
   const normalized = url?.trim().replace(/\/+$/, "");
   return normalized || DEFAULT_CONTROL_PLANE_BASE;
@@ -53870,10 +53952,17 @@ function controlPlaneBaseUrl(session) {
   }
   return normalizeControlPlaneUrl(session?.control_plane_url);
 }
+function masControlPlaneBaseUrl(session) {
+  const controlPlane = process.env.BRAINBASE_CONTROL_PLANE_URL?.trim();
+  return normalizeControlPlaneUrl(controlPlane || session?.control_plane_url);
+}
 function apiBase(session) {
   const suffix = usesLegacyControlPlane() ? "/api/cli" : "/v2/cli";
   return `${controlPlaneBaseUrl(session)}${suffix}`;
 }
+function masApiBase(session) {
+  return `${masControlPlaneBaseUrl(session)}/v2`;
+}
 function usesLegacyControlPlane() {
   return !process.env.BRAINBASE_CONTROL_PLANE_URL?.trim() && !!process.env.BRAINBASE_API_URL?.trim();
 }
@@ -53903,6 +53992,53 @@ async function resolveCredential() {
   const status = authStatus();
   throw new ApiError(status.ok ? "CLI authentication changed while this command was starting; retry it" : status.reason ?? "not logged in", 401);
 }
+async function resolveMasCredential() {
+  const configuredSession = readAuth();
+  try {
+    return await resolveCredential();
+  } catch (error) {
+    if (!(error instanceof ApiError && error.status === 401)) {
+      throw error;
+    }
+    if (configuredSession || readAuth()) {
+      if (readToken()) {
+        throw new ApiError(`${error.message}. A stored PAT is available but will not be used while a login session is configured. Run \`brainbase logout\` to use the stored PAT, or \`brainbase login\` to refresh the session.`, 401);
+      }
+      throw error;
+    }
+  }
+  const storedToken = readToken();
+  if (storedToken) {
+    return {
+      bearer: storedToken.token,
+      session: null,
+      source: "stored_pat"
+    };
+  }
+  const status = authStatus();
+  throw new ApiError(status.ok ? "CLI authentication changed while this command was starting; retry it" : status.reason ?? "not logged in", 401);
+}
+function networkErrorCode(error) {
+  if (!error || typeof error !== "object")
+    return;
+  const code = error.code;
+  if (typeof code === "string")
+    return code;
+  const cause = error.cause;
+  if (!cause || typeof cause !== "object")
+    return;
+  const causeCode = cause.code;
+  return typeof causeCode === "string" ? causeCode : undefined;
+}
+function isDefinitelyUnsentNetworkError(error) {
+  const code = networkErrorCode(error);
+  if (DEFINITELY_UNSENT_NETWORK_CODES.has(code ?? ""))
+    return true;
+  if (!error || typeof error !== "object")
+    return false;
+  const cause = error.cause;
+  return !!cause && typeof cause === "object" && cause.message === "bad port";
+}
 async function sendRequest(url, init, bearer) {
   const headers = new Headers(init.headers);
   if (!headers.has("Authorization")) {
@@ -53916,7 +54052,7 @@ async function sendRequest(url, init, bearer) {
   try {
     return await fetch(url, { ...init, headers });
   } catch (err) {
-    throw new ApiError(`Network error: ${err.message}`);
+    throw new NetworkApiError(`Network error: ${err.message}`, isDefinitelyUnsentNetworkError(err));
   }
 }
 async function sendWithAuthRetry(session, send) {
@@ -53945,6 +54081,160 @@ async function request(pathname, init = {}) {
   }
   return body;
 }
+function masApiErrorMessage(body, status) {
+  if (body && typeof body === "object") {
+    const obj = body;
+    if (typeof obj.error === "string" && obj.error.trim() && typeof obj.message === "string" && obj.message.trim()) {
+      const error = obj.error.trim();
+      const message = obj.message.trim();
+      return error === message ? message : `${error}: ${message}`;
+    }
+    for (const key2 of ["detail", "error", "message"]) {
+      const value = obj[key2];
+      if (!value || typeof value !== "object" || Array.isArray(value))
+        continue;
+      const nested = value;
+      for (const nestedKey of ["message", "detail", "error"]) {
+        const message = nested[nestedKey];
+        if (typeof message === "string" && message.trim()) {
+          return message.trim();
+        }
+      }
+    }
+  }
+  return apiErrorMessage(body, status);
+}
+function masRetryDelayMs(retryAfterHeader, fallbackMs) {
+  const normalized = retryAfterHeader?.trim();
+  if (!normalized)
+    return fallbackMs;
+  const retryAfterSeconds = Number(normalized);
+  if (!Number.isFinite(retryAfterSeconds) || retryAfterSeconds < 0) {
+    return fallbackMs;
+  }
+  return Math.min(MAS_MAX_RETRY_DELAY_MS, Math.max(MAS_MIN_RETRY_DELAY_MS, retryAfterSeconds * 1000));
+}
+function parseMasTaskCreateResponse(body) {
+  if (!body || typeof body !== "object") {
+    throw new ApiError("Task creation may have succeeded, but MAS returned an invalid response. Check your tasks before running this command again.", undefined, body);
+  }
+  const task = body;
+  if (typeof task.id !== "string" || !task.id.trim() || typeof task.agent_id !== "string" || !task.agent_id.trim() || typeof task.status !== "string" || !task.status.trim()) {
+    throw new ApiError("Task creation may have succeeded, but MAS returned an invalid response. Check your tasks before running this command again.", undefined, body);
+  }
+  return {
+    id: task.id,
+    agent_id: task.agent_id,
+    status: task.status
+  };
+}
+async function masRequest(pathname, init) {
+  const credential = await resolveMasCredential();
+  let currentSession = credential.session;
+  let ambiguousNetworkRetriesRemaining = 1;
+  let requestMayHaveSucceeded = false;
+  let transientHttpRetriesRemaining = 1;
+  let recoveryDeadline = null;
+  let recoveryTaskId = null;
+  const recoveryRequestTimeoutMs = () => {
+    if (recoveryDeadline === null)
+      return MAS_REQUEST_TIMEOUT_MS;
+    const remainingMs = recoveryDeadline - Date.now();
+    if (remainingMs <= 0) {
+      throw new TaskRecoveryDeadlineError(recoveryTaskId ? `Task ${recoveryTaskId} is still being processed. Check its status before starting another task.` : "Task creation may still be processing. Check your tasks before running this command again.");
+    }
+    return Math.min(MAS_REQUEST_TIMEOUT_MS, remainingMs);
+  };
+  while (true) {
+    const retrySession = credential.source === "session" ? currentSession : null;
+    let res;
+    try {
+      res = await sendWithAuthRetry(retrySession, async (refreshed) => {
+        if (refreshed)
+          currentSession = refreshed;
+        while (true) {
+          const signal = AbortSignal.timeout(recoveryRequestTimeoutMs());
+          try {
+            return await sendRequest(`${masApiBase(currentSession)}${pathname}`, {
+              ...init,
+              signal
+            }, currentSession?.access_token ?? credential.bearer);
+          } catch (error) {
+            if (error instanceof NetworkApiError && error.definitelyUnsent) {
+              throw error;
+            }
+            if (ambiguousNetworkRetriesRemaining === 0)
+              throw error;
+            requestMayHaveSucceeded = true;
+            ambiguousNetworkRetriesRemaining -= 1;
+          }
+        }
+      });
+    } catch (error) {
+      if (error instanceof TaskRecoveryDeadlineError)
+        throw error;
+      if (recoveryTaskId || recoveryDeadline !== null || requestMayHaveSucceeded) {
+        throw new ApiError(recoveryTaskId ? `Task ${recoveryTaskId} may still be processing. Check its status before starting another task. ${error.message}` : `Task creation may still be processing. Check your tasks before running this command again. ${error.message}`);
+      }
+      throw error;
+    }
+    let text2;
+    try {
+      text2 = await res.text();
+    } catch (error) {
+      if (ambiguousNetworkRetriesRemaining > 0) {
+        requestMayHaveSucceeded = true;
+        ambiguousNetworkRetriesRemaining -= 1;
+        continue;
+      }
+      throw new ApiError(recoveryTaskId ? `Task ${recoveryTaskId} may still be processing. Check its status before starting another task. ${error.message}` : recoveryDeadline !== null || requestMayHaveSucceeded ? `Task creation may still be processing. Check your tasks before running this command again. ${error.message}` : `Network error while reading response: ${error.message}`);
+    }
+    let body = text2;
+    try {
+      body = text2 ? JSON.parse(text2) : null;
+    } catch {}
+    const detail = body && typeof body === "object" ? body.detail : null;
+    const detailObject = detail && typeof detail === "object" ? detail : null;
+    const code = detailObject?.code;
+    if (res.status === 409 && code === "idempotency_request_in_progress") {
+      if (typeof detailObject?.task_id === "string") {
+        recoveryTaskId = detailObject.task_id;
+      }
+      recoveryDeadline ??= Date.now() + MAS_IN_PROGRESS_MAX_WAIT_MS;
+      const delayMs = masRetryDelayMs(res.headers.get("Retry-After"), 1000);
+      if (Date.now() + delayMs >= recoveryDeadline) {
+        throw new ApiError(recoveryTaskId ? `Task ${recoveryTaskId} is still being processed. Check its status before starting another task.` : masApiErrorMessage(body, res.status), res.status, body);
+      }
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+      continue;
+    }
+    if (res.status >= 500 && transientHttpRetriesRemaining > 0) {
+      transientHttpRetriesRemaining -= 1;
+      requestMayHaveSucceeded = true;
+      const delayMs = masRetryDelayMs(res.headers.get("Retry-After"), 250);
+      if (recoveryDeadline !== null && Date.now() + delayMs >= recoveryDeadline) {
+        throw new TaskRecoveryDeadlineError(recoveryTaskId ? `Task ${recoveryTaskId} is still being processed. Check its status before starting another task.` : "Task creation may still be processing. Check your tasks before running this command again.");
+      }
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+      continue;
+    }
+    if (!res.ok) {
+      const message = masApiErrorMessage(body, res.status);
+      throw new ApiError(res.status >= 500 ? `${message} Task creation may still be processing; check your tasks before running this command again.` : message, res.status, body);
+    }
+    return body;
+  }
+}
+var masApi = {
+  async createTask(input, options) {
+    const body = await masRequest("/tasks", {
+      method: "POST",
+      headers: { "Idempotency-Key": options.idempotencyKey },
+      body: JSON.stringify(input)
+    });
+    return parseMasTaskCreateResponse(body);
+  }
+};
 var api = {
   listOrgs() {
     return request("/orgs");
@@ -53958,6 +54248,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());
@@ -54059,64 +54365,6 @@ function proxyBaseUrl(session) {
   return DEFAULT_PROXY_BASE.replace(/\/+$/, "");
 }
 
-// src/core/token.ts
-import path57 from "node:path";
-import fs47 from "node:fs";
-var TOKEN_FILE = path57.join(BRAINBASE_HOME, "token.json");
-var TOKEN_PREFIX = "bbpat_";
-var TOKEN_PREFIX_LEN = 14;
-function tokenPrefix(token) {
-  if (!token.startsWith(TOKEN_PREFIX)) {
-    throw new Error(`not a brainbase PAT: missing ${TOKEN_PREFIX} prefix`);
-  }
-  return token.slice(0, TOKEN_PREFIX_LEN);
-}
-function isValidTokenFormat(token) {
-  if (typeof token !== "string")
-    return false;
-  if (!token.startsWith(TOKEN_PREFIX))
-    return false;
-  return /^bbpat_[A-Za-z0-9]{20,}$/.test(token);
-}
-var StoredTokenSchema = exports_external.object({
-  schemaVersion: exports_external.literal(1),
-  token: exports_external.string(),
-  prefix: exports_external.string(),
-  name: exports_external.string().optional(),
-  createdAt: exports_external.string()
-});
-function readToken() {
-  if (!exists(TOKEN_FILE))
-    return null;
-  try {
-    return StoredTokenSchema.parse(readJson(TOKEN_FILE));
-  } catch {
-    return null;
-  }
-}
-function writeToken(token, name) {
-  if (!isValidTokenFormat(token)) {
-    throw new Error("refusing to store token: invalid format");
-  }
-  ensureDir(BRAINBASE_HOME);
-  const stored = {
-    schemaVersion: 1,
-    token,
-    prefix: tokenPrefix(token),
-    name,
-    createdAt: new Date().toISOString()
-  };
-  writeJson(TOKEN_FILE, stored);
-  try {
-    fs47.chmodSync(TOKEN_FILE, 384);
-  } catch {}
-  return stored;
-}
-function clearToken() {
-  if (exists(TOKEN_FILE))
-    fs47.rmSync(TOKEN_FILE);
-}
-
 // src/core/registry-client.ts
 var DEFAULT_BASE = "https://api.v1.brainbaselabs.com";
 function baseUrl(session) {
@@ -62795,7 +63043,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";
@@ -65104,7 +65352,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);
@@ -65130,110 +65378,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;
+  }
+}
+async function chooseOne(opts) {
+  if (!opts.allowPrompt) {
+    throw new NonInteractiveError(`${opts.message} cannot be answered while emitting JSON. ${opts.flagHint}`);
   }
-  orgsSpinner.stop(`Found ${orgs.length} organization${orgs.length === 1 ? "" : "s"}.`);
+  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) {
@@ -65256,11 +65583,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 });
@@ -65274,7 +65601,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.");
       }
@@ -65296,10 +65623,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;
@@ -65312,15 +65640,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;
@@ -65334,12 +65662,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);
@@ -65399,7 +65727,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…");
@@ -65413,9 +65741,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.`);
         }
       }
     }
@@ -65453,7 +65781,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",
@@ -65466,9 +65794,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) {
@@ -65480,13 +65808,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)) {
@@ -65507,7 +65835,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;
@@ -65518,7 +65846,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({
@@ -65544,6 +65872,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")) {
@@ -65563,6 +65931,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,
@@ -65606,26 +65981,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";
@@ -66128,8 +66588,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();
@@ -66148,24 +66608,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("");
@@ -66174,7 +66634,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)) {
@@ -66218,7 +66678,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,
@@ -66279,7 +66739,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) {
@@ -66296,7 +66756,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) {
@@ -66366,12 +66826,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;
@@ -66395,7 +66855,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;
@@ -66407,13 +66867,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("");
   }
@@ -66433,7 +66893,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) {
@@ -66491,7 +66951,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);
     }
@@ -66501,13 +66961,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;
@@ -66530,8 +66990,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 ?? []) {
@@ -66545,12 +67005,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("");
   }
@@ -66565,11 +67025,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) => {
@@ -66607,11 +67067,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]));
@@ -66634,27 +67094,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(`
 `));
@@ -66669,108 +67129,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) {
@@ -66835,7 +67232,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;
@@ -66861,7 +67258,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;
@@ -66885,7 +67282,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;
@@ -66902,14 +67299,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
     });
@@ -66948,23 +67345,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;
   }
@@ -66990,15 +67387,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(`
@@ -67028,7 +67427,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,
@@ -67059,92 +67458,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);
-    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.`);
+    handleApiError7(err);
     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.");
@@ -67161,7 +67479,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) {
@@ -67210,33 +67528,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(`
 `));
@@ -67281,16 +67599,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
@@ -67588,7 +67906,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);
@@ -67882,7 +68200,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))
@@ -67897,7 +68215,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();
@@ -67948,24 +68266,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";
@@ -76313,17 +76631,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(`
 `) + `
@@ -76345,6 +76663,210 @@ async function runMcp(cwd2, sub, _argv, options) {
   }
 }
 
+// src/cli/task.ts
+var import_picocolors47 = __toESM(require_picocolors(), 1);
+
+// src/cli/task-create.ts
+import { randomUUID as randomUUID2 } from "node:crypto";
+async function createTask(input, options) {
+  return await masApi.createTask(input, options);
+}
+function requiredValue(value, flag) {
+  const normalized = value?.trim();
+  if (!normalized) {
+    throw new Error(`${flag} is required and must not be blank.`);
+  }
+  return normalized;
+}
+function optionalValue(value, flag) {
+  if (value === undefined)
+    return;
+  const normalized = value.trim();
+  if (!normalized) {
+    throw new Error(`${flag} must not be blank when provided.`);
+  }
+  return normalized;
+}
+function resolveAgentId(cwd2, agentId, readLocalManifest) {
+  if (agentId !== undefined) {
+    return requiredValue(agentId, "--agent");
+  }
+  const manifest = readLocalManifest(cwd2);
+  if (!manifest?.id) {
+    throw new Error("No claimed agent found in brainbase.agent.yaml. Run `brainbase agent create` first, or pass --agent <id>.");
+  }
+  return manifest.id;
+}
+function isPublishScopeError(error2) {
+  const message = error2 instanceof Error ? error2.message : String(error2);
+  const body = error2 && typeof error2 === "object" && "body" in error2 ? JSON.stringify(error2.body) : "";
+  return /PAT lacks required scope:\s*publish/i.test(`${message} ${body}`);
+}
+async function runTaskCreate(cwd2, options, dependencies = {}) {
+  const idempotencyKey = (dependencies.randomUUID ?? randomUUID2)();
+  const message = requiredValue(options.message, "--message");
+  const agentId = resolveAgentId(cwd2, options.agentId, dependencies.readManifest ?? readManifest);
+  const title = optionalValue(options.title, "--title");
+  const model = optionalValue(options.model, "--model");
+  const input = {
+    agent_id: agentId,
+    initial_messages: [{ role: "user", content: message }],
+    auto_run: true,
+    ...title ? { title } : {},
+    ...model ? { default_model: model } : {}
+  };
+  let created;
+  try {
+    created = await (dependencies.createTask ?? createTask)(input, {
+      idempotencyKey
+    });
+  } catch (error2) {
+    if (isPublishScopeError(error2)) {
+      throw new Error("PAT lacks required scope: publish. Mint a replacement with `brainbase token create --scopes read,publish` and try again.");
+    }
+    throw error2;
+  }
+  if (options.json) {
+    console.log(JSON.stringify({
+      task_id: created.id,
+      agent_id: created.agent_id,
+      status: created.status
+    }));
+    return;
+  }
+  console.log([
+    `Task ID: ${created.id}`,
+    `Agent ID: ${created.agent_id}`,
+    `Status: ${created.status}`,
+    "First run accepted."
+  ].join(`
+`));
+}
+
+// src/cli/task.ts
+var VALUE_FLAGS = [
+  ["--agent", "agentId"],
+  ["--message", "message"],
+  ["--title", "title"],
+  ["--model", "model"]
+];
+var TASK_OPTION_NAMES = new Set([
+  ...VALUE_FLAGS.map(([flag]) => flag),
+  "--json"
+]);
+var HELP_FLAGS = new Set(["--help", "-h"]);
+function missingValueError(flag) {
+  if (flag === "--message" || flag === "--agent") {
+    return new Error(`${flag} is required and must not be blank.`);
+  }
+  return new Error(`${flag} must not be blank when provided.`);
+}
+function flagLikeValueError(flag, value) {
+  return new Error(`${flag} requires a value. If you meant the literal "${value}", use ${flag}=${value} or ${flag} -- ${value}.`);
+}
+function parseCreateArgs(args) {
+  const options = {};
+  const seen = new Set;
+  for (let index = 0;index < args.length; index += 1) {
+    const arg = args[index];
+    if (HELP_FLAGS.has(arg)) {
+      return { help: true, options };
+    }
+    if (arg === "--json") {
+      if (seen.has(arg)) {
+        throw new Error(`Duplicate task create option: ${arg}`);
+      }
+      seen.add(arg);
+      options.json = true;
+      continue;
+    }
+    let matched = false;
+    for (const [flag, option] of VALUE_FLAGS) {
+      if (arg === flag) {
+        if (seen.has(flag)) {
+          throw new Error(`Duplicate task create option: ${flag}`);
+        }
+        seen.add(flag);
+        let value = args[index + 1];
+        if (value === undefined) {
+          throw missingValueError(flag);
+        }
+        if (value === "--") {
+          value = args[index + 2];
+          if (value === undefined)
+            throw missingValueError(flag);
+          index += 1;
+        } else if (HELP_FLAGS.has(value) && (option === "agentId" || option === "model")) {
+          return { help: true, options };
+        } else if (TASK_OPTION_NAMES.has(value)) {
+          throw flagLikeValueError(flag, value);
+        }
+        options[option] = value;
+        index += 1;
+        matched = true;
+        break;
+      }
+      const prefix = `${flag}=`;
+      if (arg.startsWith(prefix)) {
+        if (seen.has(flag)) {
+          throw new Error(`Duplicate task create option: ${flag}`);
+        }
+        seen.add(flag);
+        options[option] = arg.slice(prefix.length);
+        matched = true;
+        break;
+      }
+    }
+    if (!matched) {
+      throw new Error(`Unknown task create argument: ${arg}`);
+    }
+  }
+  return { help: false, options };
+}
+async function runTask(cwd2, sub, args) {
+  switch (sub) {
+    case "create": {
+      const parsed = parseCreateArgs(args);
+      if (parsed.help) {
+        printHelp4();
+        return;
+      }
+      await runTaskCreate(cwd2, parsed.options);
+      return;
+    }
+    case undefined:
+    case "help":
+    case "-h":
+    case "--help":
+      printHelp4();
+      return;
+    default:
+      console.error(`Unknown task subcommand: ${sub}
+`);
+      printHelp4();
+      process.exit(1);
+  }
+}
+function printHelp4() {
+  const out = [];
+  out.push("");
+  out.push(`  ${import_picocolors47.default.bold("brainbase task")} ${import_picocolors47.default.dim("<sub> [options]")}`);
+  out.push("");
+  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_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_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(`
+`));
+}
+
 // src/index.ts
 var PROTECTED = new Set([
   "template",
@@ -76365,100 +76887,115 @@ var STORED_PAT_COMMANDS = new Set([
 function help() {
   const out = [];
   out.push("");
-  out.push(`  ${brandTint("◆")}  ${import_picocolors43.default.bold("brainbase")}  ${import_picocolors43.default.dim(`v${VERSION}`)}`);
-  out.push(`     ${import_picocolors43.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_picocolors43.default.bold("brainbase")} ${import_picocolors43.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_picocolors43.default.cyan("login")}     ${import_picocolors43.default.dim("  open the web app and connect this device")}`);
-  out.push(`  ${import_picocolors43.default.cyan("logout")}    ${import_picocolors43.default.dim("  clear the local session")}`);
-  out.push(`  ${import_picocolors43.default.cyan("whoami")}    ${import_picocolors43.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_picocolors43.default.cyan("agent create")}               ${import_picocolors43.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
-  out.push(`  ${import_picocolors43.default.cyan("agent pull")} ${import_picocolors43.default.dim("[<id>]")}          ${import_picocolors43.default.dim("bring cloud changes into this folder (--force to override; --run-entrypoint to also execute the agent entrypoint)")}`);
-  out.push(`  ${import_picocolors43.default.cyan("agent push")}                 ${import_picocolors43.default.dim("send local changes to the cloud (--force to overwrite cloud-side conflicts with local)")}`);
-  out.push(`  ${import_picocolors43.default.cyan("agent unpack")}               ${import_picocolors43.default.dim("install the claimed agent into a harness layout")}`);
-  out.push(`  ${import_picocolors43.default.cyan("link")}                       ${import_picocolors43.default.dim("attach this folder to an existing agent")}`);
-  out.push(`  ${import_picocolors43.default.cyan("agent status")}               ${import_picocolors43.default.dim("show what would pull and what would push")}`);
-  out.push(`  ${import_picocolors43.default.cyan("agent env")}                  ${import_picocolors43.default.dim("print export lines for `eval $(brainbase agent env)`")}`);
-  out.push(`  ${import_picocolors43.default.cyan("run")} ${import_picocolors43.default.dim("<cmd> [args...]")}         ${import_picocolors43.default.dim("run <cmd> with secrets.env loaded into env")}`);
-  out.push(`  ${import_picocolors43.default.cyan("status")}                     ${import_picocolors43.default.dim("show what this folder is linked to")}`);
-  out.push(`  ${import_picocolors43.default.cyan("unlink")}                     ${import_picocolors43.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_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_picocolors43.default.cyan("orchestration create")}           ${import_picocolors43.default.dim("claim a local orchestration manifest and create it in the cloud")}`);
-  out.push(`  ${import_picocolors43.default.cyan("orchestration list")}             ${import_picocolors43.default.dim("list orchestrations under a team")}`);
-  out.push(`  ${import_picocolors43.default.cyan("orchestration pull")} ${import_picocolors43.default.dim("<id>")}        ${import_picocolors43.default.dim("recursively fetch an orchestration + every member agent")}`);
-  out.push(`  ${import_picocolors43.default.cyan("orchestration push")}             ${import_picocolors43.default.dim("recursively push each member, then update the graph")}`);
-  out.push(`  ${import_picocolors43.default.cyan("orchestration status")}           ${import_picocolors43.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_picocolors43.default.cyan("template pack")}                       ${import_picocolors43.default.dim("bundle the current agent into a template")}`);
-  out.push(`  ${import_picocolors43.default.cyan("template publish")}                    ${import_picocolors43.default.dim("upload a template to the registry")}`);
-  out.push(`  ${import_picocolors43.default.cyan("template search")} ${import_picocolors43.default.dim("[query]")}             ${import_picocolors43.default.dim("search the registry")}`);
-  out.push(`  ${import_picocolors43.default.cyan("template info")}    ${import_picocolors43.default.dim("<creator/slug>")}     ${import_picocolors43.default.dim("show registry details for a template")}`);
-  out.push(`  ${import_picocolors43.default.cyan("template onboard")} ${import_picocolors43.default.dim("<creator/slug>")}     ${import_picocolors43.default.dim("install (or refresh) a template")}`);
-  out.push(`  ${import_picocolors43.default.cyan("template list")}                       ${import_picocolors43.default.dim("show installed templates")}`);
-  out.push(`  ${import_picocolors43.default.cyan("template remove")}  ${import_picocolors43.default.dim("<creator/slug>")}     ${import_picocolors43.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_picocolors43.default.cyan("skill add")} ${import_picocolors43.default.dim("<source>")}                  ${import_picocolors43.default.dim("install a skill (github / git / brainbase)")}`);
-  out.push(`  ${import_picocolors43.default.cyan("skill list")}                            ${import_picocolors43.default.dim("show locally installed skills + their source")}`);
-  out.push(`  ${import_picocolors43.default.cyan("skill update")} ${import_picocolors43.default.dim("<slug>")}                  ${import_picocolors43.default.dim("re-fetch a skill from its recorded source")}`);
-  out.push(`  ${import_picocolors43.default.cyan("skill remove")} ${import_picocolors43.default.dim("<slug>")}                  ${import_picocolors43.default.dim("uninstall a skill")}`);
-  out.push(`  ${import_picocolors43.default.cyan("skill search")} ${import_picocolors43.default.dim("[query]")}                 ${import_picocolors43.default.dim("search the brainbase skill registry")}`);
-  out.push(`  ${import_picocolors43.default.cyan("skill info")} ${import_picocolors43.default.dim("<creator/slug>")}            ${import_picocolors43.default.dim("show registry details for a skill")}`);
-  out.push(`  ${import_picocolors43.default.cyan("skill publish")} ${import_picocolors43.default.dim("[dir]")}                  ${import_picocolors43.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_picocolors43.default.cyan("token create")}                        ${import_picocolors43.default.dim("issue a long-lived CLI key for CI / scripts")}`);
-  out.push(`  ${import_picocolors43.default.cyan("token list")}                          ${import_picocolors43.default.dim("show your active tokens")}`);
-  out.push(`  ${import_picocolors43.default.cyan("token revoke")} ${import_picocolors43.default.dim("<id>")}                  ${import_picocolors43.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_picocolors43.default.cyan("mcp check")} ${import_picocolors43.default.dim("[--json]")}              ${import_picocolors43.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_picocolors43.default.dim("--harness <id>")}     force harness for onboard / sync (e.g. claude-code)`);
-  out.push(`  ${import_picocolors43.default.dim("--scope <s>")}        force scope: global | project`);
-  out.push(`  ${import_picocolors43.default.dim("--yes, -y")}          skip confirmations / auto-overwrite`);
-  out.push(`  ${import_picocolors43.default.dim("--agent <id>")}       for link: attach this folder to an existing agent non-interactively`);
-  out.push(`  ${import_picocolors43.default.dim("--no-tracking")}      for link: skip routing LLM traffic through brainbase`);
-  out.push(`  ${import_picocolors43.default.dim("--track")}            for agent create: enable tracking non-interactively (off without a TTY)`);
-  out.push(`  ${import_picocolors43.default.dim("--shell <sh|fish>")}  for agent env: pick output format (auto-detected from $SHELL)`);
-  out.push(`  ${import_picocolors43.default.dim("--all")}              for template list: include installs from other folders`);
-  out.push(`  ${import_picocolors43.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_picocolors43.default.dim("BRAINBASE_HOME")}         override the local config dir (default ~/.brainbase)`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_WEB_URL")}      override the web app URL used by login`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_CONTROL_PLANE_URL")} override the MAS control-plane host (uses /v2/cli)`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_API_URL")}      legacy KLS host override (uses /api/cli; proxy/registry fallback)`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_PROXY_URL")}    override the model-proxy URL used by harness traffic (default https://api.v1.brainbaselabs.com)`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_REGISTRY_URL")} override the registry API URL (default https://api.v1.brainbaselabs.com)`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_TOKEN")}        long-lived CLI PAT (overrides token.json)`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_SKIP_AUTH")}    bypass the auth gate for development`);
-  out.push(`  ${import_picocolors43.default.dim("BRAINBASE_NON_INTERACTIVE")} force non-interactive mode — skip/auto-default prompts (CI & agents)`);
-  out.push(`  ${import_picocolors43.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_picocolors43.default.dim("•")} ${import_picocolors43.default.bold("claude-code")}  ${import_picocolors43.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors43.default.dim("•")} ${import_picocolors43.default.bold("codex")}        ${import_picocolors43.default.dim("skills, mcps, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors43.default.dim("•")} ${import_picocolors43.default.bold("kafka")}        ${import_picocolors43.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(`
 `));
@@ -76522,13 +77059,13 @@ async function requireAuth(cmd) {
   if (STORED_PAT_COMMANDS.has(cmd) && readToken())
     return;
   console.error("");
-  console.error(`  ${brandTint("◆")}  ${import_picocolors43.default.bold("brainbase")}`);
+  console.error(`  ${brandTint("◆")}  ${import_picocolors48.default.bold("brainbase")}`);
   console.error("");
-  console.error(`  ${import_picocolors43.default.red("✗")}  You need to sign in to use ${import_picocolors43.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_picocolors43.default.dim(status.reason)}`);
+    console.error(`     ${import_picocolors48.default.dim(status.reason)}`);
   console.error("");
-  console.error(`     Run ${import_picocolors43.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);
 }
@@ -76551,36 +77088,37 @@ async function main() {
     await runRun(cwd2, argv);
     return;
   }
-  const yes = hasFlag2(argv, "--yes", "-y");
-  const all = hasFlag2(argv, "--all");
-  const harness = getFlag(argv, "--harness");
-  const scopeFlag = getFlag(argv, "--scope");
-  const web = getFlag(argv, "--web");
-  const visibility = getFlag(argv, "--visibility");
-  const category = getFlag(argv, "--category");
-  const target = getFlag(argv, "--target");
-  const pageRaw = getFlag(argv, "--page");
+  const sharedArgs = cmd === "task" ? [] : argv;
+  const yes = hasFlag2(sharedArgs, "--yes", "-y");
+  const all = hasFlag2(sharedArgs, "--all");
+  const harness = getFlag(sharedArgs, "--harness");
+  const scopeFlag = getFlag(sharedArgs, "--scope");
+  const web = getFlag(sharedArgs, "--web");
+  const visibility = getFlag(sharedArgs, "--visibility");
+  const category = getFlag(sharedArgs, "--category");
+  const target = getFlag(sharedArgs, "--target");
+  const pageRaw = getFlag(sharedArgs, "--page");
   const page = pageRaw && /^\d+$/.test(pageRaw) ? Number(pageRaw) : undefined;
-  const asSlug = getFlag(argv, "--as");
-  const agentFlag = getFlag(argv, "--agent");
-  const shellFlag = getFlag(argv, "--shell");
-  const noTracking = hasFlag2(argv, "--no-tracking");
-  const track = hasFlag2(argv, "--track");
-  const forceFlag = hasFlag2(argv, "--force");
-  const runEntrypointFlag = hasFlag2(argv, "--run-entrypoint");
-  const graphOnlyFlag = hasFlag2(argv, "--graph-only");
-  const nameFlag = getFlag(argv, "--name");
-  const skillVersionFlag = getFlag(argv, "--skill-version");
-  const taglineFlag = getFlag(argv, "--tagline");
-  const orgIdFlag = getFlag(argv, "--org");
-  const teamIdFlag = getFlag(argv, "--team");
-  const fromFlags = getFlagAll(argv, "--from");
-  const toFlags = getFlagAll(argv, "--to");
-  const descriptionFlag = getFlag(argv, "--description");
-  const schemaFlag = getFlag(argv, "--schema");
-  const noPushFlag = hasFlag2(argv, "--no-push");
-  const jsonFlag = hasFlag2(argv, "--json");
-  const acpFlag = hasFlag2(argv, "--acp");
+  const asSlug = getFlag(sharedArgs, "--as");
+  const agentFlag = getFlag(sharedArgs, "--agent");
+  const shellFlag = getFlag(sharedArgs, "--shell");
+  const noTracking = hasFlag2(sharedArgs, "--no-tracking");
+  const track = hasFlag2(sharedArgs, "--track");
+  const forceFlag = hasFlag2(sharedArgs, "--force");
+  const runEntrypointFlag = hasFlag2(sharedArgs, "--run-entrypoint");
+  const graphOnlyFlag = hasFlag2(sharedArgs, "--graph-only");
+  const nameFlag = getFlag(sharedArgs, "--name");
+  const skillVersionFlag = getFlag(sharedArgs, "--skill-version");
+  const taglineFlag = getFlag(sharedArgs, "--tagline");
+  const orgIdFlag = getFlag(sharedArgs, "--org");
+  const teamIdFlag = getFlag(sharedArgs, "--team");
+  const fromFlags = getFlagAll(sharedArgs, "--from");
+  const toFlags = getFlagAll(sharedArgs, "--to");
+  const descriptionFlag = getFlag(sharedArgs, "--description");
+  const schemaFlag = getFlag(sharedArgs, "--schema");
+  const noPushFlag = hasFlag2(sharedArgs, "--no-push");
+  const jsonFlag = hasFlag2(sharedArgs, "--json");
+  const acpFlag = hasFlag2(sharedArgs, "--acp");
   ensureSkillResolversRegistered();
   await requireAuth(cmd);
   try {
@@ -76652,6 +77190,7 @@ async function main() {
         const sub = argv.shift();
         await runAgent(cwd2, sub, argv, {
           yes,
+          json: jsonFlag,
           scope: scopeFlag,
           shell: shellFlag,
           harness,
@@ -76667,6 +77206,17 @@ 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);
+        break;
+      }
       case "orchestration":
       case "orch": {
         const sub = argv.shift();
@@ -76706,8 +77256,11 @@ async function main() {
         process14.exit(1);
     }
   } catch (err) {
-    console.error(import_picocolors43.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);