@brainbase-labs/cli 0.4.2 → 0.6.0

package/dist/index.js

@@ -28564,9 +28564,9 @@ var require_jsx_dev_runtime = __commonJS((exports, module) => {
 });
 
 // src/index.ts
-var import_picocolors38 = __toESM(require_picocolors(), 1);
+var import_picocolors40 = __toESM(require_picocolors(), 1);
 import process13 from "node:process";
-import fs50 from "node:fs";
+import fs51 from "node:fs";
 
 // src/cli/template.ts
 var import_picocolors12 = __toESM(require_picocolors(), 1);
@@ -50759,11 +50759,192 @@ async function runWhoami() {
 var import_picocolors22 = __toESM(require_picocolors(), 1);
 
 // src/core/link.ts
+import path43 from "node:path";
+import fs40 from "node:fs";
+
+// src/core/agent-manifest.ts
 import path42 from "node:path";
 import fs39 from "node:fs";
+var import_yaml2 = __toESM(require_dist(), 1);
+var AGENT_MANIFEST_FILE = "brainbase.agent.yaml";
+var LEGACY_AGENT_MANIFEST_FILE = "brainbase.yaml";
+var DEFAULT_INSTRUCTIONS_FILE = ".brainbase/instructions.md";
+var DEFAULT_ENTRYPOINT_FILE = ".brainbase/entrypoint.sh";
+var DEFAULT_PLAYBOOKS_DIR = ".brainbase/playbooks";
+var REGISTRY_SOURCE_RE = /^registry:(?:([a-z0-9_-]+)\/)?([a-z0-9_-]+)(?:@(.+))?$/i;
+function parseSkillSource2(raw) {
+  if (!raw || typeof raw !== "string") {
+    throw new Error("Skill source must be a non-empty string");
+  }
+  const m3 = raw.match(REGISTRY_SOURCE_RE);
+  if (m3) {
+    return {
+      kind: "registry",
+      ...m3[1] ? { creator: m3[1] } : {},
+      slug: m3[2],
+      version: m3[3]
+    };
+  }
+  if (raw.startsWith("./") || raw.startsWith("../") || raw.startsWith("/")) {
+    return { kind: "local", path: raw };
+  }
+  throw new Error(`Unrecognized skill source "${raw}". Expected "registry:creator/slug[@version]", "registry:slug", or a relative path starting with "./".`);
+}
+var AgentMetaSchema = exports_external.object({
+  name: exports_external.string().min(1),
+  tagline: exports_external.string().optional()
+});
+var InstructionsSchema = exports_external.object({
+  file: exports_external.string().min(1).optional(),
+  text: exports_external.string().optional()
+}).refine((v3) => v3.file !== undefined || v3.text !== undefined, {
+  message: "instructions must set either `file` or `text`"
+});
+var EntrypointSchema = exports_external.object({
+  file: exports_external.string().min(1).optional(),
+  commands: exports_external.array(exports_external.string().min(1)).optional(),
+  text: exports_external.string().optional()
+}).refine((v3) => {
+  const set = [v3.file, v3.commands, v3.text].filter((x3) => x3 !== undefined);
+  return set.length === 1;
+}, {
+  message: "entrypoint must set exactly one of `file`, `commands`, or `text`"
+});
+var PlaybookContentSchema = exports_external.object({
+  file: exports_external.string().min(1).optional(),
+  text: exports_external.string().optional()
+}).refine((v3) => v3.file !== undefined || v3.text !== undefined, {
+  message: "playbook content must set either `file` or `text`"
+});
+var PlaybookSchema = exports_external.object({
+  title: exports_external.string().min(1),
+  description: exports_external.string().optional(),
+  content: PlaybookContentSchema
+});
+var SkillEntrySchema = exports_external.object({
+  source: exports_external.string().min(1)
+});
+var McpEntrySchema = exports_external.object({
+  name: exports_external.string().min(1),
+  url: exports_external.string().optional(),
+  command: exports_external.string().optional(),
+  args: exports_external.array(exports_external.string()).optional(),
+  env: exports_external.record(exports_external.string()).optional(),
+  headers: exports_external.record(exports_external.string()).optional(),
+  is_enabled: exports_external.boolean().optional()
+});
+var AgentManifestSchema = exports_external.object({
+  schema: exports_external.literal(1),
+  id: exports_external.string().min(1).optional(),
+  harness: exports_external.string().min(1).optional(),
+  agent: AgentMetaSchema,
+  instructions: InstructionsSchema.optional(),
+  entrypoint: EntrypointSchema.optional(),
+  playbooks: exports_external.array(PlaybookSchema).default([]),
+  skills: exports_external.array(SkillEntrySchema).default([]),
+  mcp: exports_external.array(McpEntrySchema).default([]),
+  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()
+});
+function manifestPath(cwd2) {
+  return path42.join(cwd2, AGENT_MANIFEST_FILE);
+}
+function existingManifestPath(cwd2) {
+  const newPath = path42.join(cwd2, AGENT_MANIFEST_FILE);
+  if (fs39.existsSync(newPath))
+    return newPath;
+  const legacy = path42.join(cwd2, LEGACY_AGENT_MANIFEST_FILE);
+  if (fs39.existsSync(legacy))
+    return legacy;
+  return null;
+}
+function hasManifest(cwd2) {
+  return existingManifestPath(cwd2) !== null;
+}
+function readManifest(cwd2) {
+  const p2 = existingManifestPath(cwd2);
+  if (!p2)
+    return null;
+  const raw = fs39.readFileSync(p2, "utf8");
+  let parsed;
+  try {
+    parsed = import_yaml2.default.parse(raw);
+  } catch (err) {
+    throw new Error(`${path42.basename(p2)} is not valid YAML: ${err.message}`);
+  }
+  const result = AgentManifestSchema.safeParse(parsed);
+  if (!result.success) {
+    throw new Error(`${path42.basename(p2)} is invalid: ${result.error.issues.map((i) => `${i.path.join(".") || "(root)"} — ${i.message}`).join("; ")}`);
+  }
+  return result.data;
+}
+function writeManifest(cwd2, manifest) {
+  const doc = new import_yaml2.default.Document;
+  doc.contents = manifest;
+  doc.commentBefore = ` brainbase.agent.yaml — declarative agent manifest.
+` + " Committed to source control. Edit by hand, then `brainbase agent push`.";
+  const out = String(doc);
+  fs39.writeFileSync(manifestPath(cwd2), out, "utf8");
+}
+function resolveInstructionsPath(cwd2, manifest) {
+  if (!manifest.instructions?.file)
+    return null;
+  return path42.resolve(cwd2, manifest.instructions.file);
+}
+function readInstructions(cwd2, manifest) {
+  if (!manifest.instructions)
+    return null;
+  if (typeof manifest.instructions.text === "string") {
+    return manifest.instructions.text;
+  }
+  const p2 = resolveInstructionsPath(cwd2, manifest);
+  if (!p2 || !fs39.existsSync(p2))
+    return null;
+  return fs39.readFileSync(p2, "utf8");
+}
+function resolveEntrypoint(cwd2, manifest) {
+  const ep = manifest.entrypoint;
+  if (!ep)
+    return null;
+  if (typeof ep.text === "string")
+    return ep.text;
+  if (Array.isArray(ep.commands)) {
+    if (ep.commands.length === 0)
+      return null;
+    return ["set -euo pipefail", ...ep.commands].join(`
+`) + `
+`;
+  }
+  if (typeof ep.file === "string") {
+    const p2 = path42.resolve(cwd2, ep.file);
+    if (!fs39.existsSync(p2))
+      return null;
+    return fs39.readFileSync(p2, "utf8");
+  }
+  return null;
+}
+function resolvePlaybookContent(cwd2, entry) {
+  const c2 = entry.content;
+  if (typeof c2.text === "string")
+    return c2.text;
+  if (typeof c2.file === "string") {
+    const p2 = path42.resolve(cwd2, c2.file);
+    if (!fs39.existsSync(p2))
+      return null;
+    return fs39.readFileSync(p2, "utf8");
+  }
+  return null;
+}
+function slugifyPlaybookTitle(title) {
+  return title.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60) || "playbook";
+}
+
+// src/core/link.ts
 var LINK_DIR = ".brainbase";
-var LINK_FILE = "link.json";
+var STATE_FILE = "state.json";
 var SYNC_STATE_FILE = "sync-state.json";
