@brainbase-labs/cli 0.9.0 → 0.10.0

package/dist/index.js

@@ -29449,7 +29449,7 @@ function padStart(s, n) {
 // package.json
 var package_default = {
   name: "@brainbase-labs/cli",
-  version: "0.9.0",
+  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;
@@ -54813,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,
@@ -54829,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,
@@ -54952,6 +55112,7 @@ function buildManifestFromCloud(cloud, agent) {
       entry.is_enabled = payload.is_enabled;
     return entry;
   });
+  const caps = capabilitiesFromAgent(agent);
   return {
     schema: 1,
     agent: {
@@ -54961,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) {

package/package.json

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