@brainbase-labs/cli 0.8.3 → 0.10.0

package/dist/index.js

@@ -28582,9 +28582,9 @@ var require_jsx_dev_runtime = __commonJS((exports, module) => {
 });
 
 // src/index.ts
-var import_picocolors40 = __toESM(require_picocolors(), 1);
+var import_picocolors41 = __toESM(require_picocolors(), 1);
 import process14 from "node:process";
-import fs51 from "node:fs";
+import fs52 from "node:fs";
 
 // src/cli/template.ts
 var import_picocolors12 = __toESM(require_picocolors(), 1);
@@ -29449,7 +29449,7 @@ function padStart(s, n) {
 // package.json
 var package_default = {
   name: "@brainbase-labs/cli",
-  version: "0.8.3",
+  version: "0.10.0",
   description: "Pack, share, and install agent templates across harnesses (Claude Code, Codex, ...).",
   type: "module",
   bin: {
@@ -29921,6 +29921,73 @@ function scopePaths(cwd, scope) {
   return scope === "global" ? globalPaths() : projectPaths(cwd);
 }
 
+// src/harnesses/claude-code/settings.ts
+function readSettings(file) {
+  return readJsonOr(file, {});
+}
+function writeSettings(file, settings) {
+  writeJson(file, settings);
+}
+function setMcpServer(file, name, entry) {
+  const s = readSettings(file);
+  if (!s.mcpServers)
+    s.mcpServers = {};
+  s.mcpServers[name] = entry;
+  writeSettings(file, s);
+}
+function removeMcpServer(file, name) {
+  if (!exists(file))
+    return;
+  const s = readSettings(file);
+  if (s.mcpServers && name in s.mcpServers) {
+    delete s.mcpServers[name];
+    writeSettings(file, s);
+  }
+}
+function getMcpServer(file, name) {
+  const s = readSettings(file);
+  return s.mcpServers?.[name];
+}
+function listMcpServers(file) {
+  return readSettings(file).mcpServers ?? {};
+}
+function normalizeMcpPayload(payload) {
+  const out = { ...payload };
+  delete out.is_enabled;
+  const hasUrl = typeof out.url === "string" && out.url.length > 0;
+  const hasCommand = typeof out.command === "string" && out.command.length > 0;
+  if (!out.type) {
+    if (hasUrl)
+      out.type = "http";
+    else if (hasCommand)
+      out.type = "stdio";
+  }
+  if (out.type === "http" || out.type === "sse") {
+    if (Array.isArray(out.args) && out.args.length === 0)
+      delete out.args;
+    if (out.env && typeof out.env === "object" && Object.keys(out.env).length === 0) {
+      delete out.env;
+    }
+    if (out.headers && typeof out.headers === "object" && Object.keys(out.headers).length === 0) {
+      delete out.headers;
+    }
+  }
+  if (out.type === "stdio") {
+    delete out.url;
+    delete out.headers;
+  }
+  return out;
+}
+function listMcpServersFromMcpJson(file) {
+  return readJsonOr(file, {}).mcpServers ?? {};
+}
+function listMcpServersFromClaudeJson(file, projectKey) {
+  const data = readJsonOr(file, {});
+  if (projectKey)
+    return data.projects?.[projectKey]?.mcpServers ?? {};
+  return data.mcpServers ?? {};
+}
+
 // src/harnesses/claude-code/inventory.ts
 import fs4 from "node:fs";
 import path6 from "node:path";
@@ -33961,73 +34028,6 @@ function manifestSourceForPack(source) {
   return source.type === "local" ? { type: "inline" } : source;
 }
 
-// src/harnesses/claude-code/settings.ts
-function readSettings(file) {
-  return readJsonOr(file, {});
-}
-function writeSettings(file, settings) {
-  writeJson(file, settings);
-}
-function setMcpServer(file, name, entry) {
-  const s = readSettings(file);
-  if (!s.mcpServers)
-    s.mcpServers = {};
-  s.mcpServers[name] = entry;
-  writeSettings(file, s);
-}
-function removeMcpServer(file, name) {
-  if (!exists(file))
-    return;
-  const s = readSettings(file);
-  if (s.mcpServers && name in s.mcpServers) {
-    delete s.mcpServers[name];
-    writeSettings(file, s);
-  }
-}
-function getMcpServer(file, name) {
-  const s = readSettings(file);
-  return s.mcpServers?.[name];
-}
-function listMcpServers(file) {
-  return readSettings(file).mcpServers ?? {};
-}
-function normalizeMcpPayload(payload) {
-  const out = { ...payload };
-  delete out.is_enabled;
-  const hasUrl = typeof out.url === "string" && out.url.length > 0;
-  const hasCommand = typeof out.command === "string" && out.command.length > 0;
-  if (!out.type) {
-    if (hasUrl)
-      out.type = "http";
-    else if (hasCommand)
-      out.type = "stdio";
-  }
-  if (out.type === "http" || out.type === "sse") {
-    if (Array.isArray(out.args) && out.args.length === 0)
-      delete out.args;
-    if (out.env && typeof out.env === "object" && Object.keys(out.env).length === 0) {
-      delete out.env;
-    }
-    if (out.headers && typeof out.headers === "object" && Object.keys(out.headers).length === 0) {
-      delete out.headers;
-    }
-  }
-  if (out.type === "stdio") {
-    delete out.url;
-    delete out.headers;
-  }
-  return out;
-}
-function listMcpServersFromMcpJson(file) {
-  return readJsonOr(file, {}).mcpServers ?? {};
-}
-function listMcpServersFromClaudeJson(file, projectKey) {
-  const data = readJsonOr(file, {});
-  if (projectKey)
-    return data.projects?.[projectKey]?.mcpServers ?? {};
-  return data.mcpServers ?? {};
-}
-
 // src/harnesses/claude-code/inventory.ts
 function firstLine(file, max = 200) {
   try {
@@ -35070,6 +35070,11 @@ var claudeCode = {
 async function installClaudeCodeWithCtx(components, opts, templateName) {
   return installClaudeCode(components, opts, { templateName });
 }
+function removeClaudeCodeMcp(slugs, opts) {
+  const { mcpStore } = scopePaths(opts.cwd, opts.scope);
+  for (const slug of slugs)
+    removeMcpServer(mcpStore, slug);
+}
 
 // src/harnesses/codex/paths.ts
 import path13 from "node:path";
@@ -35101,10 +35106,6 @@ function isBundledSkillDir(name) {
   return name === ".system" || name.startsWith(".");
 }
 
-// src/harnesses/codex/inventory.ts
-import fs12 from "node:fs";
-import path15 from "node:path";
-
 // src/harnesses/codex/config-toml.ts
 import fs11 from "node:fs";
 
@@ -36269,6 +36270,8 @@ function listMcpServers2(file) {
 }
 
 // src/harnesses/codex/inventory.ts
+import fs12 from "node:fs";
+import path15 from "node:path";
 function firstLine2(file, max = 200) {
   try {
     const head = fs12.readFileSync(file, "utf8").slice(0, 2000);
@@ -36882,6 +36885,11 @@ var codex = {
 async function installCodexWithCtx(components, opts, templateName) {
   return installCodex(components, opts, { templateName });
 }
+function removeCodexMcp(slugs, opts) {
+  const { config } = scopePaths2(opts.cwd, opts.scope);
+  for (const slug of slugs)
+    removeMcpServer2(config, slug);
+}
 
 // src/harnesses/kafka/paths.ts
 import path19 from "node:path";
@@ -36919,10 +36927,6 @@ function scopePaths3(cwd, scope) {
   return scope === "global" ? globalPaths3() : projectPaths3(cwd);
 }
 
-// src/harnesses/kafka/inventory.ts
-import fs15 from "node:fs";
-import path20 from "node:path";
-
 // src/harnesses/kafka/settings.ts
 function readSettings2(file) {
   return readJsonOr(file, {});
@@ -36972,6 +36976,22 @@ function setMcpServer3(file, name, entry) {
   }
   writeSettings2(file, s);
 }
+function removeMcpServer3(file, name) {
+  if (!exists(file))
+    return;
+  const s = readSettings2(file);
+  const raw = s.mcp_servers ?? s.mcpServers;
+  if (!raw)
+    return;
+  if (Array.isArray(raw)) {
+    s.mcp_servers = raw.filter((e2) => e2.name !== name);
+  } else {
+    delete raw[name];
+    s.mcp_servers = raw;
+  }
+  delete s.mcpServers;
+  writeSettings2(file, s);
+}
 function normalizeMcpPayload2(payload) {
   const out = { ...payload };
   delete out.is_enabled;
@@ -37001,6 +37021,8 @@ function normalizeMcpPayload2(payload) {
 }
 
 // src/harnesses/kafka/inventory.ts
+import fs15 from "node:fs";
+import path20 from "node:path";
 function firstLine3(file, max = 200) {
   try {
     const head = fs15.readFileSync(file, "utf8").slice(0, 2000);
@@ -37650,6 +37672,11 @@ var kafka = {
 async function installKafkaWithCtx(components, opts, templateName) {
   return installKafka(components, opts, { templateName });
 }
+function removeKafkaMcp(slugs, opts) {
+  const { mcpStore } = scopePaths3(opts.cwd, opts.scope);
+  for (const slug of slugs)
+    removeMcpServer3(mcpStore, slug);
+}
 
 // src/harnesses/index.ts
 var adapters = [claudeCode, codex, kafka];
@@ -37679,6 +37706,17 @@ async function detectHarnesses(cwd) {
   }
   return out;
 }
+function runHarnessRemoveMcp(harnessId, slugs, opts) {
+  if (slugs.length === 0)
+    return;
+  const canonical = normalizeHarnessId(harnessId);
+  if (canonical === "claude-code")
+    return removeClaudeCodeMcp(slugs, opts);
+  if (canonical === "codex")
+    return removeCodexMcp(slugs, opts);
+  if (canonical === "kafka")
+    return removeKafkaMcp(slugs, opts);
+}
 
 // src/core/registry.ts
 import fs18 from "node:fs";
@@ -48632,6 +48670,8 @@ async function runRemove(cwd2, args) {
         if (c2.type === "mcp" && c2.settingsFile && c2.embeddedKey) {
           if (inst.harness === "codex")
             removeMcpServer2(c2.settingsFile, c2.embeddedKey);
+          else if (inst.harness === "kafka")
+            removeMcpServer3(c2.settingsFile, c2.embeddedKey);
           else
             removeMcpServer(c2.settingsFile, c2.embeddedKey);
         } else if (c2.type === "instruction") {
@@ -51098,6 +51138,11 @@ var McpEntrySchema = exports_external.object({
   headers: exports_external.record(exports_external.string()).optional(),
   is_enabled: exports_external.boolean().optional()
 });
+var CapabilitiesSchema = exports_external.object({
+  memory: exports_external.boolean().optional(),
+  browser: exports_external.boolean().optional(),
+  slack: exports_external.boolean().optional()
+});
 var AgentManifestSchema = exports_external.object({
   schema: exports_external.literal(1),
   id: exports_external.string().min(1).optional(),
@@ -51108,6 +51153,7 @@ var AgentManifestSchema = exports_external.object({
   playbooks: exports_external.array(PlaybookSchema).default([]),
   skills: exports_external.array(SkillEntrySchema).default([]),
   mcp: exports_external.array(McpEntrySchema).default([]),
+  capabilities: CapabilitiesSchema.optional(),
   commands: exports_external.array(exports_external.record(exports_external.unknown())).optional(),
   hooks: exports_external.array(exports_external.record(exports_external.unknown())).optional(),
   files: exports_external.array(exports_external.record(exports_external.unknown())).optional()
@@ -51894,6 +51940,39 @@ import os11 from "node:os";
 import crypto3 from "node:crypto";
 var import_picocolors24 = __toESM(require_picocolors(), 1);
 
+// src/core/memory-mcp.ts
+var DEFAULT_MEMORY_MCP_BASE = "https://brainbase-memory-mcp.onrender.com";
+var MEMORY_MCP_SLUG = "brainbase-memory";
+function memoryMcpBaseUrl() {
+  const envOverride = process.env.BRAINBASE_MEMORY_MCP_URL;
+  if (envOverride)
+    return envOverride.replace(/\/+$/, "");
+  return DEFAULT_MEMORY_MCP_BASE;
+}
+function memoryMcpUrl() {
+  return `${memoryMcpBaseUrl()}/t/\${BRAINBASE_THREAD_ID}/mcp`;
+}
+function memoryMcpPayload() {
+  return {
+    url: memoryMcpUrl(),
+    headers: {
+      Authorization: "Bearer ${BRAINBASE_TOKEN}"
+    }
+  };
+}
+function buildMemoryMcpComponent(scope) {
+  return {
+    type: "mcp",
+    slug: MEMORY_MCP_SLUG,
+    scope,
+    rootDir: "",
+    description: "This agent's persistent SQL memory database (provision, query, " + "inspect schema). Scoped to this agent only.",
+    meta: { mcp: memoryMcpPayload() },
+    payload: memoryMcpPayload(),
+    checksum: "builtin:brainbase-memory:v1"
+  };
+}
+
 // src/core/orchestration-mcp.ts
 var DEFAULT_ORCHESTRATION_MCP_BASE = "https://brainbase-orchestration-mcp.onrender.com";
 var ORCHESTRATION_MCP_SLUG = "brainbase-orchestration";
@@ -51927,39 +52006,109 @@ function buildOrchestrationMcpComponent(scope) {
   };
 }
 
-// src/core/memory-mcp.ts
-var DEFAULT_MEMORY_MCP_BASE = "https://brainbase-memory-mcp.onrender.com";
-var MEMORY_MCP_SLUG = "brainbase-memory";
-function memoryMcpBaseUrl() {
-  const envOverride = process.env.BRAINBASE_MEMORY_MCP_URL;
+// src/core/slack-mcp.ts
+var DEFAULT_SLACK_MCP_BASE = "https://brainbase-slack-mcp.onrender.com";
+var SLACK_MCP_SLUG = "brainbase-slack";
+function slackMcpBaseUrl() {
+  const envOverride = process.env.BRAINBASE_SLACK_MCP_URL;
   if (envOverride)
     return envOverride.replace(/\/+$/, "");
-  return DEFAULT_MEMORY_MCP_BASE;
+  return DEFAULT_SLACK_MCP_BASE;
 }
-function memoryMcpUrl() {
-  return `${memoryMcpBaseUrl()}/t/\${BRAINBASE_THREAD_ID}/mcp`;
+function slackMcpUrl() {
+  return `${slackMcpBaseUrl()}/t/\${BRAINBASE_THREAD_ID}/mcp`;
 }
-function memoryMcpPayload() {
+function slackMcpPayload() {
   return {
-    url: memoryMcpUrl(),
+    url: slackMcpUrl(),
     headers: {
       Authorization: "Bearer ${BRAINBASE_TOKEN}"
     }
   };
 }
-function buildMemoryMcpComponent(scope) {
+function buildSlackMcpComponent(scope) {
   return {
     type: "mcp",
-    slug: MEMORY_MCP_SLUG,
+    slug: SLACK_MCP_SLUG,
     scope,
     rootDir: "",
-    description: "This agent's persistent SQL memory database (provision, query, " + "inspect schema). Scoped to this agent only.",
-    meta: { mcp: memoryMcpPayload() },
-    payload: memoryMcpPayload(),
-    checksum: "builtin:brainbase-memory:v1"
+    description: "This agent's Slack connector (read channels, send messages, manage " + "the workspace it is installed in). Scoped to this agent only.",
+    meta: { mcp: slackMcpPayload() },
+    payload: slackMcpPayload(),
+    checksum: "builtin:brainbase-slack:v1"
+  };
+}
+
+// src/core/browser-mcp.ts
+var DEFAULT_BROWSER_MCP_BASE = "https://brainbase-browser-mcp.onrender.com";
+var BROWSER_MCP_SLUG = "brainbase-browser";
+function browserMcpBaseUrl() {
+  const envOverride = process.env.BRAINBASE_BROWSER_MCP_URL;
+  if (envOverride)
+    return envOverride.replace(/\/+$/, "");
+  return DEFAULT_BROWSER_MCP_BASE;
+}
+function browserMcpUrl() {
+  return `${browserMcpBaseUrl()}/t/\${BRAINBASE_THREAD_ID}/mcp`;
+}
+function browserMcpPayload() {
+  return {
+    url: browserMcpUrl(),
+    headers: {
+      Authorization: "Bearer ${BRAINBASE_TOKEN}"
+    }
+  };
+}
+function buildBrowserMcpComponent(scope) {
+  return {
+    type: "mcp",
+    slug: BROWSER_MCP_SLUG,
+    scope,
+    rootDir: "",
+    description: "This agent's headless browser (navigate, read pages, fill forms). " + "Scoped to this agent only.",
+    meta: { mcp: browserMcpPayload() },
+    payload: browserMcpPayload(),
+    checksum: "builtin:brainbase-browser:v1"
   };
 }
 
+// src/core/builtin-mcps.ts
+function capabilitiesFromAgent(agent) {
+  return {
+    memory: agent.memory_enabled !== false,
+    browser: agent.browser_enabled !== false,
+    slack: agent.slack_connected === true
+  };
+}
+function capabilitiesFromManifest(manifest) {
+  const c2 = manifest?.capabilities ?? {};
+  return {
+    memory: c2.memory !== false,
+    browser: c2.browser !== false,
+    slack: c2.slack === true
+  };
+}
+function resolveBuiltinMcps(input) {
+  const { caps, declaredSlugs, scope } = input;
+  const gated = [
+    { slug: ORCHESTRATION_MCP_SLUG, enabled: true, build: buildOrchestrationMcpComponent },
+    { slug: MEMORY_MCP_SLUG, enabled: caps.memory, build: buildMemoryMcpComponent },
+    { slug: BROWSER_MCP_SLUG, enabled: caps.browser, build: buildBrowserMcpComponent },
+    { slug: SLACK_MCP_SLUG, enabled: caps.slack, build: buildSlackMcpComponent }
+  ];
+  const install = [];
+  const removeSlugs = [];
+  for (const g3 of gated) {
+    if (declaredSlugs.has(g3.slug))
+      continue;
+    if (g3.enabled)
+      install.push(g3.build(scope));
+    else
+      removeSlugs.push(g3.slug);
+  }
+  return { install, removeSlugs };
+}
+
 // src/cli/sync.ts
 async function runSync(cwd2, args) {
   banner("sync — bring in the latest changes from your team");
@@ -51986,11 +52135,21 @@ async function runSync(cwd2, args) {
   }
   const prevState = readSyncState(cwd2);
   const diff2 = computeDiff(manifest.components, prevState);
-  const cloudHasOrchestrationMcp = manifest.components.some((c2) => c2.type === "mcp" && c2.slug === ORCHESTRATION_MCP_SLUG);
-  const needOrchestrationMcpInstall = !cloudHasOrchestrationMcp;
-  const cloudHasMemoryMcp = manifest.components.some((c2) => c2.type === "mcp" && c2.slug === MEMORY_MCP_SLUG);
-  const needMemoryMcpInstall = !cloudHasMemoryMcp;
-  if (diff2.added.length === 0 && diff2.upstreamUpdated.length === 0 && diff2.localModified.length === 0 && diff2.deletedUpstream.length === 0 && !needOrchestrationMcpInstall && !needMemoryMcpInstall) {
+  const scope = args.scope ?? "project";
+  let caps;
+  try {
+    caps = capabilitiesFromManifest(readManifest(cwd2));
+  } catch (err) {
+    f2.error(err.message);
+    return;
+  }
+  const declaredMcpSlugs = new Set(manifest.components.filter((c2) => c2.type === "mcp").map((c2) => c2.slug));
+  const { install: builtinInstall, removeSlugs: builtinRemoveSlugs } = resolveBuiltinMcps({
+    caps,
+    declaredSlugs: declaredMcpSlugs,
+    scope
+  });
+  if (diff2.added.length === 0 && diff2.upstreamUpdated.length === 0 && diff2.localModified.length === 0 && diff2.deletedUpstream.length === 0 && builtinInstall.length === 0 && builtinRemoveSlugs.length === 0) {
     f2.info(`${sym.same} You're up to date.`);
     writeSyncState(cwd2, {
       schemaVersion: 1,
@@ -52054,7 +52213,6 @@ async function runSync(cwd2, args) {
     });
   }
   const adapter = getAdapter(adapterId);
-  const scope = args.scope ?? "project";
   const keepLocal = new Set;
   if (diff2.localModified.length > 0) {
     requireInteractive(`${diff2.localModified.length} component(s) changed both locally and in the cloud — run \`brainbase sync\` in an interactive terminal to resolve them (or revert your local changes).`);
@@ -52092,14 +52250,7 @@ async function runSync(cwd2, args) {
       payload: proxifyMcpPayload(c2.meta?.mcp),
       checksum: c2.hash
     }));
-    const hasUserOrchestrationMcp = toInstall.some((c2) => c2.type === "mcp" && c2.slug === ORCHESTRATION_MCP_SLUG);
-    if (!hasUserOrchestrationMcp) {
-      toInstall.push(buildOrchestrationMcpComponent(scope));
-    }
-    const hasUserMemoryMcp = toInstall.some((c2) => c2.type === "mcp" && c2.slug === MEMORY_MCP_SLUG);
-    if (!hasUserMemoryMcp) {
-      toInstall.push(buildMemoryMcpComponent(scope));
-    }
+    toInstall.push(...builtinInstall);
     const justInstalledPaths = new Map;
     if (toInstall.length > 0) {
       const installSpinner = de();
@@ -52119,6 +52270,9 @@ async function runSync(cwd2, args) {
         f2.warn(`Skipped: ${result2.skipped.map((s3) => `${s3.type}/${s3.slug} (${s3.reason})`).join(", ")}`);
       }
     }
+    if (builtinRemoveSlugs.length > 0) {
+      runHarnessRemoveMcp(adapter.id, builtinRemoveSlugs, { cwd: cwd2, scope });
+    }
     if (diff2.deletedUpstream.length > 0) {
       for (const removed of diff2.deletedUpstream) {
         let goAhead = autoProceed(args.yes);
@@ -52708,11 +52862,14 @@ async function runAgentPull(cwd2, args) {
     else
       toInstallKeys.add(r2.key);
   }
-  const cloudHasOrchestrationMcp = cloud.components.some((c2) => c2.type === "mcp" && c2.slug === ORCHESTRATION_MCP_SLUG);
-  const needOrchestrationMcpInstall = !cloudHasOrchestrationMcp;
-  const cloudHasMemoryMcp = cloud.components.some((c2) => c2.type === "mcp" && c2.slug === MEMORY_MCP_SLUG);
-  const needMemoryMcpInstall = !cloudHasMemoryMcp;
-  if (toInstallKeys.size === 0 && toRemoveKeys.size === 0 && !needOrchestrationMcpInstall && !needMemoryMcpInstall && !override) {
+  const caps = capabilitiesFromAgent(cloudAgent);
+  const declaredMcpSlugs = new Set(cloud.components.filter((c2) => c2.type === "mcp").map((c2) => c2.slug));
+  const { install: builtinInstall, removeSlugs: builtinRemoveSlugs } = resolveBuiltinMcps({
+    caps,
+    declaredSlugs: declaredMcpSlugs,
+    scope: args.scope ?? "project"
+  });
+  if (toInstallKeys.size === 0 && toRemoveKeys.size === 0 && builtinInstall.length === 0 && builtinRemoveSlugs.length === 0 && !override) {
     f2.info(`You're up to date.`);
     writeLink(cwd2, buildLinkFromAgent(cloudAgent, harness, readLink(cwd2)));
     writeSyncState(cwd2, buildLockFromCloud(agentId, cloud, lock, cloudAgent));
@@ -52766,7 +52923,7 @@ async function runAgentPull(cwd2, args) {
   const stageRoot = stageManifestComponents(installComponents);
   const justInstalledPaths = new Map;
   try {
-    if (installComponents.length > 0 || needOrchestrationMcpInstall || needMemoryMcpInstall) {
+    if (installComponents.length > 0 || builtinInstall.length > 0) {
       const installSpinner = de();
       installSpinner.start("Applying updates…");
       const toInstall = installComponents.map((c2) => ({
@@ -52780,12 +52937,7 @@ async function runAgentPull(cwd2, args) {
         checksum: c2.hash,
         source: skillSourceFromMeta(c2)
       }));
-      if (needOrchestrationMcpInstall) {
-        toInstall.push(buildOrchestrationMcpComponent(scope));
-      }
-      if (needMemoryMcpInstall) {
-        toInstall.push(buildMemoryMcpComponent(scope));
-      }
+      toInstall.push(...builtinInstall);
       const opts = {
         cwd: cwd2,
         scope,
@@ -52801,6 +52953,9 @@ async function runAgentPull(cwd2, args) {
         f2.warn(`Skipped: ${result2.skipped.map((s3) => `${s3.type}/${s3.slug} (${s3.reason})`).join(", ")}`);
       }
     }
+    if (builtinRemoveSlugs.length > 0) {
+      runHarnessRemoveMcp(harness, builtinRemoveSlugs, { cwd: cwd2, scope });
+    }
     for (const r2 of removeRows) {
       const prior = lock?.components.find((c2) => c2.type === r2.type && c2.slug === r2.slug);
       if (!prior)
@@ -53053,6 +53208,7 @@ function mergeManifest(cwd2, prev, cloud, cloudAgent, harness) {
       entry.is_enabled = payload.is_enabled;
     return entry;
   });
+  const caps = capabilitiesFromAgent(cloudAgent);
   return {
     schema: 1,
     id: cloudAgent.id,
@@ -53065,7 +53221,8 @@ function mergeManifest(cwd2, prev, cloud, cloudAgent, harness) {
     ...entrypoint ? { entrypoint } : {},
     playbooks,
     skills,
-    mcp
+    mcp,
+    capabilities: { memory: caps.memory, browser: caps.browser, slack: caps.slack }
   };
 }
 function materializeEntrypoint(cwd2, cloudEntrypoint, prev) {
@@ -54366,12 +54523,14 @@ async function runAgentUnpack(cwd2, args) {
         checksum: ""
       });
     }
-    const haveOrchMcp = (manifest.mcp ?? []).some((m3) => m3.name === ORCHESTRATION_MCP_SLUG);
-    const haveMemoryMcp = (manifest.mcp ?? []).some((m3) => m3.name === MEMORY_MCP_SLUG);
-    if (!haveOrchMcp)
-      toInstall.push(buildOrchestrationMcpComponent(scope));
-    if (!haveMemoryMcp)
-      toInstall.push(buildMemoryMcpComponent(scope));
+    const caps = capabilitiesFromManifest(manifest);
+    const declaredMcpSlugs = new Set((manifest.mcp ?? []).map((m3) => m3.name));
+    const { install: builtinInstall, removeSlugs: builtinRemoveSlugs } = resolveBuiltinMcps({
+      caps,
+      declaredSlugs: declaredMcpSlugs,
+      scope
+    });
+    toInstall.push(...builtinInstall);
     const opts = {
       cwd: cwd2,
       scope,
@@ -54385,6 +54544,9 @@ async function runAgentUnpack(cwd2, args) {
     if (result2.skipped.length) {
       f2.warn(`Skipped: ${result2.skipped.map((s3) => `${s3.type}/${s3.slug} (${s3.reason})`).join(", ")}`);
     }
+    if (builtinRemoveSlugs.length > 0) {
+      runHarnessRemoveMcp(harness, builtinRemoveSlugs, { cwd: cwd2, scope });
+    }
   } catch (err) {
     f2.error(`Install failed: ${err.message}`);
     return;
@@ -54595,7 +54757,7 @@ function printHelp() {
 }
 
 // src/cli/orchestration.ts
-var import_picocolors37 = __toESM(require_picocolors(), 1);
+var import_picocolors38 = __toESM(require_picocolors(), 1);
 
 // src/cli/orchestration-pull.ts
 import path54 from "node:path";
@@ -54625,11 +54787,24 @@ var EdgeSchema = exports_external.object({
   description: exports_external.string().optional(),
   payload_schema: exports_external.record(exports_external.unknown()).optional()
 });
+var TriggerEdgeSchema = exports_external.object({
+  agent: exports_external.string(),
+  description: exports_external.string().optional(),
+  payload_schema: exports_external.record(exports_external.unknown()).optional()
+});
+var TriggerSchema = exports_external.object({
+  type: exports_external.string(),
+  node_id: exports_external.string(),
+  is_active: exports_external.boolean().optional(),
+  config: exports_external.record(exports_external.unknown()).optional(),
+  to: exports_external.array(TriggerEdgeSchema).default([])
+});
 var OrchestrationManifestSchema = exports_external.object({
   schema: exports_external.literal(1),
   orchestration: OrchMetaSchema,
   members: exports_external.array(MemberSchema).default([]),
-  edges: exports_external.array(EdgeSchema).default([])
+  edges: exports_external.array(EdgeSchema).default([]),
+  triggers: exports_external.array(TriggerSchema).optional()
 });
 function orchManifestPath(cwd2) {
   return path51.join(cwd2, ORCH_MANIFEST_FILE);
@@ -54659,7 +54834,7 @@ function writeOrchManifest(cwd2, manifest) {
   doc.contents = manifest;
   doc.commentBefore = ` brainbase-orchestration.yaml — declarative orchestration manifest.
 ` + ` Committed to source control. Edit by hand, then
-` + " `brainbase orchestration push`. Member agents live under ./agents/.";
+` + " `brainbase orchestration push`. Member agents live under ./agents/." + "\n A `triggers:` block (if present) is READ-ONLY — managed in the web app\n" + " and ignored by `orchestration push`.";
   fs47.writeFileSync(orchManifestPath(cwd2), String(doc), "utf8");
 }
 function memberDir(cwd2, slug) {
@@ -54669,6 +54844,9 @@ var MEMBER_SLUG_MAX = 50;
 function slugifyRaw(raw) {
   return (raw || "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
+function slugifyMemberName(raw) {
+  return slugifyRaw(raw) || "agent";
+}
 function resolveMemberSlugs(members) {
   const SAFE = /^[a-z0-9][a-z0-9-]*$/;
   const used = new Set;
@@ -54797,12 +54975,15 @@ async function installAgentFresh(input) {
   ensureDir(cwd2);
   const stageRoot = stageManifestComponents2(cloud.components);
   const justInstalledPaths = new Map;
-  const cloudHasOrchestrationMcp = cloud.components.some((c2) => c2.type === "mcp" && c2.slug === ORCHESTRATION_MCP_SLUG);
-  const needOrchestrationMcpInstall = !cloudHasOrchestrationMcp;
-  const cloudHasMemoryMcp = cloud.components.some((c2) => c2.type === "mcp" && c2.slug === MEMORY_MCP_SLUG);
-  const needMemoryMcpInstall = !cloudHasMemoryMcp;
+  const caps = capabilitiesFromAgent(agent);
+  const declaredMcpSlugs = new Set(cloud.components.filter((c2) => c2.type === "mcp").map((c2) => c2.slug));
+  const { install: builtinInstall } = resolveBuiltinMcps({
+    caps,
+    declaredSlugs: declaredMcpSlugs,
+    scope
+  });
   try {
-    if (cloud.components.length > 0 || needOrchestrationMcpInstall || needMemoryMcpInstall) {
+    if (cloud.components.length > 0 || builtinInstall.length > 0) {
       const toInstall = cloud.components.map((c2) => ({
         type: c2.type,
         slug: c2.slug,
@@ -54813,12 +54994,7 @@ async function installAgentFresh(input) {
         payload: proxifyMcpPayload(c2.meta?.mcp),
         checksum: c2.hash
       }));
-      if (needOrchestrationMcpInstall) {
-        toInstall.push(buildOrchestrationMcpComponent(scope));
-      }
-      if (needMemoryMcpInstall) {
-        toInstall.push(buildMemoryMcpComponent(scope));
-      }
+      toInstall.push(...builtinInstall);
       const installOpts = {
         cwd: cwd2,
         scope,
@@ -54936,6 +55112,7 @@ function buildManifestFromCloud(cloud, agent) {
       entry.is_enabled = payload.is_enabled;
     return entry;
   });
+  const caps = capabilitiesFromAgent(agent);
   return {
     schema: 1,
     agent: {
@@ -54945,7 +55122,8 @@ function buildManifestFromCloud(cloud, agent) {
     ...hasInstructions ? { instructions: { file: DEFAULT_INSTRUCTIONS_FILE } } : {},
     playbooks: [],
     skills,
-    mcp
+    mcp,
+    capabilities: { memory: caps.memory, browser: caps.browser, slack: caps.slack }
   };
 }
 async function pullAgentSecrets(cwd2, agentId) {
@@ -55092,7 +55270,20 @@ async function runOrchestrationPull(cwd2, args) {
       to: slugFor(e2.to_agent_id),
       ...e2.description ? { description: e2.description } : {},
       ...e2.payload_schema && Object.keys(e2.payload_schema).length ? { payload_schema: e2.payload_schema } : {}
-    }))
+    })),
+    ...cloud.triggers && cloud.triggers.length ? {
+      triggers: cloud.triggers.map((t) => ({
+        type: t.trigger_type,
+        node_id: t.node_id,
+        is_active: t.is_active,
+        ...t.config && Object.keys(t.config).length ? { config: t.config } : {},
+        to: t.edges.map((e2) => ({
+          agent: slugFor(e2.to_agent_id),
+          ...e2.description ? { description: e2.description } : {},
+          ...e2.payload_schema && Object.keys(e2.payload_schema).length ? { payload_schema: e2.payload_schema } : {}
+        }))
+      }))
+    } : {}
   };
   writeOrchManifest(cwd2, manifest);
   writeOrchLink(cwd2, {
@@ -55478,6 +55669,192 @@ function handleApiError7(err) {
   }
 }
 
+// src/cli/orchestration-add-agent.ts
+import fs51 from "node:fs";
+var import_picocolors37 = __toESM(require_picocolors(), 1);
+
+// src/core/orchestration-add.ts
+function resolveOrgIdForGroup(groupId, orgsWithTeams) {
+  for (const o2 of orgsWithTeams) {
+    if (o2.teamIds.includes(groupId))
+      return o2.orgId;
+  }
+  return null;
+}
+function parseEdgeSchema(raw) {
+  if (!raw || !raw.trim())
+    return;
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw new Error(`--schema is not valid JSON: ${raw}`);
+  }
+  if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(`--schema must be a JSON object, e.g. '{"field":"type"}'`);
+  }
+  return parsed;
+}
+function mergeMemberAndEdges(manifest, input) {
+  const members = manifest.members.slice();
+  if (!members.some((m3) => m3.slug === input.slug)) {
+    members.push({
+      slug: input.slug,
+      ...input.name && input.name !== input.slug ? { name: input.name } : {}
+    });
+  }
+  const memberSlugs = new Set(members.map((m3) => m3.slug));
+  const newEdges = [];
+  const addEdge = (from, to2) => {
+    if (from === to2)
+      throw new Error(`Edge ${from} → ${to2}: self-loops are not allowed.`);
+    for (const slug of [from, to2]) {
+      if (!memberSlugs.has(slug)) {
+        throw new Error(`Edge endpoint "${slug}" is not a member. Members: ${[...memberSlugs].join(", ")}.`);
+      }
+    }
+    const duplicate = manifest.edges.some((e2) => e2.from === from && e2.to === to2) || newEdges.some((e2) => e2.from === from && e2.to === to2);
+    if (duplicate)
+      return;
+    newEdges.push({
+      from,
+      to: to2,
+      ...input.description ? { description: input.description } : {},
+      ...input.payloadSchema ? { payload_schema: input.payloadSchema } : {}
+    });
+  };
+  for (const f4 of input.from)
+    addEdge(f4, input.slug);
+  for (const t of input.to)
+    addEdge(input.slug, t);
+  return { ...manifest, members, edges: [...manifest.edges, ...newEdges] };
+}
+
+// src/cli/orchestration-add-agent.ts
+async function runOrchestrationAddAgent(cwd2, args) {
+  banner("orchestration add-agent — create a member agent and wire it into the graph");
+  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.`);
+    return;
+  }
+  let manifest;
+  try {
+    manifest = readOrchManifest(cwd2);
+  } catch (err) {
+    f2.error(err.message);
+    return;
+  }
+  let name = args.name?.trim();
+  if (!name) {
+    name = (await text({
+      message: "New agent name",
+      placeholder: "e.g. Refund Bot",
+      validate: (v3) => !v3?.trim() ? "Required" : undefined,
+      flagHint: "Pass the name positionally or with --name."
+    })).trim();
+  }
+  let slug = slugifyMemberName(name);
+  if (manifest.members.some((m3) => m3.slug === slug) || fs51.existsSync(memberDir(cwd2, slug))) {
+    let n = 2;
+    let candidate = `${slug}-${n}`;
+    while (manifest.members.some((m3) => m3.slug === candidate) || fs51.existsSync(memberDir(cwd2, candidate))) {
+      candidate = `${slug}-${++n}`;
+    }
+    f2.info(`Slug ${import_picocolors37.default.bold(slug)} is taken — using ${import_picocolors37.default.bold(candidate)}.`);
+    slug = candidate;
+  }
+  let payloadSchema;
+  try {
+    payloadSchema = parseEdgeSchema(args.schema);
+  } catch (err) {
+    f2.error(err.message);
+    return;
+  }
+  let orgId = args.orgId;
+  if (!orgId) {
+    const sp = de();
+    sp.start("Resolving org for this orchestration…");
+    try {
+      const orgs = await api.listOrgs();
+      const orgsWithTeams = [];
+      for (const o2 of orgs) {
+        const teams = await api.listTeams(o2.id);
+        orgsWithTeams.push({ orgId: o2.id, teamIds: teams.map((t) => t.id) });
+      }
+      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.`);
+        return;
+      }
+      orgId = resolved;
+      sp.stop("Resolved org.");
+    } catch (err) {
+      sp.stop("Failed.");
+      f2.error(err.message);
+      return;
+    }
+  }
+  let from = args.from ?? [];
+  let to2 = args.to ?? [];
+  let description = args.description;
+  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)`,
+      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)`,
+      options: memberOptions,
+      required: false
+    });
+    if (Array.isArray(pickedTo))
+      to2 = pickedTo;
+    if ((from.length > 0 || to2.length > 0) && description === undefined) {
+      const d3 = await te({ message: "Edge description (optional)" });
+      if (typeof d3 === "string" && d3.trim())
+        description = d3.trim();
+    }
+  }
+  let updated;
+  try {
+    updated = mergeMemberAndEdges(manifest, { slug, name, from, to: to2, description, payloadSchema });
+  } catch (err) {
+    f2.error(err.message);
+    return;
+  }
+  const dest = memberDir(cwd2, slug);
+  try {
+    fs51.mkdirSync(dest, { recursive: true });
+    await runAgentCreate(dest, {
+      name,
+      orgId,
+      teamId: link2.group_id,
+      harness: args.harness,
+      yes: true,
+      noTracking: true
+    });
+  } catch (err) {
+    try {
+      fs51.rmSync(dest, { recursive: true, force: true });
+    } catch {}
+    f2.error(`Failed to create ${slug}: ${err.message}`);
+    return;
+  }
+  writeOrchManifest(cwd2, updated);
+  if (args.noPush) {
+    f2.info(`Manifest updated. Run ${import_picocolors37.default.cyan("brainbase orchestration push")} to apply.`);
+    return;
+  }
+  await runOrchestrationPush(cwd2, { yes: true, graphOnly: true });
+}
+
 // src/cli/orchestration.ts
 async function runOrchestration(cwd2, sub, args, opts) {
   switch (sub) {
@@ -55501,6 +55878,20 @@ async function runOrchestration(cwd2, sub, args, opts) {
     case "ls":
       await runOrchestrationList({ orgId: opts.orgId, teamId: opts.teamId });
       return;
+    case "add-agent":
+    case "add":
+      await runOrchestrationAddAgent(cwd2, {
+        name: args[0] ?? opts.name,
+        from: opts.from,
+        to: opts.to,
+        description: opts.description,
+        schema: opts.schema,
+        harness: opts.harness,
+        orgId: opts.orgId,
+        noPush: opts.noPush,
+        yes: opts.yes
+      });
+      return;
     case undefined:
     case "help":
     case "-h":
@@ -55517,19 +55908,20 @@ async function runOrchestration(cwd2, sub, args, opts) {
 function printHelp2() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors37.default.bold("brainbase orchestration")} ${import_picocolors37.default.dim("<sub> [options]")}`);
+  out.push(`  ${import_picocolors38.default.bold("brainbase orchestration")} ${import_picocolors38.default.dim("<sub> [options]")}`);
   out.push("");
-  out.push(`  ${import_picocolors37.default.cyan("pull")} ${import_picocolors37.default.dim("<id>")}      ${import_picocolors37.default.dim("fetch orchestration + every member agent into this folder")}`);
-  out.push(`  ${import_picocolors37.default.cyan("push")}             ${import_picocolors37.default.dim("push each member, then update the orchestration graph")}`);
-  out.push(`  ${import_picocolors37.default.cyan("status")}           ${import_picocolors37.default.dim("show what would push and what would pull")}`);
-  out.push(`  ${import_picocolors37.default.cyan("list")}             ${import_picocolors37.default.dim("list orchestrations under a team")}`);
+  out.push(`  ${import_picocolors38.default.cyan("pull")} ${import_picocolors38.default.dim("<id>")}      ${import_picocolors38.default.dim("fetch orchestration + every member agent into this folder")}`);
+  out.push(`  ${import_picocolors38.default.cyan("push")}             ${import_picocolors38.default.dim("push each member, then update the orchestration graph")}`);
+  out.push(`  ${import_picocolors38.default.cyan("add-agent")} ${import_picocolors38.default.dim("<name>")}    ${import_picocolors38.default.dim("create a member agent, wire edges (--from/--to), and push")}`);
+  out.push(`  ${import_picocolors38.default.cyan("status")}           ${import_picocolors38.default.dim("show what would push and what would pull")}`);
+  out.push(`  ${import_picocolors38.default.cyan("list")}             ${import_picocolors38.default.dim("list orchestrations under a team")}`);
   out.push("");
-  out.push(`  ${import_picocolors37.default.bold("Flags")}`);
-  out.push(`    ${import_picocolors37.default.dim("--yes, -y")}        skip confirmations`);
-  out.push(`    ${import_picocolors37.default.dim("--harness <id>")}   harness for newly-created member folders (default claude-code)`);
-  out.push(`    ${import_picocolors37.default.dim("--graph-only")}     for push: only update members + edges, skip per-member push`);
-  out.push(`    ${import_picocolors37.default.dim("--org <id>")}       for list: org id (CLI vocab — DB teams.id)`);
-  out.push(`    ${import_picocolors37.default.dim("--team <id>")}      for list: team id (CLI vocab — DB groups.id)`);
+  out.push(`  ${import_picocolors38.default.bold("Flags")}`);
+  out.push(`    ${import_picocolors38.default.dim("--yes, -y")}        skip confirmations`);
+  out.push(`    ${import_picocolors38.default.dim("--harness <id>")}   harness for newly-created member folders (default claude-code)`);
+  out.push(`    ${import_picocolors38.default.dim("--graph-only")}     for push: only update members + edges, skip per-member push`);
+  out.push(`    ${import_picocolors38.default.dim("--org <id>")}       for list: org id (CLI vocab — DB teams.id)`);
+  out.push(`    ${import_picocolors38.default.dim("--team <id>")}      for list: team id (CLI vocab — DB groups.id)`);
   out.push("");
   console.log(out.join(`
 `));
@@ -55574,16 +55966,16 @@ async function runRun(cwd2, args) {
 }
 
 // src/cli/publish.ts
-var import_picocolors38 = __toESM(require_picocolors(), 1);
+var import_picocolors39 = __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_picocolors38.default.cyan("brainbase link")} first.`);
+    f2.info(`Run ${import_picocolors39.default.cyan("brainbase link")} first.`);
     return;
   }
-  f2.info(`${import_picocolors38.default.bold("publish")} is coming soon — for now, edit the agent on the web app and run ${import_picocolors38.default.cyan("brainbase sync")} to bring changes here.`);
+  f2.info(`${import_picocolors39.default.bold("publish")} is coming soon — for now, edit the agent on the web app and run ${import_picocolors39.default.cyan("brainbase sync")} to bring changes here.`);
 }
 
 // src/ui/ink/StatusCard.tsx
@@ -55881,7 +56273,7 @@ async function runStatus(cwd2) {
 }
 
 // src/cli/token.ts
-var import_picocolors39 = __toESM(require_picocolors(), 1);
+var import_picocolors40 = __toESM(require_picocolors(), 1);
 
 // src/ui/ink/TokenCards.tsx
 var jsx_dev_runtime17 = __toESM(require_jsx_dev_runtime(), 1);
@@ -56175,7 +56567,7 @@ async function runTokenRevoke(args) {
   }
   if (!autoProceed(args.yes)) {
     const ok = await se({
-      message: `Revoke token ${import_picocolors39.default.bold(args.id)}? CIs and machines using it will stop working.`,
+      message: `Revoke token ${import_picocolors40.default.bold(args.id)}? CIs and machines using it will stop working.`,
       initialValue: false
     });
     if (!ensureNotCancelled(ok))
@@ -56190,7 +56582,7 @@ async function runTokenRevoke(args) {
 }
 async function runTokenClear() {
   if (!readToken()) {
-    console.log(import_picocolors39.default.dim("No local token stored."));
+    console.log(import_picocolors40.default.dim("No local token stored."));
     return;
   }
   clearToken();
@@ -56241,17 +56633,17 @@ async function runToken(sub, rest2, args) {
 function printTokenHelp() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors39.default.bold("brainbase token")} ${import_picocolors39.default.dim("<command>")}`);
+  out.push(`  ${import_picocolors40.default.bold("brainbase token")} ${import_picocolors40.default.dim("<command>")}`);
   out.push("");
-  out.push(`  ${import_picocolors39.default.cyan("create")}                        ${import_picocolors39.default.dim("issue a new long-lived CLI key (PAT)")}`);
-  out.push(`  ${import_picocolors39.default.cyan("list")}                          ${import_picocolors39.default.dim("show your active tokens")}`);
-  out.push(`  ${import_picocolors39.default.cyan("revoke")} ${import_picocolors39.default.dim("<id>")}                  ${import_picocolors39.default.dim("revoke a token by id")}`);
-  out.push(`  ${import_picocolors39.default.cyan("clear")}                         ${import_picocolors39.default.dim("forget the local token (does not revoke)")}`);
+  out.push(`  ${import_picocolors40.default.cyan("create")}                        ${import_picocolors40.default.dim("issue a new long-lived CLI key (PAT)")}`);
+  out.push(`  ${import_picocolors40.default.cyan("list")}                          ${import_picocolors40.default.dim("show your active tokens")}`);
+  out.push(`  ${import_picocolors40.default.cyan("revoke")} ${import_picocolors40.default.dim("<id>")}                  ${import_picocolors40.default.dim("revoke a token by id")}`);
+  out.push(`  ${import_picocolors40.default.cyan("clear")}                         ${import_picocolors40.default.dim("forget the local token (does not revoke)")}`);
   out.push("");
-  out.push(`  ${import_picocolors39.default.bold("create flags")}`);
-  out.push(`  ${import_picocolors39.default.cyan("--name, -n")} ${import_picocolors39.default.dim("<label>")}        ${import_picocolors39.default.dim("token label (prompted if omitted)")}`);
-  out.push(`  ${import_picocolors39.default.cyan("--scopes")} ${import_picocolors39.default.dim("<list>")}           ${import_picocolors39.default.dim("comma-separated; allowed: read, publish, admin")}`);
-  out.push(`                                ${import_picocolors39.default.dim("default: read,publish")}`);
+  out.push(`  ${import_picocolors40.default.bold("create flags")}`);
+  out.push(`  ${import_picocolors40.default.cyan("--name, -n")} ${import_picocolors40.default.dim("<label>")}        ${import_picocolors40.default.dim("token label (prompted if omitted)")}`);
+  out.push(`  ${import_picocolors40.default.cyan("--scopes")} ${import_picocolors40.default.dim("<list>")}           ${import_picocolors40.default.dim("comma-separated; allowed: read, publish, admin")}`);
+  out.push(`                                ${import_picocolors40.default.dim("default: read,publish")}`);
   out.push("");
   console.log(out.join(`
 `));
@@ -56271,92 +56663,92 @@ var PROTECTED = new Set([
 function help() {
   const out = [];
   out.push("");
-  out.push(`  ${brandTint("◆")}  ${import_picocolors40.default.bold("brainbase")}  ${import_picocolors40.default.dim(`v${VERSION}`)}`);
-  out.push(`     ${import_picocolors40.default.dim("connect your local agent to the brainbase platform")}`);
+  out.push(`  ${brandTint("◆")}  ${import_picocolors41.default.bold("brainbase")}  ${import_picocolors41.default.dim(`v${VERSION}`)}`);
+  out.push(`     ${import_picocolors41.default.dim("connect your local agent to the brainbase platform")}`);
   out.push("");
   out.push(divider("USAGE"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.bold("brainbase")} ${import_picocolors40.default.dim("<command> [options]")}`);
+  out.push(`  ${import_picocolors41.default.bold("brainbase")} ${import_picocolors41.default.dim("<command> [options]")}`);
   out.push("");
   out.push(divider("AUTH"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.cyan("login")}     ${import_picocolors40.default.dim("  open the web app and connect this device")}`);
-  out.push(`  ${import_picocolors40.default.cyan("logout")}    ${import_picocolors40.default.dim("  clear the local session")}`);
-  out.push(`  ${import_picocolors40.default.cyan("whoami")}    ${import_picocolors40.default.dim("  show the current user")}`);
+  out.push(`  ${import_picocolors41.default.cyan("login")}     ${import_picocolors41.default.dim("  open the web app and connect this device")}`);
+  out.push(`  ${import_picocolors41.default.cyan("logout")}    ${import_picocolors41.default.dim("  clear the local session")}`);
+  out.push(`  ${import_picocolors41.default.cyan("whoami")}    ${import_picocolors41.default.dim("  show the current user")}`);
   out.push("");
   out.push(divider("LINKED AGENT"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.cyan("agent create")}               ${import_picocolors40.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
-  out.push(`  ${import_picocolors40.default.cyan("agent pull")} ${import_picocolors40.default.dim("[<id>]")}          ${import_picocolors40.default.dim("bring cloud changes into this folder (--force to override)")}`);
-  out.push(`  ${import_picocolors40.default.cyan("agent push")}                 ${import_picocolors40.default.dim("send local changes to the cloud")}`);
-  out.push(`  ${import_picocolors40.default.cyan("agent unpack")}               ${import_picocolors40.default.dim("install the claimed agent into a harness layout")}`);
-  out.push(`  ${import_picocolors40.default.cyan("link")}                       ${import_picocolors40.default.dim("attach this folder to an existing agent")}`);
-  out.push(`  ${import_picocolors40.default.cyan("agent status")}               ${import_picocolors40.default.dim("show what would pull and what would push")}`);
-  out.push(`  ${import_picocolors40.default.cyan("agent env")}                  ${import_picocolors40.default.dim("print export lines for `eval $(brainbase agent env)`")}`);
-  out.push(`  ${import_picocolors40.default.cyan("run")} ${import_picocolors40.default.dim("<cmd> [args...]")}         ${import_picocolors40.default.dim("run <cmd> with secrets.env loaded into env")}`);
-  out.push(`  ${import_picocolors40.default.cyan("status")}                     ${import_picocolors40.default.dim("show what this folder is linked to")}`);
-  out.push(`  ${import_picocolors40.default.cyan("unlink")}                     ${import_picocolors40.default.dim("disconnect this folder")}`);
+  out.push(`  ${import_picocolors41.default.cyan("agent create")}               ${import_picocolors41.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
+  out.push(`  ${import_picocolors41.default.cyan("agent pull")} ${import_picocolors41.default.dim("[<id>]")}          ${import_picocolors41.default.dim("bring cloud changes into this folder (--force to override)")}`);
+  out.push(`  ${import_picocolors41.default.cyan("agent push")}                 ${import_picocolors41.default.dim("send local changes to the cloud")}`);
+  out.push(`  ${import_picocolors41.default.cyan("agent unpack")}               ${import_picocolors41.default.dim("install the claimed agent into a harness layout")}`);
+  out.push(`  ${import_picocolors41.default.cyan("link")}                       ${import_picocolors41.default.dim("attach this folder to an existing agent")}`);
+  out.push(`  ${import_picocolors41.default.cyan("agent status")}               ${import_picocolors41.default.dim("show what would pull and what would push")}`);
+  out.push(`  ${import_picocolors41.default.cyan("agent env")}                  ${import_picocolors41.default.dim("print export lines for `eval $(brainbase agent env)`")}`);
+  out.push(`  ${import_picocolors41.default.cyan("run")} ${import_picocolors41.default.dim("<cmd> [args...]")}         ${import_picocolors41.default.dim("run <cmd> with secrets.env loaded into env")}`);
+  out.push(`  ${import_picocolors41.default.cyan("status")}                     ${import_picocolors41.default.dim("show what this folder is linked to")}`);
+  out.push(`  ${import_picocolors41.default.cyan("unlink")}                     ${import_picocolors41.default.dim("disconnect this folder")}`);
   out.push("");
   out.push(divider("ORCHESTRATIONS"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.cyan("orchestration list")}             ${import_picocolors40.default.dim("list orchestrations under a team")}`);
-  out.push(`  ${import_picocolors40.default.cyan("orchestration pull")} ${import_picocolors40.default.dim("<id>")}        ${import_picocolors40.default.dim("recursively fetch an orchestration + every member agent")}`);
-  out.push(`  ${import_picocolors40.default.cyan("orchestration push")}             ${import_picocolors40.default.dim("recursively push each member, then update the graph")}`);
-  out.push(`  ${import_picocolors40.default.cyan("orchestration status")}           ${import_picocolors40.default.dim("show what would push and what would pull")}`);
+  out.push(`  ${import_picocolors41.default.cyan("orchestration list")}             ${import_picocolors41.default.dim("list orchestrations under a team")}`);
+  out.push(`  ${import_picocolors41.default.cyan("orchestration pull")} ${import_picocolors41.default.dim("<id>")}        ${import_picocolors41.default.dim("recursively fetch an orchestration + every member agent")}`);
+  out.push(`  ${import_picocolors41.default.cyan("orchestration push")}             ${import_picocolors41.default.dim("recursively push each member, then update the graph")}`);
+  out.push(`  ${import_picocolors41.default.cyan("orchestration status")}           ${import_picocolors41.default.dim("show what would push and what would pull")}`);
   out.push("");
   out.push(divider("TEMPLATES"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.cyan("template pack")}                       ${import_picocolors40.default.dim("bundle the current agent into a template")}`);
-  out.push(`  ${import_picocolors40.default.cyan("template publish")}                    ${import_picocolors40.default.dim("upload a template to the registry")}`);
-  out.push(`  ${import_picocolors40.default.cyan("template search")} ${import_picocolors40.default.dim("[query]")}             ${import_picocolors40.default.dim("search the registry")}`);
-  out.push(`  ${import_picocolors40.default.cyan("template info")}    ${import_picocolors40.default.dim("<creator/slug>")}     ${import_picocolors40.default.dim("show registry details for a template")}`);
-  out.push(`  ${import_picocolors40.default.cyan("template onboard")} ${import_picocolors40.default.dim("<creator/slug>")}     ${import_picocolors40.default.dim("install (or refresh) a template")}`);
-  out.push(`  ${import_picocolors40.default.cyan("template list")}                       ${import_picocolors40.default.dim("show installed templates")}`);
-  out.push(`  ${import_picocolors40.default.cyan("template remove")}  ${import_picocolors40.default.dim("<creator/slug>")}     ${import_picocolors40.default.dim("uninstall a template")}`);
+  out.push(`  ${import_picocolors41.default.cyan("template pack")}                       ${import_picocolors41.default.dim("bundle the current agent into a template")}`);
+  out.push(`  ${import_picocolors41.default.cyan("template publish")}                    ${import_picocolors41.default.dim("upload a template to the registry")}`);
+  out.push(`  ${import_picocolors41.default.cyan("template search")} ${import_picocolors41.default.dim("[query]")}             ${import_picocolors41.default.dim("search the registry")}`);
+  out.push(`  ${import_picocolors41.default.cyan("template info")}    ${import_picocolors41.default.dim("<creator/slug>")}     ${import_picocolors41.default.dim("show registry details for a template")}`);
+  out.push(`  ${import_picocolors41.default.cyan("template onboard")} ${import_picocolors41.default.dim("<creator/slug>")}     ${import_picocolors41.default.dim("install (or refresh) a template")}`);
+  out.push(`  ${import_picocolors41.default.cyan("template list")}                       ${import_picocolors41.default.dim("show installed templates")}`);
+  out.push(`  ${import_picocolors41.default.cyan("template remove")}  ${import_picocolors41.default.dim("<creator/slug>")}     ${import_picocolors41.default.dim("uninstall a template")}`);
   out.push("");
   out.push(divider("SKILLS"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.cyan("skill add")} ${import_picocolors40.default.dim("<source>")}                  ${import_picocolors40.default.dim("install a skill (github / git / brainbase)")}`);
-  out.push(`  ${import_picocolors40.default.cyan("skill list")}                            ${import_picocolors40.default.dim("show locally installed skills + their source")}`);
-  out.push(`  ${import_picocolors40.default.cyan("skill update")} ${import_picocolors40.default.dim("<slug>")}                  ${import_picocolors40.default.dim("re-fetch a skill from its recorded source")}`);
-  out.push(`  ${import_picocolors40.default.cyan("skill remove")} ${import_picocolors40.default.dim("<slug>")}                  ${import_picocolors40.default.dim("uninstall a skill")}`);
-  out.push(`  ${import_picocolors40.default.cyan("skill search")} ${import_picocolors40.default.dim("[query]")}                 ${import_picocolors40.default.dim("search the brainbase skill registry")}`);
-  out.push(`  ${import_picocolors40.default.cyan("skill info")} ${import_picocolors40.default.dim("<creator/slug>")}            ${import_picocolors40.default.dim("show registry details for a skill")}`);
-  out.push(`  ${import_picocolors40.default.cyan("skill publish")} ${import_picocolors40.default.dim("[dir]")}                  ${import_picocolors40.default.dim("publish a SKILL.md folder (defaults to .)")}`);
+  out.push(`  ${import_picocolors41.default.cyan("skill add")} ${import_picocolors41.default.dim("<source>")}                  ${import_picocolors41.default.dim("install a skill (github / git / brainbase)")}`);
+  out.push(`  ${import_picocolors41.default.cyan("skill list")}                            ${import_picocolors41.default.dim("show locally installed skills + their source")}`);
+  out.push(`  ${import_picocolors41.default.cyan("skill update")} ${import_picocolors41.default.dim("<slug>")}                  ${import_picocolors41.default.dim("re-fetch a skill from its recorded source")}`);
+  out.push(`  ${import_picocolors41.default.cyan("skill remove")} ${import_picocolors41.default.dim("<slug>")}                  ${import_picocolors41.default.dim("uninstall a skill")}`);
+  out.push(`  ${import_picocolors41.default.cyan("skill search")} ${import_picocolors41.default.dim("[query]")}                 ${import_picocolors41.default.dim("search the brainbase skill registry")}`);
+  out.push(`  ${import_picocolors41.default.cyan("skill info")} ${import_picocolors41.default.dim("<creator/slug>")}            ${import_picocolors41.default.dim("show registry details for a skill")}`);
+  out.push(`  ${import_picocolors41.default.cyan("skill publish")} ${import_picocolors41.default.dim("[dir]")}                  ${import_picocolors41.default.dim("publish a SKILL.md folder (defaults to .)")}`);
   out.push("");
   out.push(divider("CLI TOKENS"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.cyan("token create")}                        ${import_picocolors40.default.dim("issue a long-lived CLI key for CI / scripts")}`);
-  out.push(`  ${import_picocolors40.default.cyan("token list")}                          ${import_picocolors40.default.dim("show your active tokens")}`);
-  out.push(`  ${import_picocolors40.default.cyan("token revoke")} ${import_picocolors40.default.dim("<id>")}                  ${import_picocolors40.default.dim("revoke a token")}`);
+  out.push(`  ${import_picocolors41.default.cyan("token create")}                        ${import_picocolors41.default.dim("issue a long-lived CLI key for CI / scripts")}`);
+  out.push(`  ${import_picocolors41.default.cyan("token list")}                          ${import_picocolors41.default.dim("show your active tokens")}`);
+  out.push(`  ${import_picocolors41.default.cyan("token revoke")} ${import_picocolors41.default.dim("<id>")}                  ${import_picocolors41.default.dim("revoke a token")}`);
   out.push("");
   out.push(divider("FLAGS"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.dim("--harness <id>")}     force harness for onboard / sync (e.g. claude-code)`);
-  out.push(`  ${import_picocolors40.default.dim("--scope <s>")}        force scope: global | project`);
-  out.push(`  ${import_picocolors40.default.dim("--yes, -y")}          skip confirmations / auto-overwrite`);
-  out.push(`  ${import_picocolors40.default.dim("--agent <id>")}       for link: attach this folder to an existing agent non-interactively`);
-  out.push(`  ${import_picocolors40.default.dim("--no-tracking")}      for link: skip routing LLM traffic through brainbase`);
-  out.push(`  ${import_picocolors40.default.dim("--track")}            for agent create: enable tracking non-interactively (off without a TTY)`);
-  out.push(`  ${import_picocolors40.default.dim("--shell <sh|fish>")}  for agent env: pick output format (auto-detected from $SHELL)`);
-  out.push(`  ${import_picocolors40.default.dim("--all")}              for template list: include installs from other folders`);
-  out.push(`  ${import_picocolors40.default.dim("--web <url>")}        for login: web app URL (default https://new.usekafka.com)`);
+  out.push(`  ${import_picocolors41.default.dim("--harness <id>")}     force harness for onboard / sync (e.g. claude-code)`);
+  out.push(`  ${import_picocolors41.default.dim("--scope <s>")}        force scope: global | project`);
+  out.push(`  ${import_picocolors41.default.dim("--yes, -y")}          skip confirmations / auto-overwrite`);
+  out.push(`  ${import_picocolors41.default.dim("--agent <id>")}       for link: attach this folder to an existing agent non-interactively`);
+  out.push(`  ${import_picocolors41.default.dim("--no-tracking")}      for link: skip routing LLM traffic through brainbase`);
+  out.push(`  ${import_picocolors41.default.dim("--track")}            for agent create: enable tracking non-interactively (off without a TTY)`);
+  out.push(`  ${import_picocolors41.default.dim("--shell <sh|fish>")}  for agent env: pick output format (auto-detected from $SHELL)`);
+  out.push(`  ${import_picocolors41.default.dim("--all")}              for template list: include installs from other folders`);
+  out.push(`  ${import_picocolors41.default.dim("--web <url>")}        for login: web app URL (default https://new.usekafka.com)`);
   out.push("");
   out.push(divider("ENV"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.dim("BRAINBASE_HOME")}         override the local config dir (default ~/.brainbase)`);
-  out.push(`  ${import_picocolors40.default.dim("BRAINBASE_WEB_URL")}      override the web app URL used by login`);
-  out.push(`  ${import_picocolors40.default.dim("BRAINBASE_API_URL")}      override the API URL used by link / sync`);
-  out.push(`  ${import_picocolors40.default.dim("BRAINBASE_REGISTRY_URL")} override the registry API URL`);
-  out.push(`  ${import_picocolors40.default.dim("BRAINBASE_TOKEN")}        long-lived CLI PAT (overrides token.json)`);
-  out.push(`  ${import_picocolors40.default.dim("BRAINBASE_SKIP_AUTH")}    bypass the auth gate for development`);
-  out.push(`  ${import_picocolors40.default.dim("BRAINBASE_NON_INTERACTIVE")} force non-interactive mode — skip/auto-default prompts (CI & agents)`);
+  out.push(`  ${import_picocolors41.default.dim("BRAINBASE_HOME")}         override the local config dir (default ~/.brainbase)`);
+  out.push(`  ${import_picocolors41.default.dim("BRAINBASE_WEB_URL")}      override the web app URL used by login`);
+  out.push(`  ${import_picocolors41.default.dim("BRAINBASE_API_URL")}      override the API URL used by link / sync`);
+  out.push(`  ${import_picocolors41.default.dim("BRAINBASE_REGISTRY_URL")} override the registry API URL`);
+  out.push(`  ${import_picocolors41.default.dim("BRAINBASE_TOKEN")}        long-lived CLI PAT (overrides token.json)`);
+  out.push(`  ${import_picocolors41.default.dim("BRAINBASE_SKIP_AUTH")}    bypass the auth gate for development`);
+  out.push(`  ${import_picocolors41.default.dim("BRAINBASE_NON_INTERACTIVE")} force non-interactive mode — skip/auto-default prompts (CI & agents)`);
   out.push("");
   out.push(divider("HARNESSES"));
   out.push("");
-  out.push(`  ${import_picocolors40.default.dim("•")} ${import_picocolors40.default.bold("claude-code")}  ${import_picocolors40.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors40.default.dim("•")} ${import_picocolors40.default.bold("codex")}        ${import_picocolors40.default.dim("skills, mcps, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors40.default.dim("•")} ${import_picocolors40.default.bold("kafka")}        ${import_picocolors40.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
+  out.push(`  ${import_picocolors41.default.dim("•")} ${import_picocolors41.default.bold("claude-code")}  ${import_picocolors41.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
+  out.push(`  ${import_picocolors41.default.dim("•")} ${import_picocolors41.default.bold("codex")}        ${import_picocolors41.default.dim("skills, mcps, commands, playbooks, instructions, files")}`);
+  out.push(`  ${import_picocolors41.default.dim("•")} ${import_picocolors41.default.bold("kafka")}        ${import_picocolors41.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
   out.push("");
   console.log(out.join(`
 `));
@@ -56372,6 +56764,16 @@ function getFlag(args, ...names) {
   }
   return;
 }
+function getFlagAll(args, ...names) {
+  const out = [];
+  let v3 = getFlag(args, ...names);
+  while (v3 !== undefined) {
+    if (v3)
+      out.push(v3);
+    v3 = getFlag(args, ...names);
+  }
+  return out;
+}
 function hasFlag2(args, ...names) {
   for (const n of names) {
     const i = args.indexOf(n);
@@ -56400,13 +56802,13 @@ async function requireAuth(cmd) {
   if (status.ok)
     return;
   console.error("");
-  console.error(`  ${brandTint("◆")}  ${import_picocolors40.default.bold("brainbase")}`);
+  console.error(`  ${brandTint("◆")}  ${import_picocolors41.default.bold("brainbase")}`);
   console.error("");
-  console.error(`  ${import_picocolors40.default.red("✗")}  You need to sign in to use ${import_picocolors40.default.bold("brainbase " + cmd)}.`);
+  console.error(`  ${import_picocolors41.default.red("✗")}  You need to sign in to use ${import_picocolors41.default.bold("brainbase " + cmd)}.`);
   if (status.reason)
-    console.error(`     ${import_picocolors40.default.dim(status.reason)}`);
+    console.error(`     ${import_picocolors41.default.dim(status.reason)}`);
   console.error("");
-  console.error(`     Run ${import_picocolors40.default.cyan("brainbase login")} to connect this device.`);
+  console.error(`     Run ${import_picocolors41.default.cyan("brainbase login")} to connect this device.`);
   console.error("");
   process14.exit(1);
 }
@@ -56416,7 +56818,7 @@ async function main() {
   const rawCwd = process14.cwd();
   const cwd2 = (() => {
     try {
-      return fs51.realpathSync(rawCwd);
+      return fs52.realpathSync(rawCwd);
     } catch {
       return rawCwd;
     }
@@ -56451,6 +56853,11 @@ async function main() {
   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");
   ensureSkillResolversRegistered();
   await requireAuth(cmd);
   try {
@@ -56543,7 +56950,13 @@ async function main() {
           harness,
           orgId: orgIdFlag,
           teamId: teamIdFlag,
-          graphOnly: graphOnlyFlag
+          graphOnly: graphOnlyFlag,
+          name: nameFlag,
+          from: fromFlags,
+          to: toFlags,
+          description: descriptionFlag,
+          schema: schemaFlag,
+          noPush: noPushFlag
         });
         break;
       }
@@ -56562,7 +56975,7 @@ async function main() {
         process14.exit(1);
     }
   } catch (err) {
-    console.error(import_picocolors40.default.red(`
+    console.error(import_picocolors41.default.red(`
 ${err.message}`));
     if (process14.env.BRAINBASE_DEBUG)
       console.error(err.stack);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brainbase-labs/cli",
-  "version": "0.8.3",
+  "version": "0.10.0",
   "description": "Pack, share, and install agent templates across harnesses (Claude Code, Codex, ...).",
   "type": "module",
   "bin": {