+var LEGACY_LINK_FILE = "link.json";
 var TrackingSchema = exports_external.object({
   harness: exports_external.string(),
   key_id: exports_external.string(),
@@ -50786,6 +50967,16 @@ var LinkSchema = exports_external.object({
   harness: exports_external.string().nullish().transform((v3) => v3 ?? undefined),
   tracking: TrackingSchema.nullish().transform((v3) => v3 ?? undefined)
 });
+var LinkStateSchema = exports_external.object({
+  schemaVersion: exports_external.literal(1),
+  org_id: exports_external.string().default(""),
+  team_id: exports_external.string().default(""),
+  slug: exports_external.string().default(""),
+  url: exports_external.string().nullish().transform((v3) => v3 ?? undefined),
+  linked_at: exports_external.string(),
+  linked_by: exports_external.string().nullish().transform((v3) => v3 ?? undefined),
+  tracking: TrackingSchema.nullish().transform((v3) => v3 ?? undefined)
+});
 var SyncedComponentSchema = exports_external.object({
   type: exports_external.string(),
   slug: exports_external.string(),
@@ -50795,7 +50986,8 @@ var SyncedComponentSchema = exports_external.object({
 });
 var AgentMetaSnapshotSchema = exports_external.object({
   name: exports_external.string(),
-  tagline: exports_external.string().optional()
+  tagline: exports_external.string().optional(),
+  entrypoint: exports_external.string().optional()
 });
 var SyncStateSchema = exports_external.object({
   schemaVersion: exports_external.literal(1),
@@ -50805,39 +50997,159 @@ var SyncStateSchema = exports_external.object({
   components: exports_external.array(SyncedComponentSchema),
   agentMeta: AgentMetaSnapshotSchema.optional()
 });
-function linkPath(cwd2) {
-  return path42.join(cwd2, LINK_DIR, LINK_FILE);
+function statePath(cwd2) {
+  return path43.join(cwd2, LINK_DIR, STATE_FILE);
 }
 function syncStatePath(cwd2) {
-  return path42.join(cwd2, LINK_DIR, SYNC_STATE_FILE);
+  return path43.join(cwd2, LINK_DIR, SYNC_STATE_FILE);
+}
+function legacyLinkPath(cwd2) {
+  return path43.join(cwd2, LINK_DIR, LEGACY_LINK_FILE);
+}
+function readState(cwd2) {
+  const p2 = statePath(cwd2);
+  if (exists(p2)) {
+    try {
+      return LinkStateSchema.parse(readJson(p2));
+    } catch {
+      return null;
+    }
+  }
+  const legacy = legacyLinkPath(cwd2);
+  if (exists(legacy)) {
+    try {
+      const raw = readJson(legacy);
+      const lifted = {
+        schemaVersion: 1,
+        org_id: String(raw.org_id ?? ""),
+        team_id: String(raw.team_id ?? ""),
+        slug: String(raw.slug ?? ""),
+        url: typeof raw.url === "string" ? raw.url : undefined,
+        linked_at: typeof raw.linked_at === "string" ? raw.linked_at : new Date().toISOString(),
+        linked_by: typeof raw.linked_by === "string" ? raw.linked_by : undefined,
+        tracking: (() => {
+          try {
+            return TrackingSchema.parse(raw.tracking);
+          } catch {
+            return;
+          }
+        })()
+      };
+      try {
+        ensureDir(path43.join(cwd2, LINK_DIR));
+        writeJson(statePath(cwd2), lifted);
+        ensureGitignore(cwd2);
+      } catch {}
+      return lifted;
+    } catch {
+      return null;
+    }
+  }
+  return null;
+}
+function writeState(cwd2, state) {
+  ensureDir(path43.join(cwd2, LINK_DIR));
+  writeJson(statePath(cwd2), state);
+  ensureGitignore(cwd2);
 }
 function readLink(cwd2) {
-  const p2 = linkPath(cwd2);
-  if (!exists(p2))
-    return null;
+  let manifest = null;
   try {
-    return LinkSchema.parse(readJson(p2));
+    manifest = hasManifest(cwd2) ? readManifest(cwd2) : null;
   } catch {
-    return null;
+    manifest = null;
+  }
+  const state = readState(cwd2);
+  if (manifest?.id) {
+    return {
+      schemaVersion: 1,
+      agent_id: manifest.id,
+      org_id: state?.org_id ?? "",
+      team_id: state?.team_id ?? "",
+      slug: state?.slug ?? "",
+      name: manifest.agent.name,
+      tagline: manifest.agent.tagline,
+      url: state?.url,
+      linked_at: state?.linked_at ?? new Date().toISOString(),
+      linked_by: state?.linked_by,
+      harness: manifest.harness,
+      tracking: state?.tracking
+    };
+  }
+  const legacy = legacyLinkPath(cwd2);
+  if (exists(legacy)) {
+    try {
+      return LinkSchema.parse(readJson(legacy));
+    } catch {
+      return null;
+    }
   }
+  return null;
 }
 function writeLink(cwd2, link2) {
-  ensureDir(path42.join(cwd2, LINK_DIR));
-  const clean = {};
-  for (const [k3, v3] of Object.entries(link2)) {
-    if (v3 !== null && v3 !== undefined)
-      clean[k3] = v3;
+  let manifest;
+  try {
+    manifest = readManifest(cwd2) ?? {
+      schema: 1,
+      agent: { name: link2.name },
+      playbooks: [],
+      skills: [],
+      mcp: []
+    };
+  } catch {
+    manifest = {
+      schema: 1,
+      agent: { name: link2.name },
+      playbooks: [],
+      skills: [],
+      mcp: []
+    };
+  }
+  manifest.id = link2.agent_id;
+  if (link2.harness)
+    manifest.harness = link2.harness;
+  manifest.agent.name = link2.name;
+  if (link2.tagline)
+    manifest.agent.tagline = link2.tagline;
+  else
+    delete manifest.agent.tagline;
+  writeManifest(cwd2, manifest);
+  const state = {
+    schemaVersion: 1,
+    org_id: link2.org_id,
+    team_id: link2.team_id,
+    slug: link2.slug,
+    url: link2.url,
+    linked_at: link2.linked_at,
+    linked_by: link2.linked_by,
+    tracking: link2.tracking
+  };
+  writeState(cwd2, state);
+  const legacy = legacyLinkPath(cwd2);
+  if (exists(legacy)) {
+    try {
+      fs40.rmSync(legacy);
+    } catch {}
   }
-  writeJson(linkPath(cwd2), clean);
-  ensureGitignore(cwd2);
 }
 function clearLink(cwd2) {
-  const p2 = linkPath(cwd2);
+  try {
+    const m3 = hasManifest(cwd2) ? readManifest(cwd2) : null;
+    if (m3) {
+      delete m3.id;
+      delete m3.harness;
+      writeManifest(cwd2, m3);
+    }
+  } catch {}
+  const p2 = statePath(cwd2);
   if (exists(p2))
-    fs39.rmSync(p2);
+    fs40.rmSync(p2);
   const sp = syncStatePath(cwd2);
   if (exists(sp))
-    fs39.rmSync(sp);
+    fs40.rmSync(sp);
+  const legacy = legacyLinkPath(cwd2);
+  if (exists(legacy))
+    fs40.rmSync(legacy);
 }
 function readSyncState(cwd2) {
   const p2 = syncStatePath(cwd2);
@@ -50850,22 +51162,22 @@ function readSyncState(cwd2) {
   }
 }
 function writeSyncState(cwd2, state) {
-  ensureDir(path42.join(cwd2, LINK_DIR));
+  ensureDir(path43.join(cwd2, LINK_DIR));
   writeJson(syncStatePath(cwd2), state);
   ensureGitignore(cwd2);
 }
 function ensureGitignore(cwd2) {
-  const ignorePath = path42.join(cwd2, LINK_DIR, ".gitignore");
-  const desired = `${SYNC_STATE_FILE}
-`;
+  const ignorePath = path43.join(cwd2, LINK_DIR, ".gitignore");
+  const desired = ["*", `!.gitignore`, ""].join(`
+`);
   try {
     if (!exists(ignorePath)) {
-      fs39.writeFileSync(ignorePath, desired);
+      fs40.writeFileSync(ignorePath, desired);
       return;
     }
-    const current = fs39.readFileSync(ignorePath, "utf8");
-    if (!current.split(/\r?\n/).some((l2) => l2.trim() === SYNC_STATE_FILE)) {
-      fs39.writeFileSync(ignorePath, current.endsWith(`
+    const current = fs40.readFileSync(ignorePath, "utf8");
+    if (!current.split(/\r?\n/).some((l2) => l2.trim() === "*")) {
+      fs40.writeFileSync(ignorePath, current.endsWith(`
 `) ? current + desired : current + `
 ` + desired);
     }
@@ -50873,15 +51185,15 @@ function ensureGitignore(cwd2) {
 }
 
 // src/core/route-adapters.ts
-import path43 from "node:path";
+import path44 from "node:path";
 import os10 from "node:os";
-import fs40 from "node:fs";
+import fs41 from "node:fs";
 var CLAUDE_ENV_KEYS = ["ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN"];
 function claudeSettingsPath(cwd2) {
-  return path43.join(cwd2, ".claude", "settings.json");
+  return path44.join(cwd2, ".claude", "settings.json");
 }
 function claudeUserConfigPath() {
-  return path43.join(os10.homedir(), ".claude.json");
+  return path44.join(os10.homedir(), ".claude.json");
 }
 function ensureClaudeOnboarded() {
   const file = claudeUserConfigPath();
@@ -50905,7 +51217,7 @@ var claudeRouteAdapter = {
     settings.env = { ...settings.env ?? {} };
     settings.env.ANTHROPIC_BASE_URL = target.apiBase;
     settings.env.ANTHROPIC_AUTH_TOKEN = target.apiKey;
-    ensureDir(path43.dirname(file));
+    ensureDir(path44.dirname(file));
     writeJson(file, settings);
     const notes = [];
     if (ensureClaudeOnboarded()) {
@@ -50932,11 +51244,11 @@ var claudeRouteAdapter = {
         delete settings.env;
     }
     if (snap && !snap.fileExisted && Object.keys(settings).length === 0) {
-      fs40.rmSync(file);
-      const dir = path43.dirname(file);
+      fs41.rmSync(file);
+      const dir = path44.dirname(file);
       try {
-        if (fs40.readdirSync(dir).length === 0)
-          fs40.rmdirSync(dir);
+        if (fs41.readdirSync(dir).length === 0)
+          fs41.rmdirSync(dir);
       } catch {}
       return;
     }
@@ -50946,20 +51258,20 @@ var claudeRouteAdapter = {
 var CODEX_PROVIDER_KEY = "brainbase";
 var CODEX_AUTH_HEADER = "Authorization";
 function codexConfigPath(cwd2) {
-  return path43.join(cwd2, ".codex", "config.toml");
+  return path44.join(cwd2, ".codex", "config.toml");
 }
 function readCodexConfig2(file) {
   if (!exists(file))
     return {};
   try {
-    return parse(fs40.readFileSync(file, "utf8"));
+    return parse(fs41.readFileSync(file, "utf8"));
   } catch {
     return {};
   }
 }
 function writeCodexConfig2(file, value) {
-  ensureDir(path43.dirname(file));
-  fs40.writeFileSync(file, stringify(value) + `
+  ensureDir(path44.dirname(file));
+  fs41.writeFileSync(file, stringify(value) + `
 `);
 }
 function ensureV1(base2) {
@@ -51015,11 +51327,11 @@ var codexRouteAdapter = {
       }
     }
     if (snap && !snap.fileExisted && Object.keys(cfg).length === 0) {
-      fs40.rmSync(file);
-      const dir = path43.dirname(file);
+      fs41.rmSync(file);
+      const dir = path44.dirname(file);
       try {
-        if (fs40.readdirSync(dir).length === 0)
-          fs40.rmdirSync(dir);
+        if (fs41.readdirSync(dir).length === 0)
+          fs41.rmdirSync(dir);
       } catch {}
       return;
     }
@@ -51309,8 +51621,8 @@ async function runUnlink(cwd2, args) {
 }
 
 // src/cli/sync.ts
-import path44 from "node:path";
-import fs41 from "node:fs";
+import path45 from "node:path";
+import fs42 from "node:fs";
 import os11 from "node:os";
 import crypto3 from "node:crypto";
 var import_picocolors24 = __toESM(require_picocolors(), 1);
@@ -51504,7 +51816,7 @@ async function runSync(cwd2, args) {
       type: c2.type,
       slug: c2.slug,
       scope,
-      rootDir: path44.join(stageRoot, c2.type, c2.slug),
+      rootDir: path45.join(stageRoot, c2.type, c2.slug),
       description: c2.description,
       meta: c2.meta,
       payload: c2.meta?.mcp,
@@ -51553,11 +51865,11 @@ async function runSync(cwd2, args) {
           if (!exists(filePath))
             continue;
           try {
-            const stat = fs41.statSync(filePath);
+            const stat = fs42.statSync(filePath);
             if (stat.isDirectory())
-              fs41.rmSync(filePath, { recursive: true, force: true });
+              fs42.rmSync(filePath, { recursive: true, force: true });
             else
-              fs41.rmSync(filePath);
+              fs42.rmSync(filePath);
           } catch (err) {
             f2.warn(`Failed to remove ${filePath}: ${err.message}`);
           }
@@ -51595,7 +51907,7 @@ async function runSync(cwd2, args) {
     $e(`Synced ${link2.name} to revision ${manifest.revision}.`);
   } finally {
     try {
-      fs41.rmSync(stageRoot, { recursive: true, force: true });
+      fs42.rmSync(stageRoot, { recursive: true, force: true });
     } catch {}
   }
 }
@@ -51643,14 +51955,14 @@ function computeLocalHash(paths) {
     if (!exists(filePath))
       return null;
     try {
-      const stat = fs41.statSync(filePath);
+      const stat = fs42.statSync(filePath);
       if (stat.isFile()) {
         h2.update("F " + filePath + " ");
-        h2.update(fs41.readFileSync(filePath));
+        h2.update(fs42.readFileSync(filePath));
         h2.update(`
 `);
       } else if (stat.isDirectory()) {
-        for (const name of fs41.readdirSync(filePath).sort()) {
+        for (const name of fs42.readdirSync(filePath).sort()) {
           h2.update("E " + name + `
 `);
         }
@@ -51662,14 +51974,14 @@ function computeLocalHash(paths) {
   return h2.digest("hex");
 }
 function stageManifest(components) {
-  const root = fs41.mkdtempSync(path44.join(os11.tmpdir(), "brainbase-sync-"));
+  const root = fs42.mkdtempSync(path45.join(os11.tmpdir(), "brainbase-sync-"));
   for (const c2 of components) {
-    const compDir = path44.join(root, c2.type, c2.slug);
+    const compDir = path45.join(root, c2.type, c2.slug);
     ensureDir(compDir);
     for (const f4 of c2.files) {
-      const target = path44.join(compDir, f4.path);
-      ensureDir(path44.dirname(target));
-      fs41.writeFileSync(target, f4.content);
+      const target = path45.join(compDir, f4.path);
+      ensureDir(path45.dirname(target));
+      fs42.writeFileSync(target, f4.content);
     }
   }
   return root;
@@ -51683,142 +51995,47 @@ function runHarnessInstall(harnessId, components, opts, agentName) {
 }
 
 // src/cli/agent.ts
-var import_picocolors30 = __toESM(require_picocolors(), 1);
+var import_picocolors32 = __toESM(require_picocolors(), 1);
 
 // src/cli/agent-pull.ts
+import { spawn as spawn2 } from "node:child_process";
 import path48 from "node:path";
 import fs45 from "node:fs";
 import os12 from "node:os";
 var import_picocolors25 = __toESM(require_picocolors(), 1);
+var import_yaml3 = __toESM(require_dist(), 1);
 
-// src/core/agent-manifest.ts
-import path45 from "node:path";
-import fs42 from "node:fs";
-var import_yaml2 = __toESM(require_dist(), 1);
-var AGENT_MANIFEST_FILE = "brainbase.yaml";
-var DEFAULT_INSTRUCTIONS_FILE = "instructions.md";
-var REGISTRY_SOURCE_RE = /^registry:(?:([a-z0-9_-]+)\/)?([a-z0-9_-]+)(?:@(.+))?$/i;
-function parseSkillSource2(raw) {
-  if (!raw || typeof raw !== "string") {
-    throw new Error("Skill source must be a non-empty string");
+// src/core/agent-diff.ts
+import path46 from "node:path";
+import fs43 from "node:fs";
+import crypto4 from "node:crypto";
+function compKey(type, slug) {
+  return `${type}/${slug}`;
+}
+function hashString(s3) {
+  return crypto4.createHash("sha256").update(s3).digest("hex");
+}
+function canonicalJson(value) {
+  if (value === null)
+    return "null";
+  if (typeof value === "boolean")
+    return value ? "true" : "false";
+  if (typeof value === "number") {
+    if (!Number.isFinite(value))
+      throw new Error("Non-finite numbers are not JSON");
+    return String(value);
   }
-  const m3 = raw.match(REGISTRY_SOURCE_RE);
-  if (m3) {
-    return {
-      kind: "registry",
-      ...m3[1] ? { creator: m3[1] } : {},
-      slug: m3[2],
-      version: m3[3]
-    };
+  if (typeof value === "string")
+    return JSON.stringify(value);
+  if (Array.isArray(value)) {
+    return "[" + value.map(canonicalJson).join(",") + "]";
   }
-  if (raw.startsWith("./") || raw.startsWith("../") || raw.startsWith("/")) {
-    return { kind: "local", path: raw };
+  if (typeof value === "object") {
+    const obj = value;
+    const keys = Object.keys(obj).sort();
+    return "{" + keys.map((k3) => `${JSON.stringify(k3)}:${canonicalJson(obj[k3])}`).join(",") + "}";
   }
-  throw new Error(`Unrecognized skill source "${raw}". Expected "registry:creator/slug[@version]", "registry:slug", or a relative path starting with "./".`);
-}
-var AgentMetaSchema = exports_external.object({
-  name: exports_external.string().min(1),
-  tagline: exports_external.string().optional()
-});
-var InstructionsSchema = exports_external.object({
-  file: exports_external.string().min(1)
-});
-var SkillEntrySchema = exports_external.object({
-  source: exports_external.string().min(1)
-});
-var McpEntrySchema = exports_external.object({
-  name: exports_external.string().min(1),
-  url: exports_external.string().optional(),
-  command: exports_external.string().optional(),
-  args: exports_external.array(exports_external.string()).optional(),
-  env: exports_external.record(exports_external.string()).optional(),
-  headers: exports_external.record(exports_external.string()).optional(),
-  is_enabled: exports_external.boolean().optional()
-});
-var AgentManifestSchema = exports_external.object({
-  schema: exports_external.literal(1),
-  agent: AgentMetaSchema,
-  instructions: InstructionsSchema.optional(),
-  skills: exports_external.array(SkillEntrySchema).default([]),
-  mcp: exports_external.array(McpEntrySchema).default([]),
-  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()
-});
-function manifestPath(cwd2) {
-  return path45.join(cwd2, AGENT_MANIFEST_FILE);
-}
-function hasManifest(cwd2) {
-  return fs42.existsSync(manifestPath(cwd2));
-}
-function readManifest(cwd2) {
-  const p2 = manifestPath(cwd2);
-  if (!fs42.existsSync(p2))
-    return null;
-  const raw = fs42.readFileSync(p2, "utf8");
-  let parsed;
-  try {
-    parsed = import_yaml2.default.parse(raw);
-  } catch (err) {
-    throw new Error(`${AGENT_MANIFEST_FILE} is not valid YAML: ${err.message}`);
-  }
-  const result = AgentManifestSchema.safeParse(parsed);
-  if (!result.success) {
-    throw new Error(`${AGENT_MANIFEST_FILE} is invalid: ${result.error.issues.map((i) => `${i.path.join(".") || "(root)"} — ${i.message}`).join("; ")}`);
-  }
-  return result.data;
-}
-function writeManifest(cwd2, manifest) {
-  const doc = new import_yaml2.default.Document;
-  doc.contents = manifest;
-  doc.commentBefore = ` brainbase.yaml — declarative agent manifest.
-` + " Committed to source control. Edit by hand, then `brainbase agent push`.";
-  const out = String(doc);
-  fs42.writeFileSync(manifestPath(cwd2), out, "utf8");
-}
-function resolveInstructionsPath(cwd2, manifest) {
-  if (!manifest.instructions)
-    return null;
-  return path45.resolve(cwd2, manifest.instructions.file);
-}
-function readInstructions(cwd2, manifest) {
-  const p2 = resolveInstructionsPath(cwd2, manifest);
-  if (!p2 || !fs42.existsSync(p2))
-    return null;
-  return fs42.readFileSync(p2, "utf8");
-}
-
-// src/core/agent-diff.ts
-import path46 from "node:path";
-import fs43 from "node:fs";
-import crypto4 from "node:crypto";
-function compKey(type, slug) {
-  return `${type}/${slug}`;
-}
-function hashString(s3) {
-  return crypto4.createHash("sha256").update(s3).digest("hex");
-}
-function canonicalJson(value) {
-  if (value === null)
-    return "null";
-  if (typeof value === "boolean")
-    return value ? "true" : "false";
-  if (typeof value === "number") {
-    if (!Number.isFinite(value))
-      throw new Error("Non-finite numbers are not JSON");
-    return String(value);
-  }
-  if (typeof value === "string")
-    return JSON.stringify(value);
-  if (Array.isArray(value)) {
-    return "[" + value.map(canonicalJson).join(",") + "]";
-  }
-  if (typeof value === "object") {
-    const obj = value;
-    const keys = Object.keys(obj).sort();
-    return "{" + keys.map((k3) => `${JSON.stringify(k3)}:${canonicalJson(obj[k3])}`).join(",") + "}";
-  }
-  throw new Error(`Unsupported value in canonicalJson: ${typeof value}`);
+  throw new Error(`Unsupported value in canonicalJson: ${typeof value}`);
 }
 function hashMcpEntry(entry) {
   const payload = {};
@@ -51933,8 +52150,34 @@ function readLocalComponents(cwd2, manifest) {
       hash: hashMcpEntry(entry)
     });
   }
+  for (const entry of manifest.playbooks ?? []) {
+    const body = resolvePlaybookContent(cwd2, entry);
+    if (body === null) {
+      out.push({
+        type: "playbook",
+        slug: slugifyPlaybookTitle(entry.title),
+        hash: null
+      });
+      continue;
+    }
+    const wireBody = /^---\s*\n/.test(body) ? body : `---
+title: ${jsonOrPlain(entry.title)}` + (entry.description ? `
+description: ${jsonOrPlain(entry.description)}` : "") + `
+---
+${body.replace(/^\n+/, "")}`;
+    out.push({
+      type: "playbook",
+      slug: slugifyPlaybookTitle(entry.title),
+      hash: componentHashFromFileHashes([hashString(wireBody)])
+    });
+  }
   return out;
 }
+function jsonOrPlain(s3) {
+  if (!/[\n":#&*!|>'%@`{}[\]]/.test(s3) && s3.trim() === s3 && s3 !== "")
+    return s3;
+  return JSON.stringify(s3);
+}
 function threeWayDiff(input) {
   const lockMap = new Map;
   for (const c2 of input.lock)
@@ -52123,26 +52366,27 @@ function diffSecrets(local, cloud) {
 // src/cli/agent-pull.ts
 async function runAgentPull(cwd2, args) {
   banner("agent pull — bring cloud changes into this folder");
-  const link2 = readLink(cwd2);
-  if (!link2) {
-    f2.warn("This folder is not linked to any agent.");
-    f2.info(`Run ${import_picocolors25.default.cyan("brainbase link")} first.`);
+  const resolution = resolveTargetAgentId(cwd2, args);
+  if (!resolution)
     return;
-  }
+  const { agentId, override } = resolution;
   const sp = de();
-  sp.start(`Fetching ${link2.name}…`);
+  sp.start("Fetching agent…");
+  let cloudAgent;
   let cloud;
   try {
-    cloud = await api.getAgentManifest(link2.agent_id);
+    cloudAgent = await api.getAgent(agentId);
+    cloud = await api.getAgentManifest(agentId);
     sp.stop(`Cloud revision ${cloud.revision}.`);
   } catch (err) {
     sp.stop("Failed.");
     handleApiError2(err);
     return;
   }
-  const lock = readSyncState(cwd2);
-  const localManifest = hasManifest(cwd2) ? readManifest(cwd2) : null;
-  const localComponents = localManifest ? readLocalComponents(cwd2, localManifest) : [];
+  const harness = normalizeHarnessId(cloudAgent.harness ?? "claude-code");
+  const existingManifest = !override && hasManifest(cwd2) ? safeReadManifest(cwd2) : null;
+  const lock = override ? null : readSyncState(cwd2);
+  const localComponents = existingManifest ? readLocalComponents(cwd2, existingManifest) : [];
   const rows = threeWayDiff({
     local: localComponents,
     lock: lock?.components ?? [],
@@ -52167,7 +52411,11 @@ async function runAgentPull(cwd2, args) {
         break;
       case "modified-both":
       case "modified-local":
-        conflicts.push(r2);
+        if (override) {
+          toInstallKeys.add(r2.key);
+        } else {
+          conflicts.push(r2);
+        }
         break;
     }
   }
@@ -52191,11 +52439,12 @@ async function runAgentPull(cwd2, args) {
   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) {
+  if (toInstallKeys.size === 0 && toRemoveKeys.size === 0 && !needOrchestrationMcpInstall && !needMemoryMcpInstall && !override) {
     f2.info(`You're up to date.`);
-    writeSyncState(cwd2, buildLockFromCloud(link2.agent_id, cloud, lock));
-    if (!localManifest) {
-      writeBrainbaseYamlFromCloud(cwd2, link2, cloud);
+    writeLink(cwd2, buildLinkFromAgent(cloudAgent, harness, readLink(cwd2)));
+    writeSyncState(cwd2, buildLockFromCloud(agentId, cloud, lock, cloudAgent));
+    if (!existingManifest) {
+      writeManifest(cwd2, mergeManifest(cwd2, null, cloud, cloudAgent, harness));
       f2.info(`Wrote ${import_picocolors25.default.bold(AGENT_MANIFEST_FILE)}.`);
     }
     return;
@@ -52225,20 +52474,20 @@ async function runAgentPull(cwd2, args) {
     });
   }
   await showResultCard({
-    title: "PULL",
-    tone: "info",
-    subtitle: `updates for ${link2.name}`,
+    title: override ? "PULL (FORCE)" : "PULL",
+    tone: override ? "warn" : "info",
+    subtitle: `updates for ${cloudAgent.name}`,
     rows: resultRows
   });
   if (!args.yes) {
-    const ok = await se({ message: "Apply these changes?", initialValue: true });
+    const msg = override ? "Apply these changes? Local edits to overlapping components will be discarded." : "Apply these changes?";
+    const ok = await se({ message: msg, initialValue: true });
     if (!ensureNotCancelled(ok)) {
       $e("Aborted.");
       return;
     }
   }
-  const adapterId = link2.harness ?? link2.tracking?.harness ?? "claude-code";
-  const adapter = getAdapter(adapterId);
+  const adapter = getAdapter(harness);
   const scope = args.scope ?? "project";
   const installComponents = cloud.components.filter((c2) => toInstallKeys.has(`${c2.type}/${c2.slug}`));
   const stageRoot = stageManifestComponents(installComponents);
@@ -52270,7 +52519,7 @@ async function runAgentPull(cwd2, args) {
         resolveConflict: async (_c) => "overwrite",
         resolveSecret: async () => null
       };
-      const result = await runHarnessInstall2(adapter.id, toInstall, opts, link2.name);
+      const result = await runHarnessInstall2(adapter.id, toInstall, opts, cloudAgent.name);
       installSpinner.stop("Applied.");
       for (const o2 of result.installed) {
         justInstalledPaths.set(`${o2.type}/${o2.slug}`, o2.installedPaths);
@@ -52297,9 +52546,12 @@ async function runAgentPull(cwd2, args) {
         }
       }
     }
-    materializeInstructions(cwd2, cloud, toInstallKeys, keepLocalKeys);
-    const yaml = mergeManifest(cwd2, localManifest, cloud, link2);
+    materializeInstructions(cwd2, cloud, toInstallKeys, keepLocalKeys, existingManifest);
+    materializeEntrypoint(cwd2, cloudAgent.entrypoint ?? "", existingManifest);
+    materializePlaybooks(cwd2, cloud, toInstallKeys, keepLocalKeys, existingManifest);
+    const yaml = mergeManifest(cwd2, existingManifest, cloud, cloudAgent, harness);
     writeManifest(cwd2, yaml);
+    writeLink(cwd2, buildLinkFromAgent(cloudAgent, harness, readLink(cwd2)));
     const lockComponents = buildLockComponents({
       cloud,
       prevLock: lock,
@@ -52309,21 +52561,64 @@ async function runAgentPull(cwd2, args) {
     });
     const newState = {
       schemaVersion: 1,
-      agent_id: link2.agent_id,
+      agent_id: agentId,
       revision: cloud.revision,
       synced_at: new Date().toISOString(),
       components: lockComponents,
-      agentMeta: { name: link2.name, tagline: link2.tagline }
+      agentMeta: {
+        name: cloudAgent.name,
+        tagline: cloudAgent.tagline,
+        ...cloudAgent.entrypoint ? { entrypoint: cloudAgent.entrypoint } : {}
+      }
     };
     writeSyncState(cwd2, newState);
-    await pullSecrets(cwd2, link2.agent_id);
-    $e(`Pulled ${link2.name} at revision ${cloud.revision}.`);
+    await pullSecrets(cwd2, agentId);
+    await runEntrypointIfPresent(cwd2, yaml);
+    $e(`Pulled ${cloudAgent.name} at revision ${cloud.revision}.`);
   } finally {
     try {
       fs45.rmSync(stageRoot, { recursive: true, force: true });
     } catch {}
   }
 }
+function resolveTargetAgentId(cwd2, args) {
+  const arg = args.agentIdArg?.trim() || undefined;
+  let manifest = null;
+  try {
+    manifest = hasManifest(cwd2) ? readManifest(cwd2) : null;
+  } catch (err) {
+    f2.error(err.message);
+    return null;
+  }
+  const manifestId = manifest?.id;
+  if (arg && manifestId && arg !== manifestId) {
+    if (!args.force) {
+      f2.error(`This folder is already linked to a different agent (${import_picocolors25.default.dim(manifestId)}).`);
+      f2.info(`Run ${import_picocolors25.default.cyan(`brainbase agent pull ${arg} --force`)} to override. ` + import_picocolors25.default.yellow("This will overwrite brainbase.agent.yaml and any local progress will be lost."));
+      return null;
+    }
+    return { agentId: arg, override: true };
+  }
+  if (arg)
+    return { agentId: arg, override: false };
+  if (manifestId)
+    return { agentId: manifestId, override: false };
+  if (manifest) {
+    f2.error(`${import_picocolors25.default.bold(AGENT_MANIFEST_FILE)} is unclaimed (no ${import_picocolors25.default.cyan("id")}).`);
+    f2.info(`Run ${import_picocolors25.default.cyan("brainbase agent create")} to create a new agent from this manifest, ` + `or ${import_picocolors25.default.cyan("brainbase agent pull <id>")} to pull an existing one.`);
+  } else {
+    f2.error(`No ${import_picocolors25.default.bold(AGENT_MANIFEST_FILE)} here and no ${import_picocolors25.default.cyan("<id>")} given.`);
+    f2.info(`Run ${import_picocolors25.default.cyan("brainbase agent pull <id>")} to pull an existing agent into this folder.`);
+  }
+  return null;
+}
+function safeReadManifest(cwd2) {
+  try {
+    return readManifest(cwd2);
+  } catch {
+    return null;
+  }
+}
 function skillSourceFromMeta(c2) {
   if (c2.type !== "skill")
     return;
@@ -52358,7 +52653,7 @@ function runHarnessInstall2(harnessId, components, opts, agentName) {
     return installKafkaWithCtx(components, opts, agentName);
   return getAdapter(harnessId).install(components, opts);
 }
-function materializeInstructions(cwd2, cloud, toInstall, keepLocal) {
+function materializeInstructions(cwd2, cloud, toInstall, keepLocal, existingManifest) {
   for (const c2 of cloud.components) {
     if (c2.type !== "instruction")
       continue;
@@ -52370,10 +52665,54 @@ function materializeInstructions(cwd2, cloud, toInstall, keepLocal) {
     const body = c2.files[0]?.content ?? "";
     if (!body.trim())
       continue;
-    fs45.writeFileSync(path48.join(cwd2, DEFAULT_INSTRUCTIONS_FILE), body, "utf8");
+    if (existingManifest?.instructions?.text !== undefined)
+      continue;
+    const targetRel = existingManifest?.instructions?.file ?? DEFAULT_INSTRUCTIONS_FILE;
+    const target = path48.resolve(cwd2, targetRel);
+    ensureDir(path48.dirname(target));
+    fs45.writeFileSync(target, body, "utf8");
+  }
+}
+function materializePlaybooks(cwd2, cloud, toInstall, keepLocal, existingManifest) {
+  for (const c2 of cloud.components) {
+    if (c2.type !== "playbook")
+      continue;
+    const key2 = `${c2.type}/${c2.slug}`;
+    if (keepLocal.has(key2))
+      continue;
+    if (!toInstall.has(key2))
+      continue;
+    const raw = c2.files[0]?.content ?? "";
+    if (!raw.trim())
+      continue;
+    const { body } = stripFrontmatter(raw);
+    const existing = existingManifest?.playbooks?.find((p2) => slugifyForCompare(p2.title) === c2.slug);
+    if (existing?.content?.text !== undefined)
+      continue;
+    const targetRel = existing?.content?.file ?? path48.join(DEFAULT_PLAYBOOKS_DIR, `${c2.slug}.md`);
+    const target = path48.resolve(cwd2, targetRel);
+    ensureDir(path48.dirname(target));
+    fs45.writeFileSync(target, body, "utf8");
+  }
+}
+function slugifyForCompare(s3) {
+  return s3.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 60) || "playbook";
+}
+function stripFrontmatter(raw) {
+  const m3 = /^---\s*\n([\s\S]*?)\n---\s*\n?/.exec(raw);
+  if (!m3)
+    return { frontmatter: {}, body: raw };
+  let fm = {};
+  try {
+    const parsed = import_yaml3.default.parse(m3[1] ?? "");
+    if (parsed && typeof parsed === "object")
+      fm = parsed;
+  } catch {
+    return { frontmatter: {}, body: raw };
   }
+  return { frontmatter: fm, body: raw.slice(m3[0].length) };
 }
-function mergeManifest(cwd2, prev, cloud, link2) {
+function mergeManifest(cwd2, prev, cloud, cloudAgent, harness) {
   const skills = cloud.components.filter((c2) => c2.type === "skill").map((c2) => {
     const localDecl = prev?.skills.find((s3) => {
       try {
@@ -52396,7 +52735,33 @@ function mergeManifest(cwd2, prev, cloud, link2) {
     }
     return { source: `registry:${c2.slug}` };
   });
-  const hasInstructions = cloud.components.some((c2) => c2.type === "instruction" && c2.files[0]?.content?.trim());
+  const cloudInstrComp = cloud.components.find((c2) => c2.type === "instruction" && c2.files[0]?.content?.trim());
+  const instructions = cloudInstrComp ? prev?.instructions?.text !== undefined ? { text: cloudInstrComp.files[0].content } : { file: prev?.instructions?.file ?? DEFAULT_INSTRUCTIONS_FILE } : undefined;
+  const cloudEntrypoint = (cloudAgent.entrypoint ?? "").trim();
+  let entrypoint;
+  if (cloudEntrypoint.length > 0) {
+    if (prev?.entrypoint?.commands)
+      entrypoint = { commands: prev.entrypoint.commands };
+    else if (prev?.entrypoint?.text !== undefined)
+      entrypoint = { text: cloudAgent.entrypoint };
+    else
+      entrypoint = { file: prev?.entrypoint?.file ?? DEFAULT_ENTRYPOINT_FILE };
+  }
+  const playbooks = cloud.components.filter((c2) => c2.type === "playbook").map((c2) => {
+    const raw = c2.files[0]?.content ?? "";
+    const { frontmatter } = stripFrontmatter(raw);
+    const local = prev?.playbooks?.find((pb) => slugifyForCompare(pb.title) === c2.slug);
+    const title = local?.title ?? (typeof frontmatter.title === "string" && frontmatter.title || c2.slug);
+    const description = local?.description ?? (typeof frontmatter.description === "string" ? frontmatter.description : undefined);
+    const content = local?.content?.text !== undefined ? { text: local.content.text } : {
+      file: local?.content?.file ?? path48.join(DEFAULT_PLAYBOOKS_DIR, `${c2.slug}.md`)
+    };
+    return {
+      title,
+      ...description ? { description } : {},
+      content
+    };
+  });
   const mcp = cloud.components.filter((c2) => c2.type === "mcp").map((c2) => {
     const payload = (c2.meta ?? {}).mcp ?? {};
     const entry = { name: c2.slug };
@@ -52416,17 +52781,33 @@ function mergeManifest(cwd2, prev, cloud, link2) {
   });
   return {
     schema: 1,
+    id: cloudAgent.id,
+    harness,
     agent: {
-      name: link2.name,
-      ...link2.tagline ? { tagline: link2.tagline } : {}
+      name: cloudAgent.name,
+      ...cloudAgent.tagline ? { tagline: cloudAgent.tagline } : {}
     },
-    ...hasInstructions ? {
-      instructions: { file: prev?.instructions?.file ?? DEFAULT_INSTRUCTIONS_FILE }
-    } : {},
+    ...instructions ? { instructions } : {},
+    ...entrypoint ? { entrypoint } : {},
+    playbooks,
     skills,
     mcp
   };
 }
+function materializeEntrypoint(cwd2, cloudEntrypoint, prev) {
+  if (!cloudEntrypoint.trim())
+    return;
+  if (prev?.entrypoint?.commands)
+    return;
+  if (prev?.entrypoint?.text !== undefined)
+    return;
+  const filename = prev?.entrypoint?.file ?? DEFAULT_ENTRYPOINT_FILE;
+  const target = path48.resolve(cwd2, filename);
+  fs45.writeFileSync(target, cloudEntrypoint, "utf8");
+  try {
+    fs45.chmodSync(target, 493);
+  } catch {}
+}
 function parseSourceLoose(raw) {
   const m3 = raw.match(/^registry:[a-z0-9_-]+\/([a-z0-9_-]+)/i);
   if (m3)
@@ -52468,7 +52849,7 @@ function buildLockComponents(input) {
   }
   return out;
 }
-function buildLockFromCloud(agent_id, cloud, prev) {
+function buildLockFromCloud(agent_id, cloud, prev, cloudAgent) {
   return {
     schemaVersion: 1,
     agent_id,
@@ -52480,11 +52861,73 @@ function buildLockFromCloud(agent_id, cloud, prev) {
       hash: c2.hash,
       installedPaths: []
     })),
-    agentMeta: prev?.agentMeta
+    agentMeta: cloudAgent ? {
+      name: cloudAgent.name,
+      tagline: cloudAgent.tagline,
+      ...cloudAgent.entrypoint ? { entrypoint: cloudAgent.entrypoint } : {}
+    } : prev?.agentMeta
   };
 }
-function writeBrainbaseYamlFromCloud(cwd2, link2, cloud) {
-  writeManifest(cwd2, mergeManifest(cwd2, null, cloud, link2));
+function buildLinkFromAgent(agent, harness, prev) {
+  return {
+    schemaVersion: 1,
+    agent_id: agent.id,
+    org_id: agent.org_id ?? prev?.org_id ?? "",
+    team_id: agent.team_id ?? prev?.team_id ?? "",
+    slug: agent.slug,
+    name: agent.name,
+    tagline: agent.tagline,
+    url: agent.url,
+    linked_at: prev?.linked_at ?? new Date().toISOString(),
+    linked_by: prev?.linked_by,
+    harness,
+    tracking: prev?.tracking
+  };
+}
+async function runEntrypointIfPresent(cwd2, manifest) {
+  if (!manifest.entrypoint)
+    return;
+  const body = resolveEntrypoint(cwd2, manifest);
+  if (body === null || !body.trim())
+    return;
+  const stateDir = path48.join(cwd2, LINK_DIR);
+  ensureDir(stateDir);
+  const scriptPath = path48.join(stateDir, "entrypoint.sh");
+  const logPath = path48.join(stateDir, "entrypoint.log");
+  fs45.writeFileSync(scriptPath, body, "utf8");
+  try {
+    fs45.chmodSync(scriptPath, 493);
+  } catch {}
+  f2.info(`Running entrypoint ${import_picocolors25.default.dim(`(${path48.relative(cwd2, scriptPath)})`)}`);
+  const secrets = readLocalSecrets(cwd2);
+  const env3 = { ...process.env, ...secrets };
+  const logStream = fs45.createWriteStream(logPath, { flags: "w" });
+  const exitCode = await new Promise((resolve) => {
+    const child = spawn2("bash", [scriptPath], {
+      cwd: cwd2,
+      env: env3,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    child.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+      logStream.write(chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      process.stderr.write(chunk);
+      logStream.write(chunk);
+    });
+    child.on("error", (err) => {
+      f2.warn(`entrypoint failed to start: ${err.message}`);
+      resolve(null);
+    });
+    child.on("exit", (code) => resolve(code));
+  });
+  await new Promise((resolve) => logStream.end(resolve));
+  if (exitCode === 0) {
+    f2.info("Entrypoint completed.");
+  } else if (exitCode === null) {} else {
+    f2.warn(`Entrypoint exited ${exitCode} — continuing. Log at ${import_picocolors25.default.dim(path48.relative(cwd2, logPath))}.`);
+  }
 }
 async function pullSecrets(cwd2, agentId) {
   let cloudSecrets;
@@ -52518,6 +52961,8 @@ function handleApiError2(err) {
   if (err instanceof ApiError) {
     if (err.status === 401) {
       f2.error("Your session is invalid. Run `brainbase login` and try again.");
+    } else if (err.status === 404) {
+      f2.error(`Agent not found, or you don't have access. Double-check the id.`);
     } else {
       f2.error(err.message);
     }
@@ -52527,18 +52972,149 @@ function handleApiError2(err) {
 }
 
 // src/cli/agent-push.ts
+var import_picocolors27 = __toESM(require_picocolors(), 1);
+
+// src/core/agent-outgoing.ts
 var import_picocolors26 = __toESM(require_picocolors(), 1);
+async function buildOutgoingComponents(cwd2, manifest, cloud) {
+  const out = [];
+  if (manifest.instructions) {
+    if (manifest.instructions.text !== undefined && manifest.instructions.file !== undefined) {
+      f2.error(`instructions block sets both ${import_picocolors26.default.cyan("text")} and ${import_picocolors26.default.cyan("file")} — pick one.`);
+      return null;
+    }
+    const body = readInstructions(cwd2, manifest);
+    if (body === null) {
+      if (manifest.instructions.file) {
+        f2.error(`Instructions file ${import_picocolors26.default.bold(manifest.instructions.file)} not found.`);
+      } else {
+        f2.error("Instructions block is empty.");
+      }
+      return null;
+    }
+    if (body.trim()) {
+      const fileName = manifest.instructions.file ?? "instructions.md";
+      const fileHash2 = hashString(body);
+      const file = {
+        path: fileName,
+        content: body,
+        hash: fileHash2
+      };
+      out.push({
+        type: "instruction",
+        slug: "agent-instructions",
+        description: "Agent instructions",
+        hash: componentHashFromFileHashes([fileHash2]),
+        files: [file],
+        meta: { source: "global_prompt" }
+      });
+    }
+  }
+  for (const entry of manifest.skills) {
+    const parsed = parseSkillSource2(entry.source);
+    if (parsed.kind === "local") {
+      f2.error(`Skill ${import_picocolors26.default.bold(entry.source)} is a local-authored skill. Local skill push isn't supported yet — publish it to the registry first (\`brainbase skill publish\`).`);
+      return null;
+    }
+    const cloudMatch = cloud?.components.find((c2) => c2.type === "skill" && c2.slug === parsed.slug);
+    out.push({
+      type: "skill",
+      slug: parsed.slug,
+      hash: cloudMatch?.hash ?? "",
+      files: [],
+      meta: {
+        name: parsed.creator ? `${parsed.creator}/${parsed.slug}` : parsed.slug,
+        ...parsed.version ? { version: parsed.version } : {}
+      }
+    });
+  }
+  const seenPlaybookSlugs = new Set;
+  for (const entry of manifest.playbooks ?? []) {
+    if (entry.content.text !== undefined && entry.content.file !== undefined) {
+      f2.error(`Playbook ${import_picocolors26.default.bold(entry.title)} sets both ${import_picocolors26.default.cyan("text")} and ${import_picocolors26.default.cyan("file")} — pick one.`);
+      return null;
+    }
+    const body = resolvePlaybookContent(cwd2, entry);
+    if (body === null) {
+      if (entry.content.file) {
+        f2.error(`Playbook ${import_picocolors26.default.bold(entry.title)} content file ${import_picocolors26.default.bold(entry.content.file)} not found.`);
+      } else {
+        f2.error(`Playbook ${import_picocolors26.default.bold(entry.title)} content is empty.`);
+      }
+      return null;
+    }
+    const slug = slugifyPlaybookTitle(entry.title);
+    if (seenPlaybookSlugs.has(slug)) {
+      f2.error(`Two playbooks resolve to the same slug ${import_picocolors26.default.bold(slug)} (from title ${import_picocolors26.default.bold(entry.title)}). Pick distinct titles.`);
+      return null;
+    }
+    seenPlaybookSlugs.add(slug);
+    const wireBody = assemblePlaybookBody(entry, body);
+    const fileName = `${slug}.md`;
+    const fileHash2 = hashString(wireBody);
+    out.push({
+      type: "playbook",
+      slug,
+      description: entry.description,
+      hash: componentHashFromFileHashes([fileHash2]),
+      files: [{ path: fileName, content: wireBody, hash: fileHash2 }],
+      meta: {
+        title: entry.title,
+        ...entry.description ? { description: entry.description } : {}
+      }
+    });
+  }
+  for (const entry of manifest.mcp ?? []) {
+    if (!entry.url && !entry.command) {
+      f2.error(`MCP ${import_picocolors26.default.bold(entry.name)} needs either ${import_picocolors26.default.cyan("url")} or ${import_picocolors26.default.cyan("command")}.`);
+      return null;
+    }
+    const payload = {};
+    if (entry.url !== undefined)
+      payload.url = entry.url;
+    if (entry.command !== undefined)
+      payload.command = entry.command;
+    if (entry.args !== undefined)
+      payload.args = entry.args;
+    if (entry.env !== undefined)
+      payload.env = entry.env;
+    if (entry.headers !== undefined)
+      payload.headers = entry.headers;
+    payload.is_enabled = entry.is_enabled ?? true;
+    out.push({
+      type: "mcp",
+      slug: entry.name,
+      hash: "",
+      files: [],
+      meta: { mcp: payload }
+    });
+  }
+  return out;
+}
+function assemblePlaybookBody(entry, body) {
+  if (/^---\s*\n/.test(body))
+    return body;
+  const lines = ["---", `title: ${yamlScalar(entry.title)}`];
+  if (entry.description) {
+    lines.push(`description: ${yamlScalar(entry.description)}`);
+  }
+  lines.push("---", "");
+  return lines.join(`
+`) + body.replace(/^\n+/, "");
+}
+function yamlScalar(s3) {
+  if (!/[\n":#&*!|>'%@`{}[\]]/.test(s3) && s3.trim() === s3 && s3 !== "") {
+    return s3;
+  }
+  return JSON.stringify(s3);
+}
+
+// src/cli/agent-push.ts
 async function runAgentPush(cwd2, args) {
   banner("agent push — send your local changes to the cloud");
-  const link2 = readLink(cwd2);
-  if (!link2) {
-    f2.warn("This folder is not linked to any agent.");
-    f2.info(`Run ${import_picocolors26.default.cyan("brainbase link")} first.`);
-    return;
-  }
   if (!hasManifest(cwd2)) {
-    f2.warn(`No ${import_picocolors26.default.bold(AGENT_MANIFEST_FILE)} here.`);
-    f2.info(`Run ${import_picocolors26.default.cyan("brainbase agent pull")} to materialize the manifest before pushing.`);
+    f2.warn(`No ${import_picocolors27.default.bold(AGENT_MANIFEST_FILE)} here.`);
+    f2.info(`Run ${import_picocolors27.default.cyan("brainbase agent create")} to claim a new agent from a manifest, ` + `or ${import_picocolors27.default.cyan("brainbase agent pull <id>")} to pull an existing one.`);
     return;
   }
   let manifest;
@@ -52548,11 +53124,17 @@ async function runAgentPush(cwd2, args) {
     f2.error(err.message);
     return;
   }
+  if (!manifest.id) {
+    f2.warn(`${import_picocolors27.default.bold(AGENT_MANIFEST_FILE)} is unclaimed (no ${import_picocolors27.default.cyan("id")}). Nothing to push to.`);
+    f2.info(`Run ${import_picocolors27.default.cyan("brainbase agent create")} first — that creates the cloud agent and stamps an id here.`);
+    return;
+  }
+  const agentId = manifest.id;
   const sp = de();
-  sp.start(`Fetching cloud state for ${link2.name}…`);
+  sp.start(`Fetching cloud state…`);
   let cloud;
   try {
-    cloud = await api.getAgentManifest(link2.agent_id);
+    cloud = await api.getAgentManifest(agentId);
     sp.stop(`Cloud revision ${cloud.revision}.`);
   } catch (err) {
     sp.stop("Failed.");
@@ -52565,17 +53147,42 @@ async function runAgentPush(cwd2, args) {
     lock: lock?.components ?? [],
     cloud: cloud.components
   });
-  const meta = diffAgentMeta(manifest.agent, lock?.agentMeta, { name: link2.name, tagline: link2.tagline });
+  let cloudMeta = lock?.agentMeta;
+  if (!cloudMeta) {
+    try {
+      const a3 = await api.getAgent(agentId);
+      cloudMeta = { name: a3.name, tagline: a3.tagline, entrypoint: a3.entrypoint };
+    } catch {}
+  }
+  const meta = diffAgentMeta(manifest.agent, lock?.agentMeta, cloudMeta);
+  let resolvedEntrypoint;
+  if (manifest.entrypoint) {
+    const body = resolveEntrypoint(cwd2, manifest);
+    if (body === null) {
+      if (manifest.entrypoint.file) {
+        f2.error(`Entrypoint file ${import_picocolors27.default.bold(manifest.entrypoint.file)} not found.`);
+      } else {
+        f2.error("Entrypoint block is empty.");
+      }
+      return;
+    }
+    resolvedEntrypoint = body;
+  } else {
+    if ((lock?.agentMeta?.entrypoint ?? "") !== "") {
+      resolvedEntrypoint = "";
+    }
+  }
+  const entrypointChanged = resolvedEntrypoint !== undefined && resolvedEntrypoint !== (lock?.agentMeta?.entrypoint ?? "");
   for (const r2 of rows) {
-    if (r2.type !== "instruction" && r2.type !== "skill" && r2.type !== "mcp") {
-      f2.error(`Component ${fmtType(r2.type)} ${import_picocolors26.default.bold(r2.slug)} can't be pushed yet — the server accepts instructions, skills, and mcps in this version.`);
+    if (r2.type !== "instruction" && r2.type !== "skill" && r2.type !== "mcp" && r2.type !== "playbook") {
+      f2.error(`Component ${fmtType(r2.type)} ${import_picocolors27.default.bold(r2.slug)} can't be pushed yet — the server accepts instructions, skills, mcps, and playbooks in this version.`);
       return;
     }
   }
   for (const entry of manifest.skills) {
     const parsed = parseSkillSource2(entry.source);
     if (parsed.kind === "local") {
-      f2.error(`Skill ${import_picocolors26.default.bold(entry.source)} is a local-authored skill. Local skill push isn't supported yet — publish it to the registry first (\`brainbase skill publish\`).`);
+      f2.error(`Skill ${import_picocolors27.default.bold(entry.source)} is a local-authored skill. Local skill push isn't supported yet — publish it to the registry first (\`brainbase skill publish\`).`);
       return;
     }
   }
@@ -52599,22 +53206,22 @@ async function runAgentPush(cwd2, args) {
         break;
     }
   }
-  if (!meta.localChanged && toSend.length === 0 && conflicts.length === 0) {
+  if (!meta.localChanged && !entrypointChanged && toSend.length === 0 && conflicts.length === 0) {
     f2.info("Nothing to push — local is in sync with the cloud.");
     return;
   }
   if (conflicts.length > 0) {
     f2.error(`Cannot push: ${conflicts.length} component${conflicts.length === 1 ? "" : "s"} changed both locally and on the cloud:`);
     for (const r2 of conflicts) {
-      console.error(`  ${import_picocolors26.default.red("!")} ${fmtType(r2.type)} ${import_picocolors26.default.bold(r2.slug)}`);
+      console.error(`  ${import_picocolors27.default.red("!")} ${fmtType(r2.type)} ${import_picocolors27.default.bold(r2.slug)}`);
     }
-    f2.info(`Run ${import_picocolors26.default.cyan("brainbase agent pull")} first to reconcile, then push again.`);
+    f2.info(`Run ${import_picocolors27.default.cyan("brainbase agent pull")} first to reconcile, then push again.`);
     return;
   }
   if (upstreamOnly.length > 0 && !args.yes) {
     f2.warn(`Cloud has ${upstreamOnly.length} change${upstreamOnly.length === 1 ? "" : "s"} you don't have locally:`);
     for (const r2 of upstreamOnly) {
-      console.warn(`  ${import_picocolors26.default.cyan("←")} ${fmtType(r2.type)} ${import_picocolors26.default.bold(r2.slug)} ${import_picocolors26.default.dim(`(${r2.status})`)}`);
+      console.warn(`  ${import_picocolors27.default.cyan("←")} ${fmtType(r2.type)} ${import_picocolors27.default.bold(r2.slug)} ${import_picocolors27.default.dim(`(${r2.status})`)}`);
     }
     f2.info(`If you push now, your push targets revision ${cloud.revision} and may race. Consider \`brainbase agent pull\` first.`);
   }
@@ -52626,6 +53233,13 @@ async function runAgentPush(cwd2, args) {
       text: "name/tagline"
     });
   }
+  if (entrypointChanged) {
+    resultRows.push({
+      type: "upd",
+      label: "entrypoint",
+      text: resolvedEntrypoint === "" ? "cleared" : "updated"
+    });
+  }
   if (toSend.length) {
     resultRows.push({
       type: "add",
@@ -52636,7 +53250,7 @@ async function runAgentPush(cwd2, args) {
   await showResultCard({
     title: "PUSH",
     tone: "info",
-    subtitle: `${link2.name} ← local`,
+    subtitle: `${manifest.agent.name} ← local`,
     rows: resultRows
   });
   if (!args.yes) {
@@ -52646,14 +53260,19 @@ async function runAgentPush(cwd2, args) {
       return;
     }
   }
-  if (meta.localChanged) {
+  if (meta.localChanged || entrypointChanged) {
     const metaSpinner = de();
     metaSpinner.start("Updating agent metadata…");
     try {
-      await api.updateAgent(link2.agent_id, {
-        name: manifest.agent.name,
-        tagline: manifest.agent.tagline ?? ""
-      });
+      const update = {};
+      if (meta.localChanged) {
+        update.name = manifest.agent.name;
+        update.tagline = manifest.agent.tagline ?? "";
+      }
+      if (entrypointChanged) {
+        update.entrypoint = resolvedEntrypoint;
+      }
+      await api.updateAgent(agentId, update);
       metaSpinner.stop("Metadata updated.");
     } catch (err) {
       metaSpinner.stop("Failed.");
@@ -52667,7 +53286,7 @@ async function runAgentPush(cwd2, args) {
   pushSpinner.start("Pushing…");
   let updatedCloud;
   try {
-    updatedCloud = await api.pushAgentManifest(link2.agent_id, {
+    updatedCloud = await api.pushAgentManifest(agentId, {
       components: outgoing,
       base_revision: cloud.revision
     });
@@ -52676,14 +53295,22 @@ async function runAgentPush(cwd2, args) {
     pushSpinner.stop("Failed.");
     if (err instanceof ApiError && err.status === 409) {
       f2.error(err.message);
-      f2.info(`Run ${import_picocolors26.default.cyan("brainbase agent pull")} and try again.`);
+      f2.info(`Run ${import_picocolors27.default.cyan("brainbase agent pull")} and try again.`);
       return;
     }
     return handleApiError3(err);
   }
+  const existing = readLink(cwd2);
+  if (existing) {
+    writeLink(cwd2, {
+      ...existing,
+      name: manifest.agent.name,
+      tagline: manifest.agent.tagline
+    });
+  }
   const newLock = {
     schemaVersion: 1,
-    agent_id: link2.agent_id,
+    agent_id: agentId,
     revision: updatedCloud.revision,
     synced_at: new Date().toISOString(),
     components: updatedCloud.components.map((c2) => {
@@ -52695,7 +53322,7 @@ async function runAgentPush(cwd2, args) {
           return false;
         }
       })?.source;
-      const prior = lock?.components.find((pc25) => pc25.type === c2.type && pc25.slug === c2.slug);
+      const prior = lock?.components.find((pc26) => pc26.type === c2.type && pc26.slug === c2.slug);
       return {
         type: c2.type,
         slug: c2.slug,
@@ -52704,11 +53331,15 @@ async function runAgentPush(cwd2, args) {
         ...decl ? { source: decl } : {}
       };
     }),
-    agentMeta: { name: manifest.agent.name, tagline: manifest.agent.tagline }
+    agentMeta: {
+      name: manifest.agent.name,
+      tagline: manifest.agent.tagline,
+      entrypoint: resolvedEntrypoint !== undefined ? resolvedEntrypoint : lock?.agentMeta?.entrypoint
+    }
   };
   writeSyncState(cwd2, newLock);
-  await pushSecrets(cwd2, link2.agent_id);
-  $e(`Pushed ${link2.name} at revision ${updatedCloud.revision}.`);
+  await pushSecrets(cwd2, agentId);
+  $e(`Pushed ${manifest.agent.name} at revision ${updatedCloud.revision}.`);
 }
 async function pushSecrets(cwd2, agentId) {
   const localSecrets = readLocalSecrets(cwd2);
@@ -52722,87 +53353,19 @@ async function pushSecrets(cwd2, agentId) {
     f2.warn(`Couldn't read cloud secrets to diff: ${err.message}. Skipping secret push.`);
     return;
   }
-  const diff2 = diffSecrets(localSecrets, cloudSecrets);
-  if (diff2.localOnly.length === 0 && diff2.changed.length === 0 && diff2.cloudOnly.length === 0) {
-    return;
-  }
-  const sp = de();
-  sp.start("Pushing secrets…");
-  try {
-    await api.putAgentSecrets(agentId, localSecrets);
-    sp.stop(`Secrets pushed (${diff2.localOnly.length} added, ${diff2.changed.length} updated, ${diff2.cloudOnly.length} removed).`);
-  } catch (err) {
-    sp.stop("Failed.");
-    handleApiError3(err);
-  }
-}
-async function buildOutgoingComponents(cwd2, manifest, cloud) {
-  const out = [];
-  if (manifest.instructions) {
-    const body = readInstructions(cwd2, manifest);
-    if (body === null) {
-      f2.error(`Instructions file ${import_picocolors26.default.bold(manifest.instructions.file)} not found.`);
-      return null;
-    }
-    if (body.trim()) {
-      const fileHash2 = hashString(body);
-      const file = {
-        path: manifest.instructions.file,
-        content: body,
-        hash: fileHash2
-      };
-      out.push({
-        type: "instruction",
-        slug: "agent-instructions",
-        description: "Agent instructions",
-        hash: componentHashFromFileHashes([fileHash2]),
-        files: [file],
-        meta: { source: "global_prompt" }
-      });
-    }
-  }
-  for (const entry of manifest.skills) {
-    const parsed = parseSkillSource2(entry.source);
-    if (parsed.kind !== "registry")
-      continue;
-    const cloudMatch = cloud.components.find((c2) => c2.type === "skill" && c2.slug === parsed.slug);
-    out.push({
-      type: "skill",
-      slug: parsed.slug,
-      hash: cloudMatch?.hash ?? "",
-      files: [],
-      meta: {
-        name: parsed.creator ? `${parsed.creator}/${parsed.slug}` : parsed.slug,
-        ...parsed.version ? { version: parsed.version } : {}
-      }
-    });
+  const diff2 = diffSecrets(localSecrets, cloudSecrets);
+  if (diff2.localOnly.length === 0 && diff2.changed.length === 0 && diff2.cloudOnly.length === 0) {
+    return;
   }
-  for (const entry of manifest.mcp ?? []) {
-    if (!entry.url && !entry.command) {
-      f2.error(`MCP ${import_picocolors26.default.bold(entry.name)} needs either ${import_picocolors26.default.cyan("url")} or ${import_picocolors26.default.cyan("command")}.`);
-      return null;
-    }
-    const payload = {};
-    if (entry.url !== undefined)
-      payload.url = entry.url;
-    if (entry.command !== undefined)
-      payload.command = entry.command;
-    if (entry.args !== undefined)
-      payload.args = entry.args;
-    if (entry.env !== undefined)
-      payload.env = entry.env;
-    if (entry.headers !== undefined)
-      payload.headers = entry.headers;
-    payload.is_enabled = entry.is_enabled ?? true;
-    out.push({
-      type: "mcp",
-      slug: entry.name,
-      hash: "",
-      files: [],
-      meta: { mcp: payload }
-    });
+  const sp = de();
+  sp.start("Pushing secrets…");
+  try {
+    await api.putAgentSecrets(agentId, localSecrets);
+    sp.stop(`Secrets pushed (${diff2.localOnly.length} added, ${diff2.changed.length} updated, ${diff2.cloudOnly.length} removed).`);
+  } catch (err) {
+    sp.stop("Failed.");
+    handleApiError3(err);
   }
-  return out;
 }
 function handleApiError3(err) {
   if (err instanceof ApiError) {
@@ -52817,13 +53380,13 @@ function handleApiError3(err) {
 }
 
 // src/cli/agent-status.ts
-var import_picocolors27 = __toESM(require_picocolors(), 1);
+var import_picocolors28 = __toESM(require_picocolors(), 1);
 async function runAgentStatus(cwd2) {
   banner("agent status — what changed locally, remotely, both");
   const link2 = readLink(cwd2);
   if (!link2) {
     f2.warn("This folder is not linked to any agent.");
-    f2.info(`Run ${import_picocolors27.default.cyan("brainbase link")} first.`);
+    f2.info(`Run ${import_picocolors28.default.cyan("brainbase link")} first.`);
     return;
   }
   const manifest = hasManifest(cwd2) ? readManifest(cwd2) : null;
@@ -52844,8 +53407,8 @@ async function runAgentStatus(cwd2) {
     return;
   }
   if (!manifest) {
-    f2.info(`${import_picocolors27.default.dim("No")} ${import_picocolors27.default.bold("brainbase.yaml")} ${import_picocolors27.default.dim("here yet.")} Run ${import_picocolors27.default.cyan("brainbase agent pull")} to populate this folder.`);
-    f2.info(`Cloud has ${import_picocolors27.default.bold(String(cloud.components.length))} component${cloud.components.length === 1 ? "" : "s"} at revision ${cloud.revision}.`);
+    f2.info(`${import_picocolors28.default.dim("No")} ${import_picocolors28.default.bold("brainbase.agent.yaml")} ${import_picocolors28.default.dim("here yet.")} Run ${import_picocolors28.default.cyan("brainbase agent pull")} to populate this folder.`);
+    f2.info(`Cloud has ${import_picocolors28.default.bold(String(cloud.components.length))} component${cloud.components.length === 1 ? "" : "s"} at revision ${cloud.revision}.`);
     return;
   }
   const localComponents = readLocalComponents(cwd2, manifest);
@@ -52884,17 +53447,17 @@ async function runAgentStatus(cwd2) {
   }
   const lines = [];
   lines.push("");
-  lines.push(`  ${import_picocolors27.default.bold(link2.name)} ${import_picocolors27.default.dim(`(${link2.slug})`)}`);
-  lines.push(`  ${import_picocolors27.default.dim("agent_id")}  ${link2.agent_id}`);
-  lines.push(`  ${import_picocolors27.default.dim("revision")}  cloud ${cloud.revision}${lock ? ` · lock ${lock.revision}` : " · never pulled"}`);
+  lines.push(`  ${import_picocolors28.default.bold(link2.name)} ${import_picocolors28.default.dim(`(${link2.slug})`)}`);
+  lines.push(`  ${import_picocolors28.default.dim("agent_id")}  ${link2.agent_id}`);
+  lines.push(`  ${import_picocolors28.default.dim("revision")}  cloud ${cloud.revision}${lock ? ` · lock ${lock.revision}` : " · never pulled"}`);
   lines.push("");
   if (meta.localChanged || meta.cloudChanged) {
-    lines.push(`  ${import_picocolors27.default.bold("agent metadata")}`);
+    lines.push(`  ${import_picocolors28.default.bold("agent metadata")}`);
     if (meta.localChanged) {
-      lines.push(`    ${import_picocolors27.default.yellow("→ push")}  name/tagline edited in brainbase.yaml`);
+      lines.push(`    ${import_picocolors28.default.yellow("→ push")}  name/tagline edited in brainbase.agent.yaml`);
     }
     if (meta.cloudChanged) {
-      lines.push(`    ${import_picocolors27.default.cyan("← pull")}  name/tagline changed on cloud`);
+      lines.push(`    ${import_picocolors28.default.cyan("← pull")}  name/tagline changed on cloud`);
     }
     lines.push("");
   }
@@ -52904,65 +53467,65 @@ async function runAgentStatus(cwd2) {
     const cloudSecrets = cloudRes.secrets ?? {};
     const sd = diffSecrets(localSecrets, cloudSecrets);
     if (sd.localOnly.length || sd.cloudOnly.length || sd.changed.length) {
-      lines.push(`  ${import_picocolors27.default.bold("secrets")}`);
+      lines.push(`  ${import_picocolors28.default.bold("secrets")}`);
       if (sd.localOnly.length)
-        lines.push(`    ${import_picocolors27.default.yellow("→ push")}  new locally: ${sd.localOnly.join(", ")}`);
+        lines.push(`    ${import_picocolors28.default.yellow("→ push")}  new locally: ${sd.localOnly.join(", ")}`);
       if (sd.changed.length)
-        lines.push(`    ${import_picocolors27.default.yellow("→ push")}  values changed: ${sd.changed.join(", ")}`);
+        lines.push(`    ${import_picocolors28.default.yellow("→ push")}  values changed: ${sd.changed.join(", ")}`);
       if (sd.cloudOnly.length)
-        lines.push(`    ${import_picocolors27.default.cyan("← pull")}  new on cloud: ${sd.cloudOnly.join(", ")}`);
+        lines.push(`    ${import_picocolors28.default.cyan("← pull")}  new on cloud: ${sd.cloudOnly.join(", ")}`);
       lines.push("");
     }
   } catch {}
   if (conflicts.length === 0 && toPush.length === 0 && toPull.length === 0) {
-    lines.push(`  ${import_picocolors27.default.green("✓")} everything is in sync`);
+    lines.push(`  ${import_picocolors28.default.green("✓")} everything is in sync`);
     lines.push("");
     console.log(lines.join(`
 `));
     return;
   }
   if (toPush.length) {
-    lines.push(`  ${import_picocolors27.default.bold("changes to push")} ${import_picocolors27.default.dim(`(${toPush.length})`)}`);
+    lines.push(`  ${import_picocolors28.default.bold("changes to push")} ${import_picocolors28.default.dim(`(${toPush.length})`)}`);
     for (const r2 of toPush)
-      lines.push(`    ${import_picocolors27.default.yellow("→")} ${fmtRow(r2)}`);
+      lines.push(`    ${import_picocolors28.default.yellow("→")} ${fmtRow(r2)}`);
     lines.push("");
   }
   if (toPull.length) {
-    lines.push(`  ${import_picocolors27.default.bold("changes to pull")} ${import_picocolors27.default.dim(`(${toPull.length})`)}`);
+    lines.push(`  ${import_picocolors28.default.bold("changes to pull")} ${import_picocolors28.default.dim(`(${toPull.length})`)}`);
     for (const r2 of toPull)
-      lines.push(`    ${import_picocolors27.default.cyan("←")} ${fmtRow(r2)}`);
+      lines.push(`    ${import_picocolors28.default.cyan("←")} ${fmtRow(r2)}`);
     lines.push("");
   }
   if (conflicts.length) {
-    lines.push(`  ${import_picocolors27.default.bold(import_picocolors27.default.red("conflicts"))} ${import_picocolors27.default.dim(`(${conflicts.length})`)}`);
+    lines.push(`  ${import_picocolors28.default.bold(import_picocolors28.default.red("conflicts"))} ${import_picocolors28.default.dim(`(${conflicts.length})`)}`);
     for (const r2 of conflicts)
-      lines.push(`    ${import_picocolors27.default.red("!")} ${fmtRow(r2)}`);
+      lines.push(`    ${import_picocolors28.default.red("!")} ${fmtRow(r2)}`);
     lines.push("");
   }
-  lines.push(`  ${import_picocolors27.default.dim("run")} ${import_picocolors27.default.cyan("brainbase agent pull")} ${import_picocolors27.default.dim("to apply cloud changes,")} ${import_picocolors27.default.cyan("brainbase agent push")} ${import_picocolors27.default.dim("to send yours")}`);
+  lines.push(`  ${import_picocolors28.default.dim("run")} ${import_picocolors28.default.cyan("brainbase agent pull")} ${import_picocolors28.default.dim("to apply cloud changes,")} ${import_picocolors28.default.cyan("brainbase agent push")} ${import_picocolors28.default.dim("to send yours")}`);
   lines.push("");
   console.log(lines.join(`
 `));
 }
 function fmtRow(r2) {
-  const head = `${fmtType(r2.type)} ${import_picocolors27.default.bold(r2.slug)}`;
+  const head = `${fmtType(r2.type)} ${import_picocolors28.default.bold(r2.slug)}`;
   switch (r2.status) {
     case "added-only-local":
-      return `${head}  ${import_picocolors27.default.dim("(new — only in brainbase.yaml)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(new — only in brainbase.agent.yaml)")}`;
     case "added-cloud":
-      return `${head}  ${import_picocolors27.default.dim("(new on cloud)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(new on cloud)")}`;
     case "added-local":
-      return `${head}  ${import_picocolors27.default.dim("(present locally and on cloud, never synced here)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(present locally and on cloud, never synced here)")}`;
     case "removed-local":
-      return `${head}  ${import_picocolors27.default.dim("(removed from brainbase.yaml)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(removed from brainbase.agent.yaml)")}`;
     case "removed-cloud":
-      return `${head}  ${import_picocolors27.default.dim("(removed on cloud)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(removed on cloud)")}`;
     case "modified-local":
-      return `${head}  ${import_picocolors27.default.dim("(you edited it)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(you edited it)")}`;
     case "modified-cloud":
-      return `${head}  ${import_picocolors27.default.dim("(cloud was updated)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(cloud was updated)")}`;
     case "modified-both":
-      return `${head}  ${import_picocolors27.default.dim("(both diverged — needs resolution)")}`;
+      return `${head}  ${import_picocolors28.default.dim("(both diverged — needs resolution)")}`;
     default:
       return head;
   }
@@ -52999,10 +53562,11 @@ function formatExport(shell, key2, value) {
 }
 
 // src/cli/agent-create.ts
-var import_picocolors29 = __toESM(require_picocolors(), 1);
+import path49 from "node:path";
+var import_picocolors30 = __toESM(require_picocolors(), 1);
 
 // src/ui/box.ts
-var import_picocolors28 = __toESM(require_picocolors(), 1);
+var import_picocolors29 = __toESM(require_picocolors(), 1);
 var H3 = "─";
 var TINT = {
   ok: COLOR.ok,
@@ -53014,20 +53578,28 @@ var TINT = {
 function divider(label, width = 56, indent = 2) {
   const ind = " ".repeat(indent);
   if (!label)
-    return `${ind}${import_picocolors28.default.dim(H3.repeat(width))}`;
+    return `${ind}${import_picocolors29.default.dim(H3.repeat(width))}`;
   const labelText = ` ${label} `;
   const labelLen = visibleLength(labelText);
-  const left = import_picocolors28.default.dim(H3.repeat(2));
-  const right = import_picocolors28.default.dim(H3.repeat(Math.max(0, width - labelLen - 2)));
-  return `${ind}${left}${import_picocolors28.default.bold(import_picocolors28.default.dim(labelText))}${right}`;
+  const left = import_picocolors29.default.dim(H3.repeat(2));
+  const right = import_picocolors29.default.dim(H3.repeat(Math.max(0, width - labelLen - 2)));
+  return `${ind}${left}${import_picocolors29.default.bold(import_picocolors29.default.dim(labelText))}${right}`;
 }
 function tip(text, indent = 2) {
-  return " ".repeat(indent) + import_picocolors28.default.dim("›") + " " + import_picocolors28.default.dim(text);
+  return " ".repeat(indent) + import_picocolors29.default.dim("›") + " " + import_picocolors29.default.dim(text);
 }
 
 // src/cli/agent-create.ts
 async function runAgentCreate(cwd2, args) {
-  banner("agent create — make a new brainbase agent and link this folder");
+  banner("agent create — claim a brainbase.agent.yaml and link this folder");
+  let manifest = await loadOrScaffoldManifest(cwd2, args);
+  if (!manifest)
+    return;
+  if (manifest.id) {
+    f2.warn(`This folder already belongs to an agent — ${import_picocolors30.default.bold(manifest.agent.name)} (${import_picocolors30.default.dim(manifest.id)}).`);
+    f2.info(`If you want to detach it, run ${import_picocolors30.default.cyan("brainbase unlink")} first; or move to a different directory.`);
+    return;
+  }
   const orgsSpinner = de();
   orgsSpinner.start("Loading your organizations…");
   let orgs;
@@ -53054,7 +53626,7 @@ async function runAgentCreate(cwd2, args) {
     org = found;
   } else if (orgs.length === 1) {
     org = orgs[0];
-    f2.info(`Using organization ${import_picocolors29.default.bold(org.name)}.`);
+    f2.info(`Using organization ${import_picocolors30.default.bold(org.name)}.`);
   } else {
     const orgChoice = await ie({
       message: "Pick an organization",
@@ -53102,7 +53674,7 @@ async function runAgentCreate(cwd2, args) {
       createSpinner2.start("Creating team…");
       try {
         team = await api.createTeam(org.id, teamName.trim());
-        createSpinner2.stop(`Created team ${import_picocolors29.default.bold(team.name)}.`);
+        createSpinner2.stop(`Created team ${import_picocolors30.default.bold(team.name)}.`);
       } catch (err) {
         createSpinner2.stop("Failed.");
         handleApiError4(err);
@@ -53112,8 +53684,8 @@ async function runAgentCreate(cwd2, args) {
       team = teams.find((t) => t.id === picked);
     }
   }
-  const harness = normalizeHarnessId(args.harness ?? await pickHarness(cwd2));
-  let agentName = args.name?.trim();
+  const harness = normalizeHarnessId(args.harness ?? manifest.harness ?? await pickHarness(cwd2));
+  let agentName = args.name?.trim() || manifest.agent.name.trim();
   if (!agentName) {
     const ans = await te({
       message: "Agent name",
@@ -53122,7 +53694,7 @@ async function runAgentCreate(cwd2, args) {
     });
     agentName = ensureNotCancelled(ans).trim();
   }
-  let tagline = args.tagline?.trim() || undefined;
+  let tagline = (args.tagline ?? manifest.agent.tagline)?.trim() || undefined;
   if (tagline === undefined && !args.yes) {
     const ans = await te({
       message: "Tagline",
@@ -53134,11 +53706,11 @@ async function runAgentCreate(cwd2, args) {
   }
   if (!args.yes) {
     le([
-      `${import_picocolors29.default.dim("org")}      ${import_picocolors29.default.bold(org.name)}`,
-      `${import_picocolors29.default.dim("team")}     ${import_picocolors29.default.bold(team.name)}`,
-      `${import_picocolors29.default.dim("harness")}  ${import_picocolors29.default.bold(harness)}`,
-      `${import_picocolors29.default.dim("agent")}    ${import_picocolors29.default.bold(agentName)}`,
-      ...tagline ? [`${import_picocolors29.default.dim("tagline")}  ${tagline}`] : []
+      `${import_picocolors30.default.dim("org")}      ${import_picocolors30.default.bold(org.name)}`,
+      `${import_picocolors30.default.dim("team")}     ${import_picocolors30.default.bold(team.name)}`,
+      `${import_picocolors30.default.dim("harness")}  ${import_picocolors30.default.bold(harness)}`,
+      `${import_picocolors30.default.dim("agent")}    ${import_picocolors30.default.bold(agentName)}`,
+      ...tagline ? [`${import_picocolors30.default.dim("tagline")}  ${tagline}`] : []
     ].join(`
 `), "Will create");
     const confirmed = await se({ message: "Create this agent?", initialValue: true });
@@ -53147,6 +53719,19 @@ async function runAgentCreate(cwd2, args) {
       return;
     }
   }
+  let resolvedEntrypoint;
+  if (manifest.entrypoint) {
+    const body = resolveEntrypoint(cwd2, manifest);
+    if (body === null) {
+      if (manifest.entrypoint.file) {
+        f2.error(`Entrypoint file ${import_picocolors30.default.bold(manifest.entrypoint.file)} not found.`);
+      } else {
+        f2.error("Entrypoint block is empty.");
+      }
+      return;
+    }
+    resolvedEntrypoint = body;
+  }
   const createSpinner = de();
   createSpinner.start("Creating agent…");
   let agent;
@@ -53156,9 +53741,10 @@ async function runAgentCreate(cwd2, args) {
       team_id: team.id,
       name: agentName,
       tagline,
-      harness
+      harness,
+      ...resolvedEntrypoint !== undefined ? { entrypoint: resolvedEntrypoint } : {}
     });
-    createSpinner.stop(`Created ${import_picocolors29.default.bold(agent.name)}.`);
+    createSpinner.stop(`Created ${import_picocolors30.default.bold(agent.name)}.`);
   } catch (err) {
     createSpinner.stop("Failed.");
     handleApiError4(err);
@@ -53171,7 +53757,7 @@ async function runAgentCreate(cwd2, args) {
     let wantsTracking = true;
     if (!args.yes) {
       const ans = await se({
-        message: `Track ${harness} conversations on the brainbase platform? ${import_picocolors29.default.dim("(routes LLM calls through brainbase so they appear under this agent)")}`,
+        message: `Track ${harness} conversations on the brainbase platform? ${import_picocolors30.default.dim("(routes LLM calls through brainbase so they appear under this agent)")}`,
         initialValue: true
       });
       wantsTracking = ensureNotCancelled(ans);
@@ -53225,7 +53811,54 @@ async function runAgentCreate(cwd2, args) {
     tracking
   };
   writeLink(cwd2, link2);
-  $e(`Created ${import_picocolors29.default.bold(agent.name)} and linked this folder.`);
+  manifest = readManifest(cwd2);
+  let updatedCloud = null;
+  const hasContent = !!manifest.instructions || manifest.skills.length > 0 || (manifest.mcp ?? []).length > 0;
+  if (hasContent) {
+    const outgoing = await buildOutgoingComponents(cwd2, manifest, null);
+    if (outgoing === null) {
+      f2.warn(`Agent created, but local content wasn't uploaded. Fix the issue above and run ${import_picocolors30.default.cyan("brainbase agent push")}.`);
+    } else if (outgoing.length > 0) {
+      const pushSpinner = de();
+      pushSpinner.start("Pushing local content…");
+      try {
+        updatedCloud = await api.pushAgentManifest(agent.id, {
+          components: outgoing,
+          base_revision: 0
+        });
+        pushSpinner.stop(`Pushed at revision ${updatedCloud.revision}.`);
+      } catch (err) {
+        pushSpinner.stop("Failed.");
+        if (err instanceof ApiError) {
+          f2.warn(`Content upload failed: ${err.message}. Run ${import_picocolors30.default.cyan("brainbase agent push")} to retry.`);
+        } else {
+          f2.warn(`Content upload failed: ${err.message}. Run ${import_picocolors30.default.cyan("brainbase agent push")} to retry.`);
+        }
+      }
+    }
+  }
+  if (updatedCloud) {
+    const syncedComponents = updatedCloud.components.map((c2) => ({
+      type: c2.type,
+      slug: c2.slug,
+      hash: c2.hash,
+      installedPaths: []
+    }));
+    const state = {
+      schemaVersion: 1,
+      agent_id: agent.id,
+      revision: updatedCloud.revision,
+      synced_at: new Date().toISOString(),
+      components: syncedComponents,
+      agentMeta: {
+        name: agent.name,
+        tagline: agent.tagline,
+        ...resolvedEntrypoint ? { entrypoint: resolvedEntrypoint } : {}
+      }
+    };
+    writeSyncState(cwd2, state);
+  }
+  $e(`Created ${import_picocolors30.default.bold(agent.name)} and linked this folder.`);
   await showResultCard({
     title: "CREATED",
     tone: "ok",
@@ -53238,16 +53871,55 @@ async function runAgentCreate(cwd2, args) {
   });
   console.log();
   if (tracking && harness === "codex") {
-    console.log(tip(`Run ${import_picocolors29.default.cyan("codex")} once in this folder and approve trust ${import_picocolors29.default.dim("— Codex only loads project-scope config in trusted projects.")}`));
+    console.log(tip(`Run ${import_picocolors30.default.cyan("codex")} once in this folder and approve trust ${import_picocolors30.default.dim("— Codex only loads project-scope config in trusted projects.")}`));
   }
-  console.log(tip(`brainbase agent pull ${import_picocolors29.default.dim("— pull the agent contents into this folder")}`));
+  console.log(tip(`brainbase agent unpack ${import_picocolors30.default.dim("— install harness files (skills/mcps) under .claude/, .codex/, …")}`));
   console.log();
 }
+async function loadOrScaffoldManifest(cwd2, args) {
+  if (hasManifest(cwd2)) {
+    try {
+      return readManifest(cwd2);
+    } catch (err) {
+      f2.error(err.message);
+      return null;
+    }
+  }
+  f2.warn(`No ${import_picocolors30.default.bold(AGENT_MANIFEST_FILE)} here.`);
+  if (!args.yes) {
+    const ans = await se({
+      message: `Scaffold a minimal ${import_picocolors30.default.bold(AGENT_MANIFEST_FILE)} and continue?`,
+      initialValue: true
+    });
+    if (!ensureNotCancelled(ans)) {
+      $e("Aborted.");
+      return null;
+    }
+  }
+  const seedName = args.name?.trim() ?? path49.basename(path49.resolve(cwd2)) ?? "My Agent";
+  const seedHarness = args.harness ? normalizeHarnessId(args.harness) : undefined;
+  const scaffold = {
+    schema: 1,
+    ...seedHarness ? { harness: seedHarness } : {},
+    agent: { name: seedName, ...args.tagline ? { tagline: args.tagline } : {} },
+    playbooks: [],
+    skills: [],
+    mcp: []
+  };
+  try {
+    writeManifest(cwd2, scaffold);
+    f2.info(`Wrote ${import_picocolors30.default.bold(AGENT_MANIFEST_FILE)}.`);
+  } catch (err) {
+    f2.error(`Failed to write manifest: ${err.message}`);
+    return null;
+  }
+  return scaffold;
+}
 async function pickHarness(cwd2) {
   const detections = await detectHarnesses(cwd2);
   const detected = detections.filter((d3) => d3.detection.detected);
   if (detected.length === 1) {
-    f2.info(`Detected harness: ${import_picocolors29.default.bold(detected[0].adapter.displayName)}.`);
+    f2.info(`Detected harness: ${import_picocolors30.default.bold(detected[0].adapter.displayName)}.`);
     return detected[0].adapter.id;
   }
   const choice = await ie({
@@ -53273,8 +53945,268 @@ function handleApiError4(err) {
   $e("Aborted.");
 }
 
+// src/cli/agent-unpack.ts
+import path50 from "node:path";
+import fs46 from "node:fs";
+import os13 from "node:os";
+var import_picocolors31 = __toESM(require_picocolors(), 1);
+async function runAgentUnpack(cwd2, args) {
+  banner("agent unpack — install this agent into a harness layout");
+  if (!hasManifest(cwd2)) {
+    f2.error(`No ${import_picocolors31.default.bold(AGENT_MANIFEST_FILE)} here.`);
+    f2.info(`Run ${import_picocolors31.default.cyan("brainbase agent pull <id>")} to bring an agent into this folder first.`);
+    return;
+  }
+  let manifest;
+  try {
+    manifest = readManifest(cwd2);
+  } catch (err) {
+    f2.error(err.message);
+    return;
+  }
+  if (!manifest.id) {
+    f2.error(`${import_picocolors31.default.bold(AGENT_MANIFEST_FILE)} is unclaimed (no ${import_picocolors31.default.cyan("id")}).`);
+    f2.info(`Run ${import_picocolors31.default.cyan("brainbase agent create")} to claim it, ` + `or ${import_picocolors31.default.cyan("brainbase agent pull <id>")} to link it to an existing agent.`);
+    return;
+  }
+  let harness;
+  if (args.harness) {
+    harness = normalizeHarnessId(args.harness);
+  } else if (args.yes) {
+    if (!manifest.harness) {
+      f2.error(`--yes mode but no harness — set ${import_picocolors31.default.cyan("harness")} in the manifest or pass ${import_picocolors31.default.cyan("--harness")}.`);
+      return;
+    }
+    harness = normalizeHarnessId(manifest.harness);
+  } else {
+    harness = await pickHarness2(manifest.harness);
+  }
+  if (!args.yes) {
+    const ok = await se({
+      message: `Install ${import_picocolors31.default.bold(manifest.agent.name)} as ${import_picocolors31.default.bold(harness)} here?`,
+      initialValue: true
+    });
+    if (!ensureNotCancelled(ok)) {
+      $e("Aborted.");
+      return;
+    }
+  }
+  const scope = args.scope ?? "project";
+  const stageRoot = fs46.mkdtempSync(path50.join(os13.tmpdir(), "brainbase-unpack-"));
+  try {
+    const toInstall = [];
+    const instructionsBody = readInstructions(cwd2, manifest);
+    if (instructionsBody && instructionsBody.trim()) {
+      const compDir = path50.join(stageRoot, "instruction", "agent-instructions");
+      ensureDir(compDir);
+      fs46.writeFileSync(path50.join(compDir, "instructions.md"), instructionsBody, "utf8");
+      toInstall.push({
+        type: "instruction",
+        slug: "agent-instructions",
+        scope,
+        rootDir: compDir,
+        description: "Agent instructions",
+        checksum: ""
+      });
+    }
+    for (const entry of manifest.playbooks ?? []) {
+      const issue = stageLocalPlaybook(entry, cwd2, stageRoot, scope, toInstall);
+      if (issue) {
+        f2.warn(issue);
+      }
+    }
+    for (const entry of manifest.skills ?? []) {
+      const issue = stageLocalSkill(entry.source, cwd2, stageRoot, scope, toInstall);
+      if (issue) {
+        f2.warn(issue);
+      }
+    }
+    for (const entry of manifest.mcp ?? []) {
+      const compDir = path50.join(stageRoot, "mcp", entry.name);
+      ensureDir(compDir);
+      const payload = {};
+      if (entry.url !== undefined)
+        payload.url = entry.url;
+      if (entry.command !== undefined)
+        payload.command = entry.command;
+      if (entry.args !== undefined)
+        payload.args = entry.args;
+      if (entry.env !== undefined)
+        payload.env = entry.env;
+      if (entry.headers !== undefined)
+        payload.headers = entry.headers;
+      payload.is_enabled = entry.is_enabled ?? true;
+      toInstall.push({
+        type: "mcp",
+        slug: entry.name,
+        scope,
+        rootDir: compDir,
+        payload,
+        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 opts = {
+      cwd: cwd2,
+      scope,
+      resolveConflict: async (_c) => "overwrite",
+      resolveSecret: async () => null
+    };
+    const sp = de();
+    sp.start("Installing harness layout…");
+    const result = await runHarnessInstall3(harness, toInstall, opts, manifest.agent.name);
+    sp.stop("Installed.");
+    if (result.skipped.length) {
+      f2.warn(`Skipped: ${result.skipped.map((s3) => `${s3.type}/${s3.slug} (${s3.reason})`).join(", ")}`);
+    }
+  } catch (err) {
+    f2.error(`Install failed: ${err.message}`);
+    return;
+  } finally {
+    try {
+      fs46.rmSync(stageRoot, { recursive: true, force: true });
+    } catch {}
+  }
+  if (manifest.harness !== harness) {
+    manifest.harness = harness;
+    writeManifest(cwd2, manifest);
+  }
+  $e(`Unpacked ${import_picocolors31.default.bold(manifest.agent.name)} as ${import_picocolors31.default.bold(harness)}.`);
+  await showResultCard({
+    title: "UNPACKED",
+    tone: "ok",
+    subtitle: manifest.agent.name,
+    meta: [
+      ["harness", harness],
+      ["agent", manifest.id]
+    ]
+  });
+}
+function stageLocalPlaybook(entry, cwd2, stageRoot, scope, toInstall) {
+  if (entry.content.text !== undefined && entry.content.file !== undefined) {
+    return `Playbook ${entry.title}: both text and file set — skipped.`;
+  }
+  const body = resolvePlaybookContent(cwd2, entry);
+  if (body === null) {
+    return entry.content.file ? `Playbook ${entry.title}: file ${entry.content.file} not found — skipped.` : `Playbook ${entry.title}: content empty — skipped.`;
+  }
+  const slug = slugifyPlaybookTitle(entry.title);
+  const compDir = path50.join(stageRoot, "playbook", slug);
+  ensureDir(compDir);
+  const wireBody = /^---\s*\n/.test(body) ? body : assembleFrontmatter(entry.title, entry.description) + body.replace(/^\n+/, "");
+  fs46.writeFileSync(path50.join(compDir, `${slug}.md`), wireBody, "utf8");
+  toInstall.push({
+    type: "playbook",
+    slug,
+    scope,
+    rootDir: compDir,
+    description: entry.description,
+    checksum: ""
+  });
+  return null;
+}
+function stageLocalSkill(source, cwd2, stageRoot, scope, toInstall) {
+  if (source.startsWith("./") || source.startsWith("../") || source.startsWith("/")) {
+    const abs = path50.resolve(cwd2, source);
+    if (!fs46.existsSync(abs)) {
+      return `Skill ${source}: not found on disk — skipped.`;
+    }
+    const slug = path50.basename(abs);
+    const compDir = path50.join(stageRoot, "skill", slug);
+    ensureDir(compDir);
+    copyDirRecursive(abs, compDir);
+    toInstall.push({
+      type: "skill",
+      slug,
+      scope,
+      rootDir: compDir,
+      checksum: ""
+    });
+    return null;
+  }
+  try {
+    const parsed = parseSkillSource(source);
+    if (parsed.type === "local" || parsed.type === "inline")
+      return null;
+    const slug = defaultSlugForSource(source);
+    const compDir = path50.join(stageRoot, "skill", slug);
+    ensureDir(compDir);
+    toInstall.push({
+      type: "skill",
+      slug,
+      scope,
+      rootDir: compDir,
+      source: parsed,
+      checksum: ""
+    });
+    return null;
+  } catch (err) {
+    return `Skill ${source}: ${err.message} — skipped.`;
+  }
+}
+function defaultSlugForSource(source) {
+  const reg = /^registry:(?:[a-z0-9_-]+\/)?([a-z0-9_-]+)/i.exec(source);
+  if (reg)
+    return reg[1].toLowerCase();
+  const gh = /^(?:github|git):[^/]*\/?([a-z0-9_-]+)/i.exec(source);
+  if (gh)
+    return gh[1].toLowerCase();
+  return source.replace(/[^a-z0-9_-]/gi, "-").slice(0, 60) || "skill";
+}
+function copyDirRecursive(src, dest) {
+  ensureDir(dest);
+  for (const entry of fs46.readdirSync(src, { withFileTypes: true })) {
+    const s3 = path50.join(src, entry.name);
+    const d3 = path50.join(dest, entry.name);
+    if (entry.isDirectory())
+      copyDirRecursive(s3, d3);
+    else if (entry.isFile())
+      fs46.copyFileSync(s3, d3);
+  }
+}
+function assembleFrontmatter(title, description) {
+  const lines = ["---", `title: ${yamlScalar2(title)}`];
+  if (description)
+    lines.push(`description: ${yamlScalar2(description)}`);
+  lines.push("---", "");
+  return lines.join(`
+`);
+}
+function yamlScalar2(s3) {
+  if (!/[\n":#&*!|>'%@`{}[\]]/.test(s3) && s3.trim() === s3 && s3 !== "")
+    return s3;
+  return JSON.stringify(s3);
+}
+function runHarnessInstall3(harnessId, components, opts, agentName) {
+  if (harnessId === "claude-code")
+    return installClaudeCodeWithCtx(components, opts, agentName);
+  if (harnessId === "codex")
+    return installCodexWithCtx(components, opts, agentName);
+  if (harnessId === "kafka")
+    return installKafkaWithCtx(components, opts, agentName);
+  return getAdapter(harnessId).install(components, opts);
+}
+async function pickHarness2(current) {
+  const initial = current ? normalizeHarnessId(current) : undefined;
+  const choice = await ie({
+    message: "Pick a harness to install as",
+    options: adapters.map((a3) => ({
+      value: a3.id,
+      label: a3.displayName,
+      hint: a3.id === initial ? "current" : undefined
+    })),
+    initialValue: initial ?? adapters[0].id
+  });
+  return ensureNotCancelled(choice);
+}
+
 // src/cli/agent.ts
-async function runAgent(cwd2, sub, _args, opts) {
+async function runAgent(cwd2, sub, args, opts) {
   switch (sub) {
     case "create":
       await runAgentCreate(cwd2, {
@@ -53288,10 +54220,22 @@ async function runAgent(cwd2, sub, _args, opts) {
       });
       return;
     case "pull":
-      await runAgentPull(cwd2, opts);
+      await runAgentPull(cwd2, {
+        yes: opts.yes,
+        scope: opts.scope,
+        agentIdArg: args[0],
+        force: opts.force
+      });
       return;
     case "push":
-      await runAgentPush(cwd2, opts);
+      await runAgentPush(cwd2, { yes: opts.yes });
+      return;
+    case "unpack":
+      await runAgentUnpack(cwd2, {
+        yes: opts.yes,
+        scope: opts.scope,
+        harness: opts.harness
+      });
       return;
     case "status":
       await runAgentStatus(cwd2);
@@ -53315,30 +54259,31 @@ async function runAgent(cwd2, sub, _args, opts) {
 function printHelp() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors30.default.bold("brainbase agent")} ${import_picocolors30.default.dim("<sub> [options]")}`);
+  out.push(`  ${import_picocolors32.default.bold("brainbase agent")} ${import_picocolors32.default.dim("<sub> [options]")}`);
   out.push("");
-  out.push(`  ${import_picocolors30.default.cyan("create")}      ${import_picocolors30.default.dim("make a new agent on the cloud and link this folder to it")}`);
-  out.push(`  ${import_picocolors30.default.cyan("pull")}        ${import_picocolors30.default.dim("apply cloud changes into this folder")}`);
-  out.push(`  ${import_picocolors30.default.cyan("push")}        ${import_picocolors30.default.dim("send local changes to the cloud")}`);
-  out.push(`  ${import_picocolors30.default.cyan("status")}      ${import_picocolors30.default.dim("show what would push and what would pull")}`);
-  out.push(`  ${import_picocolors30.default.cyan("env")}         ${import_picocolors30.default.dim('print export statements — use with `eval "$(brainbase agent env)"`')}`);
+  out.push(`  ${import_picocolors32.default.cyan("create")}             ${import_picocolors32.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
+  out.push(`  ${import_picocolors32.default.cyan("pull")} ${import_picocolors32.default.dim("[<id>]")}      ${import_picocolors32.default.dim("apply cloud changes into this folder — pass <id> to switch (--force to override)")}`);
+  out.push(`  ${import_picocolors32.default.cyan("push")}               ${import_picocolors32.default.dim("send local changes to the cloud")}`);
+  out.push(`  ${import_picocolors32.default.cyan("unpack")}             ${import_picocolors32.default.dim("install the claimed agent into a harness layout (--harness to override)")}`);
+  out.push(`  ${import_picocolors32.default.cyan("status")}             ${import_picocolors32.default.dim("show what would push and what would pull")}`);
+  out.push(`  ${import_picocolors32.default.cyan("env")}                ${import_picocolors32.default.dim('print export statements — use with `eval "$(brainbase agent env)"`')}`);
   out.push("");
   console.log(out.join(`
 `));
 }
 
 // src/cli/orchestration.ts
-var import_picocolors35 = __toESM(require_picocolors(), 1);
+var import_picocolors37 = __toESM(require_picocolors(), 1);
 
 // src/cli/orchestration-pull.ts
-import path52 from "node:path";
-import fs49 from "node:fs";
-var import_picocolors31 = __toESM(require_picocolors(), 1);
+import path54 from "node:path";
+import fs50 from "node:fs";
+var import_picocolors33 = __toESM(require_picocolors(), 1);
 
 // src/core/orchestration-manifest.ts
-import path49 from "node:path";
-import fs46 from "node:fs";
-var import_yaml3 = __toESM(require_dist(), 1);
+import path51 from "node:path";
+import fs47 from "node:fs";
+var import_yaml4 = __toESM(require_dist(), 1);
 var ORCH_MANIFEST_FILE = "brainbase-orchestration.yaml";
 var ORCH_MEMBERS_DIR = "agents";
 var OrchMetaSchema = exports_external.object({
@@ -53365,19 +54310,19 @@ var OrchestrationManifestSchema = exports_external.object({
   edges: exports_external.array(EdgeSchema).default([])
 });
 function orchManifestPath(cwd2) {
-  return path49.join(cwd2, ORCH_MANIFEST_FILE);
+  return path51.join(cwd2, ORCH_MANIFEST_FILE);
 }
 function hasOrchManifest(cwd2) {
-  return fs46.existsSync(orchManifestPath(cwd2));
+  return fs47.existsSync(orchManifestPath(cwd2));
 }
 function readOrchManifest(cwd2) {
   const p2 = orchManifestPath(cwd2);
-  if (!fs46.existsSync(p2))
+  if (!fs47.existsSync(p2))
     return null;
-  const raw = fs46.readFileSync(p2, "utf8");
+  const raw = fs47.readFileSync(p2, "utf8");
   let parsed;
   try {
-    parsed = import_yaml3.default.parse(raw);
+    parsed = import_yaml4.default.parse(raw);
   } catch (err) {
     throw new Error(`${ORCH_MANIFEST_FILE} is not valid YAML: ${err.message}`);
   }
@@ -53388,20 +54333,20 @@ function readOrchManifest(cwd2) {
   return result.data;
 }
 function writeOrchManifest(cwd2, manifest) {
-  const doc = new import_yaml3.default.Document;
+  const doc = new import_yaml4.default.Document;
   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/.";
-  fs46.writeFileSync(orchManifestPath(cwd2), String(doc), "utf8");
+  fs47.writeFileSync(orchManifestPath(cwd2), String(doc), "utf8");
 }
 function memberDir(cwd2, slug) {
-  return path49.join(cwd2, ORCH_MEMBERS_DIR, slug);
+  return path51.join(cwd2, ORCH_MEMBERS_DIR, slug);
 }
 
 // src/core/orchestration-link.ts
-import path50 from "node:path";
-import fs47 from "node:fs";
+import path52 from "node:path";
+import fs48 from "node:fs";
 var ORCH_LINK_FILE = "orchestration-link.json";
 var ORCH_SYNC_STATE_FILE = "orchestration-sync-state.json";
 var OrchestrationLinkSchema = exports_external.object({
@@ -53435,10 +54380,10 @@ var OrchestrationSyncStateSchema = exports_external.object({
   edges: exports_external.array(SyncedEdgeSchema)
 });
 function orchLinkPath(cwd2) {
-  return path50.join(cwd2, LINK_DIR, ORCH_LINK_FILE);
+  return path52.join(cwd2, LINK_DIR, ORCH_LINK_FILE);
 }
 function orchSyncStatePath(cwd2) {
-  return path50.join(cwd2, LINK_DIR, ORCH_SYNC_STATE_FILE);
+  return path52.join(cwd2, LINK_DIR, ORCH_SYNC_STATE_FILE);
 }
 function readOrchLink(cwd2) {
   const p2 = orchLinkPath(cwd2);
@@ -53451,7 +54396,7 @@ function readOrchLink(cwd2) {
   }
 }
 function writeOrchLink(cwd2, link2) {
-  ensureDir(path50.join(cwd2, LINK_DIR));
+  ensureDir(path52.join(cwd2, LINK_DIR));
   const clean = {};
   for (const [k3, v3] of Object.entries(link2)) {
     if (v3 !== null && v3 !== undefined)
@@ -53471,22 +54416,22 @@ function readOrchSyncState(cwd2) {
   }
 }
 function writeOrchSyncState(cwd2, state) {
-  ensureDir(path50.join(cwd2, LINK_DIR));
+  ensureDir(path52.join(cwd2, LINK_DIR));
   writeJson(orchSyncStatePath(cwd2), state);
   ensureGitignore2(cwd2);
 }
 function ensureGitignore2(cwd2) {
-  const ignorePath = path50.join(cwd2, LINK_DIR, ".gitignore");
+  const ignorePath = path52.join(cwd2, LINK_DIR, ".gitignore");
   const desired = `${ORCH_SYNC_STATE_FILE}
 `;
   try {
     if (!exists(ignorePath)) {
-      fs47.writeFileSync(ignorePath, desired);
+      fs48.writeFileSync(ignorePath, desired);
       return;
     }
-    const current = fs47.readFileSync(ignorePath, "utf8");
+    const current = fs48.readFileSync(ignorePath, "utf8");
     if (!current.split(/\r?\n/).some((l2) => l2.trim() === ORCH_SYNC_STATE_FILE)) {
-      fs47.writeFileSync(ignorePath, current.endsWith(`
+      fs48.writeFileSync(ignorePath, current.endsWith(`
 `) ? current + desired : current + `
 ` + desired);
     }
@@ -53494,9 +54439,9 @@ function ensureGitignore2(cwd2) {
 }
 
 // src/core/agent-fresh-install.ts
-import path51 from "node:path";
-import fs48 from "node:fs";
-import os13 from "node:os";
+import path53 from "node:path";
+import fs49 from "node:fs";
+import os14 from "node:os";
 async function installAgentFresh(input) {
   const { cwd: cwd2, agent, cloud, harness } = input;
   const scope = input.scope ?? "project";
@@ -53513,7 +54458,7 @@ async function installAgentFresh(input) {
         type: c2.type,
         slug: c2.slug,
         scope,
-        rootDir: path51.join(stageRoot, c2.type, c2.slug),
+        rootDir: path53.join(stageRoot, c2.type, c2.slug),
         description: c2.description,
         meta: c2.meta,
         payload: c2.meta?.mcp,
@@ -53531,14 +54476,15 @@ async function installAgentFresh(input) {
         resolveConflict: async (_c) => "overwrite",
         resolveSecret: async () => null
       };
-      const result = await runHarnessInstall3(harness, toInstall, installOpts, agent.name);
+      const result = await runHarnessInstall4(harness, toInstall, installOpts, agent.name);
       for (const o2 of result.installed) {
         justInstalledPaths.set(`${o2.type}/${o2.slug}`, o2.installedPaths);
       }
     }
     materializeInstructions2(cwd2, cloud);
-    const manifest = buildManifestFromCloud(cloud, agent);
-    writeManifest(cwd2, manifest);
+    const manifest = input.preserveManifest ? null : buildManifestFromCloud(cloud, agent);
+    if (manifest)
+      writeManifest(cwd2, manifest);
     writeLink(cwd2, {
       schemaVersion: 1,
       agent_id: agent.id,
@@ -53568,31 +54514,32 @@ async function installAgentFresh(input) {
     if (input.pullSecrets !== false) {
       await pullAgentSecrets(cwd2, agent.id);
     }
+    const returnedManifest = manifest ?? buildManifestFromCloud(cloud, agent);
     return {
       installedPaths: justInstalledPaths,
-      manifest,
+      manifest: returnedManifest,
       syncedComponents
     };
   } finally {
     try {
-      fs48.rmSync(stageRoot, { recursive: true, force: true });
+      fs49.rmSync(stageRoot, { recursive: true, force: true });
     } catch {}
   }
 }
 function stageManifestComponents2(components) {
-  const root = fs48.mkdtempSync(path51.join(os13.tmpdir(), "brainbase-orch-pull-"));
+  const root = fs49.mkdtempSync(path53.join(os14.tmpdir(), "brainbase-orch-pull-"));
   for (const c2 of components) {
-    const compDir = path51.join(root, c2.type, c2.slug);
+    const compDir = path53.join(root, c2.type, c2.slug);
     ensureDir(compDir);
     for (const f4 of c2.files) {
-      const target = path51.join(compDir, f4.path);
-      ensureDir(path51.dirname(target));
-      fs48.writeFileSync(target, f4.content);
+      const target = path53.join(compDir, f4.path);
+      ensureDir(path53.dirname(target));
+      fs49.writeFileSync(target, f4.content);
     }
   }
   return root;
 }
-function runHarnessInstall3(harnessId, components, opts, agentName) {
+function runHarnessInstall4(harnessId, components, opts, agentName) {
   if (harnessId === "claude-code")
     return installClaudeCodeWithCtx(components, opts, agentName);
   if (harnessId === "codex")
@@ -53608,7 +54555,7 @@ function materializeInstructions2(cwd2, cloud) {
     const body = c2.files[0]?.content ?? "";
     if (!body.trim())
       continue;
-    fs48.writeFileSync(path51.join(cwd2, DEFAULT_INSTRUCTIONS_FILE), body, "utf8");
+    fs49.writeFileSync(path53.join(cwd2, DEFAULT_INSTRUCTIONS_FILE), body, "utf8");
     return;
   }
 }
@@ -53647,6 +54594,7 @@ function buildManifestFromCloud(cloud, agent) {
       ...agent.tagline ? { tagline: agent.tagline } : {}
     },
     ...hasInstructions ? { instructions: { file: DEFAULT_INSTRUCTIONS_FILE } } : {},
+    playbooks: [],
     skills,
     mcp
   };
@@ -53676,8 +54624,8 @@ async function runOrchestrationPull(cwd2, args) {
     orchId = args.orchestrationId;
   } else {
     f2.warn("This folder is not linked to any orchestration.");
-    f2.info(`Run ${import_picocolors31.default.cyan("brainbase orchestration pull <id>")} with an orchestration id,
-  or ${import_picocolors31.default.cyan("brainbase orchestration list")} to find one.`);
+    f2.info(`Run ${import_picocolors33.default.cyan("brainbase orchestration pull <id>")} with an orchestration id,
+  or ${import_picocolors33.default.cyan("brainbase orchestration list")} to find one.`);
     return;
   }
   const sp = de();
@@ -53693,24 +54641,24 @@ async function runOrchestrationPull(cwd2, args) {
   }
   const planLines = [];
   planLines.push("");
-  planLines.push(`  ${import_picocolors31.default.bold(cloud.name)} ${import_picocolors31.default.dim(`(${cloud.id})`)}`);
+  planLines.push(`  ${import_picocolors33.default.bold(cloud.name)} ${import_picocolors33.default.dim(`(${cloud.id})`)}`);
   if (cloud.description)
-    planLines.push(`  ${import_picocolors31.default.dim(cloud.description)}`);
+    planLines.push(`  ${import_picocolors33.default.dim(cloud.description)}`);
   planLines.push("");
-  planLines.push(`  ${import_picocolors31.default.dim("members:")}`);
+  planLines.push(`  ${import_picocolors33.default.dim("members:")}`);
   for (const m3 of cloud.members) {
     const skipped = !m3.manifest;
-    const tail = skipped ? import_picocolors31.default.red(" (manifest unavailable — skipped)") : "";
-    planLines.push(`    ${import_picocolors31.default.cyan("•")} ${import_picocolors31.default.bold(m3.slug)} ${import_picocolors31.default.dim(`(${m3.name})`)}${tail}`);
+    const tail = skipped ? import_picocolors33.default.red(" (manifest unavailable — skipped)") : "";
+    planLines.push(`    ${import_picocolors33.default.cyan("•")} ${import_picocolors33.default.bold(m3.slug)} ${import_picocolors33.default.dim(`(${m3.name})`)}${tail}`);
   }
   if (cloud.edges.length) {
     planLines.push("");
-    planLines.push(`  ${import_picocolors31.default.dim("edges:")}`);
+    planLines.push(`  ${import_picocolors33.default.dim("edges:")}`);
     for (const e2 of cloud.edges) {
       const from = e2.from_slug ?? e2.from_agent_id;
       const to2 = e2.to_slug ?? e2.to_agent_id;
-      const desc = e2.description ? `  ${import_picocolors31.default.dim("— " + e2.description)}` : "";
-      planLines.push(`    ${import_picocolors31.default.cyan(from)} ${import_picocolors31.default.dim("→")} ${import_picocolors31.default.cyan(to2)}${desc}`);
+      const desc = e2.description ? `  ${import_picocolors33.default.dim("— " + e2.description)}` : "";
+      planLines.push(`    ${import_picocolors33.default.cyan(from)} ${import_picocolors33.default.dim("→")} ${import_picocolors33.default.cyan(to2)}${desc}`);
     }
   }
   planLines.push("");
@@ -53719,7 +54667,7 @@ async function runOrchestrationPull(cwd2, args) {
   const isRefresh = !!existingLink;
   if (!args.yes && !isRefresh) {
     const ok = await se({
-      message: `Pull into ${import_picocolors31.default.bold(cwd2)}?`,
+      message: `Pull into ${import_picocolors33.default.bold(cwd2)}?`,
       initialValue: true
     });
     if (!ensureNotCancelled(ok)) {
@@ -53728,7 +54676,7 @@ async function runOrchestrationPull(cwd2, args) {
     }
   }
   const fallbackHarness = args.harness ?? "claude-code";
-  fs49.mkdirSync(cwd2, { recursive: true });
+  fs50.mkdirSync(cwd2, { recursive: true });
   if (hasOrchManifest(cwd2) && existingLink && existingLink.orchestration_id !== orchId) {
     f2.error(`This folder is linked to orchestration ${existingLink.orchestration_id}, not ${orchId}. Move to a fresh directory or unlink first.`);
     return;
@@ -53760,7 +54708,7 @@ async function runOrchestrationPull(cwd2, args) {
         scope: "project",
         pullSecrets: true
       });
-      memberSp.stop(`Installed ${import_picocolors31.default.bold(m3.slug)} ${import_picocolors31.default.dim(`(${m3.manifest.components.length} components)`)}.`);
+      memberSp.stop(`Installed ${import_picocolors33.default.bold(m3.slug)} ${import_picocolors33.default.dim(`(${m3.manifest.components.length} components)`)}.`);
       installedMembers.push({
         agent_id: m3.agent_id,
         slug: m3.slug,
@@ -53815,7 +54763,7 @@ async function runOrchestrationPull(cwd2, args) {
       payload_schema: e2.payload_schema ?? {}
     }))
   });
-  $e(`Pulled ${cloud.name} at revision ${cloud.revision} into ${path52.basename(cwd2)}/ ${import_picocolors31.default.dim(`(${installedMembers.length}/${cloud.members.length} members)`)}.`);
+  $e(`Pulled ${cloud.name} at revision ${cloud.revision} into ${path54.basename(cwd2)}/ ${import_picocolors33.default.dim(`(${installedMembers.length}/${cloud.members.length} members)`)}.`);
 }
 function handleApiError5(err) {
   if (err instanceof ApiError) {
@@ -53832,18 +54780,18 @@ function handleApiError5(err) {
 }
 
 // src/cli/orchestration-push.ts
-var import_picocolors32 = __toESM(require_picocolors(), 1);
+var import_picocolors34 = __toESM(require_picocolors(), 1);
 async function runOrchestrationPush(cwd2, args) {
   banner("orchestration push — recursively push each member, then update the graph");
   const link2 = readOrchLink(cwd2);
   if (!link2) {
     f2.warn("This folder is not linked to any orchestration.");
-    f2.info(`Run ${import_picocolors32.default.cyan("brainbase orchestration pull <id>")} first.`);
+    f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull <id>")} first.`);
     return;
   }
   if (!hasOrchManifest(cwd2)) {
-    f2.warn(`No ${import_picocolors32.default.bold(ORCH_MANIFEST_FILE)} here.`);
-    f2.info(`Run ${import_picocolors32.default.cyan("brainbase orchestration pull")} to materialise the manifest before pushing.`);
+    f2.warn(`No ${import_picocolors34.default.bold(ORCH_MANIFEST_FILE)} here.`);
+    f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull")} to materialise the manifest before pushing.`);
     return;
   }
   let manifest;
@@ -53856,15 +54804,15 @@ async function runOrchestrationPush(cwd2, args) {
   const memberSlugs = new Set(manifest.members.map((m3) => m3.slug));
   for (const e2 of manifest.edges) {
     if (!memberSlugs.has(e2.from)) {
-      f2.error(`Edge from "${import_picocolors32.default.bold(e2.from)}" references a slug that isn't in members.`);
+      f2.error(`Edge from "${import_picocolors34.default.bold(e2.from)}" references a slug that isn't in members.`);
       return;
     }
     if (!memberSlugs.has(e2.to)) {
-      f2.error(`Edge to "${import_picocolors32.default.bold(e2.to)}" references a slug that isn't in members.`);
+      f2.error(`Edge to "${import_picocolors34.default.bold(e2.to)}" references a slug that isn't in members.`);
       return;
     }
     if (e2.from === e2.to) {
-      f2.error(`Edge ${import_picocolors32.default.bold(e2.from)} → ${import_picocolors32.default.bold(e2.to)}: self-loops are not allowed.`);
+      f2.error(`Edge ${import_picocolors34.default.bold(e2.from)} → ${import_picocolors34.default.bold(e2.to)}: self-loops are not allowed.`);
       return;
     }
   }
@@ -53881,17 +54829,17 @@ async function runOrchestrationPush(cwd2, args) {
   }
   if (missing.length) {
     f2.error(`These members have no local checkout (expected at agents/<slug>/.brainbase/link.json): ${missing.join(", ")}.`);
-    f2.info(`Run ${import_picocolors32.default.cyan("brainbase orchestration pull")} to materialise the missing folders.`);
+    f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull")} to materialise the missing folders.`);
     return;
   }
   const plan = [""];
-  plan.push(`  ${import_picocolors32.default.bold(link2.name)} ${import_picocolors32.default.dim(`(${link2.orchestration_id})`)}`);
-  plan.push(`  ${import_picocolors32.default.dim(`${manifest.members.length} member${manifest.members.length === 1 ? "" : "s"}, ${manifest.edges.length} edge${manifest.edges.length === 1 ? "" : "s"}`)}`);
+  plan.push(`  ${import_picocolors34.default.bold(link2.name)} ${import_picocolors34.default.dim(`(${link2.orchestration_id})`)}`);
+  plan.push(`  ${import_picocolors34.default.dim(`${manifest.members.length} member${manifest.members.length === 1 ? "" : "s"}, ${manifest.edges.length} edge${manifest.edges.length === 1 ? "" : "s"}`)}`);
   plan.push("");
   if (!args.graphOnly) {
-    plan.push(`  ${import_picocolors32.default.dim("per-member agent push:")}`);
+    plan.push(`  ${import_picocolors34.default.dim("per-member agent push:")}`);
     for (const m3 of manifest.members) {
-      plan.push(`    ${import_picocolors32.default.cyan("•")} ${import_picocolors32.default.bold(m3.slug)}`);
+      plan.push(`    ${import_picocolors34.default.cyan("•")} ${import_picocolors34.default.bold(m3.slug)}`);
     }
     plan.push("");
   }
@@ -53911,7 +54859,7 @@ async function runOrchestrationPush(cwd2, args) {
     for (const m3 of manifest.members) {
       const dir = memberDir(cwd2, m3.slug);
       console.log("");
-      console.log(`${import_picocolors32.default.dim("───")} ${import_picocolors32.default.bold(m3.slug)} ${import_picocolors32.default.dim("───")}`);
+      console.log(`${import_picocolors34.default.dim("───")} ${import_picocolors34.default.bold(m3.slug)} ${import_picocolors34.default.dim("───")}`);
       try {
         await runAgentPush(dir, { yes: true });
       } catch (err) {
@@ -53973,7 +54921,7 @@ function handleApiError6(err) {
       f2.error("You do not have access to this orchestration.");
     } else if (err.status === 409) {
       f2.error(err.message);
-      f2.info(`Run ${import_picocolors32.default.cyan("brainbase orchestration pull")} to reconcile, then push again.`);
+      f2.info(`Run ${import_picocolors34.default.cyan("brainbase orchestration pull")} to reconcile, then push again.`);
     } else {
       f2.error(err.message);
     }
@@ -53983,13 +54931,13 @@ function handleApiError6(err) {
 }
 
 // src/cli/orchestration-status.ts
-var import_picocolors33 = __toESM(require_picocolors(), 1);
+var import_picocolors35 = __toESM(require_picocolors(), 1);
 async function runOrchestrationStatus(cwd2) {
   banner("orchestration status — what changed locally, remotely, both");
   const link2 = readOrchLink(cwd2);
   if (!link2) {
     f2.warn("This folder is not linked to any orchestration.");
-    f2.info(`Run ${import_picocolors33.default.cyan("brainbase orchestration pull <id>")} first.`);
+    f2.info(`Run ${import_picocolors35.default.cyan("brainbase orchestration pull <id>")} first.`);
     return;
   }
   const localManifest = hasOrchManifest(cwd2) ? readOrchManifest(cwd2) : null;
@@ -54011,20 +54959,20 @@ async function runOrchestrationStatus(cwd2) {
   }
   const lines = [];
   lines.push("");
-  lines.push(`  ${import_picocolors33.default.bold(link2.name)} ${import_picocolors33.default.dim(`(${link2.orchestration_id})`)}`);
-  lines.push(`  ${import_picocolors33.default.dim("revision")}  cloud ${cloud.revision}${lock ? ` · lock ${lock.revision}` : " · never pulled"}`);
+  lines.push(`  ${import_picocolors35.default.bold(link2.name)} ${import_picocolors35.default.dim(`(${link2.orchestration_id})`)}`);
+  lines.push(`  ${import_picocolors35.default.dim("revision")}  cloud ${cloud.revision}${lock ? ` · lock ${lock.revision}` : " · never pulled"}`);
   lines.push("");
   const cloudMemberSet = new Set(cloud.members.map((m3) => m3.slug));
   const localMemberSet = new Set((localManifest?.members ?? []).map((m3) => m3.slug));
   const membersAdded = [...localMemberSet].filter((s3) => !cloudMemberSet.has(s3));
   const membersRemoved = [...cloudMemberSet].filter((s3) => !localMemberSet.has(s3));
   if (membersAdded.length || membersRemoved.length) {
-    lines.push(`  ${import_picocolors33.default.bold("members")}`);
+    lines.push(`  ${import_picocolors35.default.bold("members")}`);
     for (const slug of membersAdded) {
-      lines.push(`    ${import_picocolors33.default.yellow("→ push")}  added in yaml: ${import_picocolors33.default.bold(slug)}`);
+      lines.push(`    ${import_picocolors35.default.yellow("→ push")}  added in yaml: ${import_picocolors35.default.bold(slug)}`);
     }
     for (const slug of membersRemoved) {
-      lines.push(`    ${import_picocolors33.default.cyan("← pull")}  added on cloud: ${import_picocolors33.default.bold(slug)}`);
+      lines.push(`    ${import_picocolors35.default.cyan("← pull")}  added on cloud: ${import_picocolors35.default.bold(slug)}`);
     }
     lines.push("");
   }
@@ -54039,11 +54987,11 @@ async function runOrchestrationStatus(cwd2) {
   const edgesAdded = [...localEdges.keys()].filter((k3) => !cloudEdges.has(k3));
   const edgesRemoved = [...cloudEdges.keys()].filter((k3) => !localEdges.has(k3));
   if (edgesAdded.length || edgesRemoved.length) {
-    lines.push(`  ${import_picocolors33.default.bold("edges")}`);
+    lines.push(`  ${import_picocolors35.default.bold("edges")}`);
     for (const k3 of edgesAdded)
-      lines.push(`    ${import_picocolors33.default.yellow("→ push")}  added in yaml: ${k3}`);
+      lines.push(`    ${import_picocolors35.default.yellow("→ push")}  added in yaml: ${k3}`);
     for (const k3 of edgesRemoved)
-      lines.push(`    ${import_picocolors33.default.cyan("← pull")}  added on cloud: ${k3}`);
+      lines.push(`    ${import_picocolors35.default.cyan("← pull")}  added on cloud: ${k3}`);
     lines.push("");
   }
   const lockByAgentId = new Map((lock?.members ?? []).map((m3) => [m3.agent_id, m3]));
@@ -54065,28 +55013,28 @@ async function runOrchestrationStatus(cwd2) {
     }
   }
   if (memberDrift.length) {
-    lines.push(`  ${import_picocolors33.default.bold("member content drift")}`);
+    lines.push(`  ${import_picocolors35.default.bold("member content drift")}`);
     for (const d3 of memberDrift) {
-      lines.push(`    ${import_picocolors33.default.cyan("?")} ${import_picocolors33.default.bold(d3.slug)}  ${import_picocolors33.default.dim("— " + d3.reason)}`);
+      lines.push(`    ${import_picocolors35.default.cyan("?")} ${import_picocolors35.default.bold(d3.slug)}  ${import_picocolors35.default.dim("— " + d3.reason)}`);
     }
-    lines.push(`    ${import_picocolors33.default.dim("cd into each member folder and run")} ${import_picocolors33.default.cyan("brainbase agent status")}`);
+    lines.push(`    ${import_picocolors35.default.dim("cd into each member folder and run")} ${import_picocolors35.default.cyan("brainbase agent status")}`);
     lines.push("");
   }
   if (!membersAdded.length && !membersRemoved.length && !edgesAdded.length && !edgesRemoved.length && !memberDrift.length) {
-    lines.push(`  ${import_picocolors33.default.green("✓")} everything is in sync`);
+    lines.push(`  ${import_picocolors35.default.green("✓")} everything is in sync`);
     lines.push("");
     console.log(lines.join(`
 `));
     return;
   }
-  lines.push(`  ${import_picocolors33.default.dim("run")} ${import_picocolors33.default.cyan("brainbase orchestration pull")} ${import_picocolors33.default.dim("to apply cloud changes,")} ${import_picocolors33.default.cyan("brainbase orchestration push")} ${import_picocolors33.default.dim("to send yours")}`);
+  lines.push(`  ${import_picocolors35.default.dim("run")} ${import_picocolors35.default.cyan("brainbase orchestration pull")} ${import_picocolors35.default.dim("to apply cloud changes,")} ${import_picocolors35.default.cyan("brainbase orchestration push")} ${import_picocolors35.default.dim("to send yours")}`);
   lines.push("");
   console.log(lines.join(`
 `));
 }
 
 // src/cli/orchestration-list.ts
-var import_picocolors34 = __toESM(require_picocolors(), 1);
+var import_picocolors36 = __toESM(require_picocolors(), 1);
 async function runOrchestrationList(args) {
   banner("orchestration list — orchestrations under a team");
   let orgId = args.orgId;
@@ -54152,13 +55100,13 @@ async function runOrchestrationList(args) {
   }
   const lines = [""];
   for (const o2 of items) {
-    lines.push(`  ${import_picocolors34.default.bold(o2.name)}  ${import_picocolors34.default.dim(o2.id)}`);
+    lines.push(`  ${import_picocolors36.default.bold(o2.name)}  ${import_picocolors36.default.dim(o2.id)}`);
     if (o2.description)
-      lines.push(`    ${import_picocolors34.default.dim(o2.description)}`);
-    lines.push(`    ${import_picocolors34.default.dim(`${o2.member_count} member${o2.member_count === 1 ? "" : "s"} · ${o2.edge_count} edge${o2.edge_count === 1 ? "" : "s"}`)}`);
+      lines.push(`    ${import_picocolors36.default.dim(o2.description)}`);
+    lines.push(`    ${import_picocolors36.default.dim(`${o2.member_count} member${o2.member_count === 1 ? "" : "s"} · ${o2.edge_count} edge${o2.edge_count === 1 ? "" : "s"}`)}`);
     lines.push("");
   }
-  lines.push(`  ${import_picocolors34.default.dim("pull one with")} ${import_picocolors34.default.cyan("brainbase orchestration pull <id>")}`);
+  lines.push(`  ${import_picocolors36.default.dim("pull one with")} ${import_picocolors36.default.cyan("brainbase orchestration pull <id>")}`);
   lines.push("");
   console.log(lines.join(`
 `));
@@ -54214,26 +55162,26 @@ async function runOrchestration(cwd2, sub, args, opts) {
 function printHelp2() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors35.default.bold("brainbase orchestration")} ${import_picocolors35.default.dim("<sub> [options]")}`);
+  out.push(`  ${import_picocolors37.default.bold("brainbase orchestration")} ${import_picocolors37.default.dim("<sub> [options]")}`);
   out.push("");
-  out.push(`  ${import_picocolors35.default.cyan("pull")} ${import_picocolors35.default.dim("<id>")}      ${import_picocolors35.default.dim("fetch orchestration + every member agent into this folder")}`);
-  out.push(`  ${import_picocolors35.default.cyan("push")}             ${import_picocolors35.default.dim("push each member, then update the orchestration graph")}`);
-  out.push(`  ${import_picocolors35.default.cyan("status")}           ${import_picocolors35.default.dim("show what would push and what would pull")}`);
-  out.push(`  ${import_picocolors35.default.cyan("list")}             ${import_picocolors35.default.dim("list orchestrations under a team")}`);
+  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("");
-  out.push(`  ${import_picocolors35.default.bold("Flags")}`);
-  out.push(`    ${import_picocolors35.default.dim("--yes, -y")}        skip confirmations`);
-  out.push(`    ${import_picocolors35.default.dim("--harness <id>")}   harness for newly-created member folders (default claude-code)`);
-  out.push(`    ${import_picocolors35.default.dim("--graph-only")}     for push: only update members + edges, skip per-member push`);
-  out.push(`    ${import_picocolors35.default.dim("--org <id>")}       for list: org id (CLI vocab — DB teams.id)`);
-  out.push(`    ${import_picocolors35.default.dim("--team <id>")}      for list: team id (CLI vocab — DB groups.id)`);
+  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("");
   console.log(out.join(`
 `));
 }
 
 // src/cli/run.ts
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
 async function runRun(cwd2, args) {
   const cleaned = args[0] === "--" ? args.slice(1) : args;
   if (cleaned.length === 0) {
@@ -54245,7 +55193,7 @@ async function runRun(cwd2, args) {
   const [cmd, ...cmdArgs] = cleaned;
   const secrets = readLocalSecrets(cwd2);
   const env3 = { ...process.env, ...secrets };
-  const child = spawn2(cmd, cmdArgs, {
+  const child = spawn3(cmd, cmdArgs, {
     cwd: cwd2,
     env: env3,
     stdio: "inherit",
@@ -54271,16 +55219,16 @@ async function runRun(cwd2, args) {
 }
 
 // src/cli/publish.ts
-var import_picocolors36 = __toESM(require_picocolors(), 1);
+var import_picocolors38 = __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_picocolors36.default.cyan("brainbase link")} first.`);
+    f2.info(`Run ${import_picocolors38.default.cyan("brainbase link")} first.`);
     return;
   }
-  f2.info(`${import_picocolors36.default.bold("publish")} is coming soon — for now, edit the agent on the web app and run ${import_picocolors36.default.cyan("brainbase sync")} to bring changes here.`);
+  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.`);
 }
 
 // src/ui/ink/StatusCard.tsx
@@ -54578,7 +55526,7 @@ async function runStatus(cwd2) {
 }
 
 // src/cli/token.ts
-var import_picocolors37 = __toESM(require_picocolors(), 1);
+var import_picocolors39 = __toESM(require_picocolors(), 1);
 
 // src/ui/ink/TokenCards.tsx
 var jsx_dev_runtime17 = __toESM(require_jsx_dev_runtime(), 1);
@@ -54872,7 +55820,7 @@ async function runTokenRevoke(args) {
   }
   if (!args.yes) {
     const ok = await se({
-      message: `Revoke token ${import_picocolors37.default.bold(args.id)}? CIs and machines using it will stop working.`,
+      message: `Revoke token ${import_picocolors39.default.bold(args.id)}? CIs and machines using it will stop working.`,
       initialValue: false
     });
     if (!ensureNotCancelled(ok))
@@ -54887,7 +55835,7 @@ async function runTokenRevoke(args) {
 }
 async function runTokenClear() {
   if (!readToken()) {
-    console.log(import_picocolors37.default.dim("No local token stored."));
+    console.log(import_picocolors39.default.dim("No local token stored."));
     return;
   }
   clearToken();
@@ -54938,17 +55886,17 @@ async function runToken(sub, rest, args) {
 function printTokenHelp() {
   const out = [];
   out.push("");
-  out.push(`  ${import_picocolors37.default.bold("brainbase token")} ${import_picocolors37.default.dim("<command>")}`);
+  out.push(`  ${import_picocolors39.default.bold("brainbase token")} ${import_picocolors39.default.dim("<command>")}`);
   out.push("");
-  out.push(`  ${import_picocolors37.default.cyan("create")}                        ${import_picocolors37.default.dim("issue a new long-lived CLI key (PAT)")}`);
-  out.push(`  ${import_picocolors37.default.cyan("list")}                          ${import_picocolors37.default.dim("show your active tokens")}`);
-  out.push(`  ${import_picocolors37.default.cyan("revoke")} ${import_picocolors37.default.dim("<id>")}                  ${import_picocolors37.default.dim("revoke a token by id")}`);
-  out.push(`  ${import_picocolors37.default.cyan("clear")}                         ${import_picocolors37.default.dim("forget the local token (does not revoke)")}`);
+  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("");
-  out.push(`  ${import_picocolors37.default.bold("create flags")}`);
-  out.push(`  ${import_picocolors37.default.cyan("--name, -n")} ${import_picocolors37.default.dim("<label>")}        ${import_picocolors37.default.dim("token label (prompted if omitted)")}`);
-  out.push(`  ${import_picocolors37.default.cyan("--scopes")} ${import_picocolors37.default.dim("<list>")}           ${import_picocolors37.default.dim("comma-separated; allowed: read, publish, admin")}`);
-  out.push(`                                ${import_picocolors37.default.dim("default: read,publish")}`);
+  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("");
   console.log(out.join(`
 `));
@@ -54968,89 +55916,90 @@ var PROTECTED = new Set([
 function help() {
   const out = [];
   out.push("");
-  out.push(`  ${brandTint("◆")}  ${import_picocolors38.default.bold("brainbase")}  ${import_picocolors38.default.dim("v0.2.0")}`);
-  out.push(`     ${import_picocolors38.default.dim("connect your local agent to the brainbase platform")}`);
+  out.push(`  ${brandTint("◆")}  ${import_picocolors40.default.bold("brainbase")}  ${import_picocolors40.default.dim("v0.6.0")}`);
+  out.push(`     ${import_picocolors40.default.dim("connect your local agent to the brainbase platform")}`);
   out.push("");
   out.push(divider("USAGE"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.bold("brainbase")} ${import_picocolors38.default.dim("<command> [options]")}`);
+  out.push(`  ${import_picocolors40.default.bold("brainbase")} ${import_picocolors40.default.dim("<command> [options]")}`);
   out.push("");
   out.push(divider("AUTH"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.cyan("login")}     ${import_picocolors38.default.dim("  open the web app and connect this device")}`);
-  out.push(`  ${import_picocolors38.default.cyan("logout")}    ${import_picocolors38.default.dim("  clear the local session")}`);
-  out.push(`  ${import_picocolors38.default.cyan("whoami")}    ${import_picocolors38.default.dim("  show the current user")}`);
+  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("");
   out.push(divider("LINKED AGENT"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.cyan("agent create")}               ${import_picocolors38.default.dim("make a new agent on the cloud and link this folder")}`);
-  out.push(`  ${import_picocolors38.default.cyan("link")}                       ${import_picocolors38.default.dim("attach this folder to an existing agent")}`);
-  out.push(`  ${import_picocolors38.default.cyan("agent pull")}                 ${import_picocolors38.default.dim("bring cloud changes into this folder")}`);
-  out.push(`  ${import_picocolors38.default.cyan("agent push")}                 ${import_picocolors38.default.dim("send local changes to the cloud")}`);
-  out.push(`  ${import_picocolors38.default.cyan("agent status")}               ${import_picocolors38.default.dim("show what would pull and what would push")}`);
-  out.push(`  ${import_picocolors38.default.cyan("agent env")}                  ${import_picocolors38.default.dim("print export lines for `eval $(brainbase agent env)`")}`);
-  out.push(`  ${import_picocolors38.default.cyan("run")} ${import_picocolors38.default.dim("<cmd> [args...]")}         ${import_picocolors38.default.dim("run <cmd> with secrets.env loaded into env")}`);
-  out.push(`  ${import_picocolors38.default.cyan("status")}                     ${import_picocolors38.default.dim("show what this folder is linked to")}`);
-  out.push(`  ${import_picocolors38.default.cyan("unlink")}                     ${import_picocolors38.default.dim("disconnect this folder")}`);
+  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("");
   out.push(divider("ORCHESTRATIONS"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.cyan("orchestration list")}             ${import_picocolors38.default.dim("list orchestrations under a team")}`);
-  out.push(`  ${import_picocolors38.default.cyan("orchestration pull")} ${import_picocolors38.default.dim("<id>")}        ${import_picocolors38.default.dim("recursively fetch an orchestration + every member agent")}`);
-  out.push(`  ${import_picocolors38.default.cyan("orchestration push")}             ${import_picocolors38.default.dim("recursively push each member, then update the graph")}`);
-  out.push(`  ${import_picocolors38.default.cyan("orchestration status")}           ${import_picocolors38.default.dim("show what would push and what would pull")}`);
+  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("");
   out.push(divider("TEMPLATES"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.cyan("template pack")}                       ${import_picocolors38.default.dim("bundle the current agent into a template")}`);
-  out.push(`  ${import_picocolors38.default.cyan("template publish")}                    ${import_picocolors38.default.dim("upload a template to the registry")}`);
-  out.push(`  ${import_picocolors38.default.cyan("template search")} ${import_picocolors38.default.dim("[query]")}             ${import_picocolors38.default.dim("search the registry")}`);
-  out.push(`  ${import_picocolors38.default.cyan("template info")}    ${import_picocolors38.default.dim("<creator/slug>")}     ${import_picocolors38.default.dim("show registry details for a template")}`);
-  out.push(`  ${import_picocolors38.default.cyan("template onboard")} ${import_picocolors38.default.dim("<creator/slug>")}     ${import_picocolors38.default.dim("install (or refresh) a template")}`);
-  out.push(`  ${import_picocolors38.default.cyan("template list")}                       ${import_picocolors38.default.dim("show installed templates")}`);
-  out.push(`  ${import_picocolors38.default.cyan("template remove")}  ${import_picocolors38.default.dim("<creator/slug>")}     ${import_picocolors38.default.dim("uninstall a template")}`);
+  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("");
   out.push(divider("SKILLS"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.cyan("skill add")} ${import_picocolors38.default.dim("<source>")}                  ${import_picocolors38.default.dim("install a skill (github / git / brainbase)")}`);
-  out.push(`  ${import_picocolors38.default.cyan("skill list")}                            ${import_picocolors38.default.dim("show locally installed skills + their source")}`);
-  out.push(`  ${import_picocolors38.default.cyan("skill update")} ${import_picocolors38.default.dim("<slug>")}                  ${import_picocolors38.default.dim("re-fetch a skill from its recorded source")}`);
-  out.push(`  ${import_picocolors38.default.cyan("skill remove")} ${import_picocolors38.default.dim("<slug>")}                  ${import_picocolors38.default.dim("uninstall a skill")}`);
-  out.push(`  ${import_picocolors38.default.cyan("skill search")} ${import_picocolors38.default.dim("[query]")}                 ${import_picocolors38.default.dim("search the brainbase skill registry")}`);
-  out.push(`  ${import_picocolors38.default.cyan("skill info")} ${import_picocolors38.default.dim("<creator/slug>")}            ${import_picocolors38.default.dim("show registry details for a skill")}`);
-  out.push(`  ${import_picocolors38.default.cyan("skill publish")} ${import_picocolors38.default.dim("[dir]")}                  ${import_picocolors38.default.dim("publish a SKILL.md folder (defaults to .)")}`);
+  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("");
   out.push(divider("CLI TOKENS"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.cyan("token create")}                        ${import_picocolors38.default.dim("issue a long-lived CLI key for CI / scripts")}`);
-  out.push(`  ${import_picocolors38.default.cyan("token list")}                          ${import_picocolors38.default.dim("show your active tokens")}`);
-  out.push(`  ${import_picocolors38.default.cyan("token revoke")} ${import_picocolors38.default.dim("<id>")}                  ${import_picocolors38.default.dim("revoke a token")}`);
+  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("");
   out.push(divider("FLAGS"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.dim("--harness <id>")}     force harness for onboard / sync (e.g. claude-code)`);
-  out.push(`  ${import_picocolors38.default.dim("--scope <s>")}        force scope: global | project`);
-  out.push(`  ${import_picocolors38.default.dim("--yes, -y")}          skip confirmations / auto-overwrite`);
-  out.push(`  ${import_picocolors38.default.dim("--agent <id>")}       for link: attach this folder to an existing agent non-interactively`);
-  out.push(`  ${import_picocolors38.default.dim("--no-tracking")}      for link: skip routing LLM traffic through brainbase`);
-  out.push(`  ${import_picocolors38.default.dim("--shell <sh|fish>")}  for agent env: pick output format (auto-detected from $SHELL)`);
-  out.push(`  ${import_picocolors38.default.dim("--all")}              for template list: include installs from other folders`);
-  out.push(`  ${import_picocolors38.default.dim("--web <url>")}        for login: web app URL (default https://new.usekafka.com)`);
+  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("--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("");
   out.push(divider("ENV"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.dim("BRAINBASE_HOME")}         override the local config dir (default ~/.brainbase)`);
-  out.push(`  ${import_picocolors38.default.dim("BRAINBASE_WEB_URL")}      override the web app URL used by login`);
-  out.push(`  ${import_picocolors38.default.dim("BRAINBASE_API_URL")}      override the API URL used by link / sync`);
-  out.push(`  ${import_picocolors38.default.dim("BRAINBASE_REGISTRY_URL")} override the registry API URL`);
-  out.push(`  ${import_picocolors38.default.dim("BRAINBASE_TOKEN")}        long-lived CLI PAT (overrides token.json)`);
-  out.push(`  ${import_picocolors38.default.dim("BRAINBASE_SKIP_AUTH")}    bypass the auth gate for development`);
+  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("");
   out.push(divider("HARNESSES"));
   out.push("");
-  out.push(`  ${import_picocolors38.default.dim("•")} ${import_picocolors38.default.bold("claude-code")}  ${import_picocolors38.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors38.default.dim("•")} ${import_picocolors38.default.bold("codex")}        ${import_picocolors38.default.dim("skills, mcps, commands, playbooks, instructions, files")}`);
-  out.push(`  ${import_picocolors38.default.dim("•")} ${import_picocolors38.default.bold("kafka")}        ${import_picocolors38.default.dim("skills, mcps, agents, commands, playbooks, instructions, files")}`);
+  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("");
   console.log(out.join(`
 `));
@@ -55094,13 +56043,13 @@ async function requireAuth(cmd) {
   if (status.ok)
     return;
   console.error("");
-  console.error(`  ${brandTint("◆")}  ${import_picocolors38.default.bold("brainbase")}`);
+  console.error(`  ${brandTint("◆")}  ${import_picocolors40.default.bold("brainbase")}`);
   console.error("");
-  console.error(`  ${import_picocolors38.default.red("✗")}  You need to sign in to use ${import_picocolors38.default.bold("brainbase " + cmd)}.`);
+  console.error(`  ${import_picocolors40.default.red("✗")}  You need to sign in to use ${import_picocolors40.default.bold("brainbase " + cmd)}.`);
   if (status.reason)
-    console.error(`     ${import_picocolors38.default.dim(status.reason)}`);
+    console.error(`     ${import_picocolors40.default.dim(status.reason)}`);
   console.error("");
-  console.error(`     Run ${import_picocolors38.default.cyan("brainbase login")} to connect this device.`);
+  console.error(`     Run ${import_picocolors40.default.cyan("brainbase login")} to connect this device.`);
   console.error("");
   process13.exit(1);
 }
@@ -55110,7 +56059,7 @@ async function main() {
   const rawCwd = process13.cwd();
   const cwd2 = (() => {
     try {
-      return fs50.realpathSync(rawCwd);
+      return fs51.realpathSync(rawCwd);
     } catch {
       return rawCwd;
     }
@@ -55137,6 +56086,7 @@ async function main() {
   const agentFlag = getFlag(argv, "--agent");
   const shellFlag = getFlag(argv, "--shell");
   const noTracking = hasFlag2(argv, "--no-tracking");
+  const forceFlag = hasFlag2(argv, "--force");
   const graphOnlyFlag = hasFlag2(argv, "--graph-only");
   const nameFlag = getFlag(argv, "--name");
   const skillVersionFlag = getFlag(argv, "--skill-version");
@@ -55221,7 +56171,8 @@ async function main() {
           tagline: taglineFlag,
           orgId: orgIdFlag,
           teamId: teamIdFlag,
-          noTracking
+          noTracking,
+          force: forceFlag
         });
         break;
       }
@@ -55252,7 +56203,7 @@ async function main() {
         process13.exit(1);
     }
   } catch (err) {
-    console.error(import_picocolors38.default.red(`
+    console.error(import_picocolors40.default.red(`
 ${err.message}`));
     if (process13.env.BRAINBASE_DEBUG)
       console.error(err.stack);