@brainbase-labs/cli 0.13.0 → 0.13.2

package/dist/index.js

@@ -29449,7 +29449,7 @@ function padStart(s, n) {
 // package.json
 var package_default = {
   name: "@brainbase-labs/cli",
-  version: "0.13.0",
+  version: "0.13.2",
   description: "Pack, share, and install agent templates across harnesses (Claude Code, Codex, ...).",
   type: "module",
   bin: {
@@ -51314,6 +51314,45 @@ function assignPlaybookSlugs(titles) {
     return slug;
   });
 }
+function backfillPlaybookIds(playbooks, cloudComponents) {
+  const idBySlug = new Map;
+  for (const c2 of cloudComponents) {
+    if (c2.type !== "playbook")
+      continue;
+    const id = c2.meta?.playbook_id;
+    if (typeof id === "string" && id)
+      idBySlug.set(c2.slug, id);
+  }
+  const slugs = assignPlaybookSlugs(playbooks.map((e2) => e2.title));
+  let changed = false;
+  const next = playbooks.map((entry, i) => {
+    if (entry.id)
+      return entry;
+    const id = idBySlug.get(slugs[i]);
+    if (!id)
+      return entry;
+    changed = true;
+    return { id, ...entry };
+  });
+  return { playbooks: changed ? next : playbooks, changed };
+}
+function stripPlaybookFrontmatter(raw) {
+  const m3 = /^---\s*\n([\s\S]*?)\n---[ \t]*(?:\n|$)/.exec(raw);
+  if (!m3)
+    return { frontmatter: {}, body: raw };
+  let fm = {};
+  try {
+    const parsed = import_yaml2.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).replace(/^\n+/, "") };
+}
+function normalizeInstructionBody(body) {
+  return body.trim();
+}
 
 // src/core/link.ts
 var LINK_DIR = ".brainbase";
@@ -52527,7 +52566,6 @@ 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-diff.ts
 import path46 from "node:path";
@@ -52539,6 +52577,9 @@ function compKey(type, slug) {
 function hashString(s3) {
   return crypto4.createHash("sha256").update(s3).digest("hex");
 }
+function jsonStringAsciiSafe(s3) {
+  return JSON.stringify(s3).replace(/[\u007f-\uffff]/g, (c2) => "\\u" + c2.charCodeAt(0).toString(16).padStart(4, "0"));
+}
 function canonicalJson(value) {
   if (value === null)
     return "null";
@@ -52550,14 +52591,14 @@ function canonicalJson(value) {
     return String(value);
   }
   if (typeof value === "string")
-    return JSON.stringify(value);
+    return jsonStringAsciiSafe(value);
   if (Array.isArray(value)) {
     return "[" + value.map(canonicalJson).join(",") + "]";
   }
   if (typeof value === "object") {
     const obj = value;
     const keys2 = Object.keys(obj).sort();
-    return "{" + keys2.map((k3) => `${JSON.stringify(k3)}:${canonicalJson(obj[k3])}`).join(",") + "}";
+    return "{" + keys2.map((k3) => `${jsonStringAsciiSafe(k3)}:${canonicalJson(obj[k3])}`).join(",") + "}";
   }
   throw new Error(`Unsupported value in canonicalJson: ${typeof value}`);
 }
@@ -52627,7 +52668,7 @@ function readLocalComponents(cwd2, manifest) {
     out.push({
       type: "instruction",
       slug: "agent-instructions",
-      hash: componentHashFromFileHashes([hashString(instr)])
+      hash: componentHashFromFileHashes([hashString(normalizeInstructionBody(instr))])
     });
   }
   for (const entry of manifest.skills) {
@@ -52765,6 +52806,38 @@ function threeWayDiff(input) {
   }
   return rows;
 }
+function partitionPushRows(rows, force) {
+  const toSend = [];
+  const conflicts = [];
+  const upstreamOnly = [];
+  for (const r2 of rows) {
+    switch (r2.status) {
+      case "modified-local":
+      case "added-only-local":
+      case "added-local":
+      case "removed-local":
+        toSend.push(r2);
+        break;
+      case "modified-both":
+        if (force)
+          toSend.push(r2);
+        else
+          conflicts.push(r2);
+        break;
+      case "modified-cloud":
+      case "added-cloud":
+      case "removed-cloud":
+        upstreamOnly.push(r2);
+        break;
+      case "in-sync":
+        break;
+      default: {
+        const _exhaustive = r2.status;
+      }
+    }
+  }
+  return { toSend, conflicts, upstreamOnly };
+}
 function diffAgentMeta(manifestMeta, lockMeta, cloudMeta) {
   const eq = (a3, b4) => {
     if (!a3 && !b4)
@@ -53199,7 +53272,7 @@ function materializeInstructions(cwd2, cloud, toInstall, keepLocal, existingMani
     const targetRel = existingManifest?.instructions?.file ?? DEFAULT_INSTRUCTIONS_FILE;
     const target = path48.resolve(cwd2, targetRel);
     ensureDir(path48.dirname(target));
-    fs45.writeFileSync(target, body, "utf8");
+    fs45.writeFileSync(target, normalizeInstructionBody(body), "utf8");
   }
 }
 function materializePlaybooks(cwd2, cloud, toInstall, keepLocal, existingManifest) {
@@ -53214,7 +53287,7 @@ function materializePlaybooks(cwd2, cloud, toInstall, keepLocal, existingManifes
     const raw = c2.files[0]?.content ?? "";
     if (!raw.trim())
       continue;
-    const { body } = stripFrontmatter(raw);
+    const { body } = stripPlaybookFrontmatter(raw);
     const existing = existingManifest?.playbooks?.find((p2) => slugifyPlaybookTitle(p2.title) === c2.slug);
     if (existing?.content?.text !== undefined)
       continue;
@@ -53224,20 +53297,6 @@ function materializePlaybooks(cwd2, cloud, toInstall, keepLocal, existingManifes
     fs45.writeFileSync(target, body, "utf8");
   }
 }
-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, cloudAgent, harness) {
   const skills = cloud.components.filter((c2) => c2.type === "skill").map((c2) => {
     const localDecl = prev?.skills.find((s3) => {
@@ -53275,7 +53334,7 @@ function mergeManifest(cwd2, prev, cloud, cloudAgent, harness) {
   }
   const playbooks = cloud.components.filter((c2) => c2.type === "playbook").map((c2) => {
     const raw = c2.files[0]?.content ?? "";
-    const { frontmatter } = stripFrontmatter(raw);
+    const { frontmatter } = stripPlaybookFrontmatter(raw);
     const local = prev?.playbooks?.find((pb) => slugifyPlaybookTitle(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);
@@ -53540,10 +53599,11 @@ async function buildOutgoingComponents(cwd2, manifest, cloud, resolvedVersions)
     }
     if (body.trim()) {
       const fileName = manifest.instructions.file ?? "instructions.md";
-      const fileHash2 = hashString(body);
+      const wireBody = normalizeInstructionBody(body);
+      const fileHash2 = hashString(wireBody);
       const file = {
         path: fileName,
-        content: body,
+        content: wireBody,
         hash: fileHash2
       };
       out.push({
@@ -53856,26 +53916,8 @@ async function runAgentPush(cwd2, args) {
     f2.error(`Playbook ${preIdSchemaSlugs.length === 1 ? "entry" : "entries"} ${preIdSchemaSlugs.map((s3) => import_picocolors27.default.bold(s3)).join(", ")} in ${import_picocolors27.default.bold("brainbase.agent.yaml")} ${preIdSchemaSlugs.length === 1 ? "is" : "are"} missing ${import_picocolors27.default.cyan("id:")}. Run ${import_picocolors27.default.bold("brainbase agent pull")} first to sync playbook ids, then push.`);
     return;
   }
-  const toSend = [];
-  const conflicts = [];
-  const upstreamOnly = [];
-  for (const r2 of rows) {
-    switch (r2.status) {
-      case "modified-local":
-      case "added-only-local":
-      case "removed-local":
-        toSend.push(r2);
-        break;
-      case "modified-both":
-        conflicts.push(r2);
-        break;
-      case "modified-cloud":
-      case "added-cloud":
-      case "removed-cloud":
-        upstreamOnly.push(r2);
-        break;
-    }
-  }
+  const { toSend, conflicts, upstreamOnly } = partitionPushRows(rows, !!args.force);
+  const forcedOverrides = args.force ? rows.filter((r2) => r2.status === "modified-both") : [];
   if (!meta.localChanged && !entrypointChanged && toSend.length === 0 && conflicts.length === 0) {
     f2.info("Nothing to push — local is in sync with the cloud.");
     return;
@@ -53885,9 +53927,15 @@ async function runAgentPush(cwd2, args) {
     for (const r2 of conflicts) {
       console.error(`  ${import_picocolors27.default.red("!")} ${fmtType(r2.type)} ${import_picocolors27.default.bold(r2.slug)}`);
     }
-    f2.info(`Run ${import_picocolors27.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 — or ${import_picocolors27.default.cyan("brainbase agent push --force")} to overwrite the cloud with your local version.`);
     return;
   }
+  if (forcedOverrides.length > 0) {
+    f2.warn(`${import_picocolors27.default.yellow("--force")}: overwriting ${forcedOverrides.length} cloud change${forcedOverrides.length === 1 ? "" : "s"} with your local version (cloud edits discarded):`);
+    for (const r2 of forcedOverrides) {
+      console.warn(`  ${import_picocolors27.default.yellow("⤒")} ${fmtType(r2.type)} ${import_picocolors27.default.bold(r2.slug)}`);
+    }
+  }
   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) {
@@ -53981,6 +54029,11 @@ async function runAgentPush(cwd2, args) {
     }
     return handleApiError3(err);
   }
+  const backfill = backfillPlaybookIds(manifest.playbooks ?? [], updatedCloud.components);
+  if (backfill.changed) {
+    manifest.playbooks = backfill.playbooks;
+    writeManifest(cwd2, manifest);
+  }
   const existing = readLink(cwd2);
   if (existing) {
     writeLink(cwd2, {
@@ -54542,6 +54595,11 @@ async function runAgentCreate(cwd2, args) {
     }
   }
   if (updatedCloud) {
+    const backfill = backfillPlaybookIds(manifest.playbooks ?? [], updatedCloud.components);
+    if (backfill.changed) {
+      manifest.playbooks = backfill.playbooks;
+      writeManifest(cwd2, manifest);
+    }
     const localHashByKey = new Map;
     for (const lc of readLocalComponents(cwd2, manifest)) {
       if (lc.hash)
@@ -54947,7 +55005,7 @@ async function runAgent(cwd2, sub, args, opts) {
       });
       return;
     case "push":
-      await runAgentPush(cwd2, { yes: opts.yes });
+      await runAgentPush(cwd2, { yes: opts.yes, force: opts.force });
       return;
     case "unpack":
       await runAgentUnpack(cwd2, {
@@ -54982,7 +55040,7 @@ function printHelp() {
   out.push("");
   out.push(`  ${import_picocolors32.default.cyan("create")}             ${import_picocolors32.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
   out.push(`  ${import_picocolors32.default.cyan("pull")} ${import_picocolors32.default.dim("[<id>]")}      ${import_picocolors32.default.dim("apply cloud changes into this folder — pass <id> to switch (--force to override); --run-entrypoint to also execute the agent entrypoint")}`);
-  out.push(`  ${import_picocolors32.default.cyan("push")}               ${import_picocolors32.default.dim("send local changes to the cloud — instructions, playbooks, skills, MCPs, entrypoint")}`);
+  out.push(`  ${import_picocolors32.default.cyan("push")}               ${import_picocolors32.default.dim("send local changes to the cloud — instructions, playbooks, skills, MCPs, entrypoint (--force to overwrite cloud-side conflicts with local)")}`);
   out.push(`  ${import_picocolors32.default.cyan("unpack")}             ${import_picocolors32.default.dim("install the claimed agent into a harness layout (--harness to override)")}`);
   out.push(`  ${import_picocolors32.default.cyan("status")}             ${import_picocolors32.default.dim("show what would push and what would pull")}`);
   out.push(`  ${import_picocolors32.default.cyan("env")}                ${import_picocolors32.default.dim('print export statements — use with `eval "$(brainbase agent env)"`')}`);
@@ -55002,7 +55060,7 @@ var import_picocolors33 = __toESM(require_picocolors(), 1);
 // src/core/orchestration-manifest.ts
 import path51 from "node:path";
 import fs47 from "node:fs";
-var import_yaml4 = __toESM(require_dist(), 1);
+var import_yaml3 = __toESM(require_dist(), 1);
 var ORCH_MANIFEST_FILE = "brainbase-orchestration.yaml";
 var ORCH_MEMBERS_DIR = "agents";
 var OrchMetaSchema = exports_external.object({
@@ -55054,7 +55112,7 @@ function readOrchManifest(cwd2) {
   const raw = fs47.readFileSync(p2, "utf8");
   let parsed;
   try {
-    parsed = import_yaml4.default.parse(raw);
+    parsed = import_yaml3.default.parse(raw);
   } catch (err) {
     throw new Error(`${ORCH_MANIFEST_FILE} is not valid YAML: ${err.message}`);
   }
@@ -55065,7 +55123,7 @@ function readOrchManifest(cwd2) {
   return result2.data;
 }
 function writeOrchManifest(cwd2, manifest) {
-  const doc = new import_yaml4.default.Document;
+  const doc = new import_yaml3.default.Document;
   doc.contents = manifest;
   doc.commentBefore = ` brainbase-orchestration.yaml — declarative orchestration manifest.
 ` + ` Committed to source control. Edit by hand, then
@@ -56920,7 +56978,7 @@ function help() {
   out.push("");
   out.push(`  ${import_picocolors41.default.cyan("agent create")}               ${import_picocolors41.default.dim("claim an unclaimed brainbase.agent.yaml and create the cloud agent")}`);
   out.push(`  ${import_picocolors41.default.cyan("agent pull")} ${import_picocolors41.default.dim("[<id>]")}          ${import_picocolors41.default.dim("bring cloud changes into this folder (--force to override; --run-entrypoint to also execute the agent entrypoint)")}`);
-  out.push(`  ${import_picocolors41.default.cyan("agent push")}                 ${import_picocolors41.default.dim("send local changes to the cloud — instructions, playbooks, skills, MCPs, entrypoint")}`);
+  out.push(`  ${import_picocolors41.default.cyan("agent push")}                 ${import_picocolors41.default.dim("send local changes to the cloud (--force to overwrite cloud-side conflicts with local)")}`);
   out.push(`  ${import_picocolors41.default.cyan("agent unpack")}               ${import_picocolors41.default.dim("install the claimed agent into a harness layout")}`);
   out.push(`  ${import_picocolors41.default.cyan("link")}                       ${import_picocolors41.default.dim("attach this folder to an existing agent")}`);
   out.push(`  ${import_picocolors41.default.cyan("agent status")}               ${import_picocolors41.default.dim("show what would pull and what would push")}`);

package/package.json

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