@bridge-ds/cli 0.4.0 → 0.5.0

package/dist/index.js

@@ -2,8 +2,8 @@
 
 // src/index.ts
 import { existsSync as existsSync6 } from "node:fs";
-import { readFile as readFile6, writeFile as writeFile5 } from "node:fs/promises";
-import { isAbsolute, join as join6, relative as relative4, resolve as resolve3 } from "node:path";
+import { readFile as readFile7, writeFile as writeFile5 } from "node:fs/promises";
+import { isAbsolute, join as join6, relative as relative4, resolve as resolve4 } from "node:path";
 
 // ../core/src/audit/types.ts
 var AUDIT_SCHEMA_VERSION = 1;
@@ -2182,10 +2182,10 @@ function assertSafeBranch(branch, rules = {}) {
 
 // ../core/src/node/git-local.ts
 function git(root, args, opts = {}) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve5, reject) => {
     const child = execFile("git", args, { cwd: root, env: { ...process.env, ...opts.env }, maxBuffer: 32 * 1024 * 1024 }, (err, stdout, stderr) => {
       if (err) reject(new Error(`git ${args.join(" ")}: ${stderr || err.message}`.trim()));
-      else resolve4(stdout);
+      else resolve5(stdout);
     });
     if (opts.input !== void 0) child.stdin.end(opts.input);
   });
@@ -2432,6 +2432,47 @@ function visualImpactProblems(raw) {
   return out;
 }
 
+// ../core/src/products.ts
+var DEFAULT_PRODUCTS = [
+  { key: "admin", name: "Admin demo", path: "apps/admin", framework: "react" },
+  { key: "library", name: "Library", default: true }
+];
+var KEY = /^[a-z0-9][a-z0-9-]*$/;
+var REPO = /^[\w.-]+\/[\w.-]+$/;
+var FIELDS = ["key", "name", "repo", "path", "preview", "framework", "default"];
+function productProblems(raw) {
+  if (raw === void 0) return [];
+  if (!Array.isArray(raw)) return ['"products" must be a list of { "key", "name" } objects'];
+  if (!raw.length) return ['"products" must list at least one product, or be left out to use the defaults'];
+  const problems = [];
+  const seen = /* @__PURE__ */ new Set();
+  let defaults = 0;
+  raw.forEach((p, i) => {
+    const at = `"products[${i}]`;
+    if (!p || typeof p !== "object" || Array.isArray(p)) {
+      problems.push(`${at}" must be an object with a "key" and a "name"`);
+      return;
+    }
+    const o = p;
+    for (const k of Object.keys(o)) if (!FIELDS.includes(k)) problems.push(`${at}.${k}" is not a known field (${FIELDS.join(", ")})`);
+    if (typeof o.key !== "string" || !KEY.test(o.key)) problems.push(`${at}.key" must be lowercase letters, digits and dashes, such as "admin"`);
+    else if (seen.has(o.key)) problems.push(`${at}.key" ("${o.key}") is used twice: give each product its own key`);
+    else seen.add(o.key);
+    if (typeof o.name !== "string" || !o.name.trim()) problems.push(`${at}.name" must be the name people read, such as "Admin demo"`);
+    if (o.repo !== void 0 && (typeof o.repo !== "string" || !REPO.test(o.repo))) problems.push(`${at}.repo" must be "owner/name"`);
+    if (o.path !== void 0) {
+      const bad = typeof o.path !== "string" || !o.path.trim() || o.path.startsWith("/") || o.path.split("/").includes("..");
+      if (bad) problems.push(`${at}.path" must be a folder relative to the repository root, without a leading "/" or "..", such as "apps/admin"`);
+    }
+    if (o.preview !== void 0 && (typeof o.preview !== "string" || !/^https?:\/\//.test(o.preview))) problems.push(`${at}.preview" must be an http(s) URL template, such as "https://app-git-{branch}.vercel.app"`);
+    if (o.framework !== void 0 && (typeof o.framework !== "string" || !o.framework.trim())) problems.push(`${at}.framework" must be a name such as "react", "vue" or "other"`);
+    if (o.default !== void 0 && typeof o.default !== "boolean") problems.push(`${at}.default" must be true or false`);
+    if (o.default === true) defaults++;
+  });
+  if (defaults > 1) problems.push('"products" marks more than one product as default: keep "default": true on the library only');
+  return problems;
+}
+
 // ../core/src/config.ts
 var CONFIG_FILE = "bridge.config.json";
 var DEFAULT_OVERRIDE = { allowed: [], requireReason: true, minReasonLength: 20 };
@@ -2572,6 +2613,7 @@ function defineConfig(input) {
       } : {},
       ...g.rights ? { rights: normalizeRights(g.rights) } : {}
     },
+    products: input.products?.length ? input.products.map((p) => ({ ...p })) : DEFAULT_PRODUCTS.map((p) => ({ ...p })),
     ...input.audit ? { audit: { ...input.audit } } : {},
     ...input.visualImpact ? { visualImpact: { mode: input.visualImpact.mode === "on-demand" ? "on-demand" : "auto" } } : {},
     ...input.integrations ? { integrations: { ...input.integrations } } : {},
@@ -2694,6 +2736,7 @@ function loadConfig(source) {
     }
   }
   problems.push(...visualImpactProblems(d.visualImpact));
+  problems.push(...productProblems(d.products));
   const audit2 = d.audit;
   if (audit2 !== void 0) {
     if (!isObj(audit2)) problems.push('"audit" must be an object');
@@ -3624,7 +3667,7 @@ var GitHubClient = class _GitHubClient {
   }
   async getPullRequest(n) {
     const r = await this.request("GET", `${this.repoPath}/pulls/${n}`);
-    return { ...toSummary(r), body: r.body ?? "", mergeable: r.mergeable ?? null };
+    return { ...toSummary(r), body: r.body ?? "", mergeable: r.mergeable ?? null, requestedReviewers: (r.requested_reviewers ?? []).map((x) => x.login) };
   }
   async listPullRequestFiles(n) {
     const r = await this.request("GET", `${this.repoPath}/pulls/${n}/files?per_page=100`);
@@ -3701,6 +3744,100 @@ var GitHubClient = class _GitHubClient {
   async removeLabel(issueNumber2, label) {
     await this.request("DELETE", `${this.repoPath}/issues/${issueNumber2}/labels/${encodeURIComponent(label)}`);
   }
+  // --- branch actions shared by Studio, the MCP server and the CLI (branch-actions.ts) ---
+  /** The account the token belongs to (GET /user). Needs a token. */
+  async getViewer() {
+    this.assertToken("Reading who you are on GitHub");
+    const r = await this.request("GET", "/user");
+    return { login: r.login };
+  }
+  /** The repository's merge settings and the viewer's permissions (unknown settings count as allowed). */
+  async getMergeSettings() {
+    return this.request("GET", this.repoPath);
+  }
+  /**
+   * Merges a pull request, only at `sha` (GitHub refuses when the branch moved meanwhile). The repository's branch
+   * rules still apply: GitHub refuses a merge they block, whatever Bridge says.
+   */
+  async mergePullRequest(n, input) {
+    this.assertToken("Merging a branch");
+    const r = await this.request("PUT", `${this.repoPath}/pulls/${n}/merge`, {
+      merge_method: input.method,
+      sha: input.sha,
+      ...input.commitMessage !== void 0 && input.method !== "rebase" ? { commit_message: input.commitMessage } : {}
+    });
+    return { sha: r?.sha ?? "", merged: r?.merged ?? true };
+  }
+  /** GitHub's "Update branch": merges the base into the pull request, only when its head is still `expectedHeadSha`. */
+  async updatePullRequestBranch(n, expectedHeadSha) {
+    this.assertToken("Updating a branch from main");
+    await this.request("PUT", `${this.repoPath}/pulls/${n}/update-branch`, { expected_head_sha: expectedHeadSha });
+  }
+  /** Posts a comment on an issue or pull request and returns its id and link. */
+  async createIssueComment(n, body) {
+    this.assertToken("Commenting");
+    const r = await this.request("POST", `${this.repoPath}/issues/${n}/comments`, { body });
+    return { id: r.id, url: r.html_url };
+  }
+  /** Replaces the text of a comment. */
+  async updateIssueComment(id, body) {
+    this.assertToken("Editing a comment");
+    await this.request("PATCH", `${this.repoPath}/issues/comments/${id}`, { body });
+  }
+  /** Submits a review on a given commit (the head the reviewer saw); the body may be empty for an approval. */
+  async submitReview(n, input) {
+    this.assertToken("Reviewing a branch");
+    const r = await this.request("POST", `${this.repoPath}/pulls/${n}/reviews`, {
+      event: input.event,
+      ...input.body ? { body: input.body } : {},
+      ...input.commitId ? { commit_id: input.commitId } : {}
+    });
+    return { id: r.id, user: r.user?.login, state: r.state, body: r.body ?? "" };
+  }
+  /** Line comments of a pull request (review threads), oldest first. */
+  async listReviewComments(n) {
+    const r = await this.request(
+      "GET",
+      `${this.repoPath}/pulls/${n}/comments?per_page=100`
+    );
+    return r.map((c) => ({ id: c.id, body: c.body ?? "", author: c.user?.login ?? "unknown", path: c.path, line: c.line ?? null, inReplyTo: c.in_reply_to_id ?? null, url: c.html_url, createdAt: c.created_at }));
+  }
+  /** Asks these people to review a pull request. */
+  async requestReviewers(n, logins) {
+    this.assertToken("Asking for a review");
+    await this.request("POST", `${this.repoPath}/pulls/${n}/requested_reviewers`, { reviewers: logins });
+  }
+  /** Takes these people off the requested reviewers. */
+  async removeRequestedReviewers(n, logins) {
+    this.assertToken("Changing the requested reviewers");
+    await this.request("DELETE", `${this.repoPath}/pulls/${n}/requested_reviewers`, { reviewers: logins });
+  }
+  /** Replies in the thread of a line comment. */
+  async replyToReviewComment(n, commentId, body) {
+    this.assertToken("Replying to a comment");
+    const r = await this.request("POST", `${this.repoPath}/pulls/${n}/comments/${commentId}/replies`, { body });
+    return { id: r.id, url: r.html_url };
+  }
+  /**
+   * What `head` adds on top of `base`, with what library sync needs: the shared start (merge base), the base
+   * commit and its tree, how far behind, and the files with their previous names.
+   */
+  async compareDetailed(base, head) {
+    const r = await this.request("GET", `${this.repoPath}/compare/${encodeRef(base)}...${encodeRef(head)}`);
+    return {
+      behindBy: r.behind_by,
+      aheadBy: r.ahead_by,
+      mergeBase: r.merge_base_commit?.sha ?? null,
+      baseSha: r.base_commit?.sha ?? null,
+      baseTree: r.base_commit?.commit?.tree?.sha ?? null,
+      files: (r.files ?? []).map((f) => ({ filename: f.filename, status: f.status, ...f.previous_filename ? { previous_filename: f.previous_filename } : {} }))
+    };
+  }
+  /** A tree on top of `baseTree` from entries with their own file mode (blob sha, inline content, or sha null to delete). */
+  async createTreeEntries(baseTree, entries) {
+    const r = await this.request("POST", `${this.repoPath}/git/trees`, { base_tree: baseTree, tree: entries.map((e) => ({ ...e, type: "blob" })) }, true);
+    return r.sha;
+  }
 };
 function toCommitSummary(c) {
   return {
@@ -4162,15 +4299,15 @@ async function shoot(page, r) {
 }
 async function switchStory(page, storyId2) {
   const ok = await page.evaluate(
-    (id) => new Promise((resolve4) => {
+    (id) => new Promise((resolve5) => {
       const ch = window.__STORYBOOK_ADDONS_CHANNEL__;
-      if (!ch) return resolve4(false);
+      if (!ch) return resolve5(false);
       const events = ["storyRendered", "storyErrored", "storyThrewException", "storyMissing", "playFunctionThrewException"];
       const timer = setTimeout(() => done(), 15e3);
       function done() {
         clearTimeout(timer);
         for (const e of events) ch.off(e, done);
-        resolve4(true);
+        resolve5(true);
       }
       for (const e of events) ch.on(e, done);
       window.scrollTo(0, 0);
@@ -4583,12 +4720,12 @@ function serveDir(dir) {
     res.writeHead(200, { "content-type": TYPES[extname(file)] ?? "application/octet-stream", "cache-control": "no-store" });
     createReadStream(file).pipe(res);
   });
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve5, reject) => {
     server.once("error", reject);
     server.listen(0, "127.0.0.1", () => {
       const addr = server.address();
       const port = typeof addr === "object" && addr ? addr.port : 0;
-      resolve4({ url: `http://127.0.0.1:${port}`, close: () => new Promise((r) => server.close(() => r())) });
+      resolve5({ url: `http://127.0.0.1:${port}`, close: () => new Promise((r) => server.close(() => r())) });
     });
   });
 }
@@ -4660,7 +4797,7 @@ async function removeWorktree(repo, dir) {
   await git(repo, ["worktree", "prune"]).catch(() => void 0);
 }
 function run(cmd, args, cwd, log, root = cwd, env = {}) {
-  return new Promise((resolve4, reject) => {
+  return new Promise((resolve5, reject) => {
     const bin = [.../* @__PURE__ */ new Set([join3(cwd, "node_modules", ".bin"), join3(root, "node_modules", ".bin")])].join(":");
     const child = spawn(cmd, args, {
       cwd,
@@ -4673,7 +4810,7 @@ function run(cmd, args, cwd, log, root = cwd, env = {}) {
     child.stderr.on("data", keep);
     child.on("error", reject);
     child.on("close", (code) => {
-      if (code === 0) resolve4();
+      if (code === 0) resolve5();
       else {
         log(tail);
         reject(new Error(`${cmd} ${args.join(" ")} failed in ${cwd} (exit ${code})`));
@@ -5084,12 +5221,12 @@ async function captureFigmaReferences(o) {
       }
       const plan = JSON.stringify(j.plan.render);
       await page.evaluate(
-        ({ id, plan: plan2 }) => new Promise((resolve4) => {
+        ({ id, plan: plan2 }) => new Promise((resolve5) => {
           const ch = window.__STORYBOOK_ADDONS_CHANNEL__;
           const done = () => {
             clearTimeout(timer);
             ch.off("storyRendered", done);
-            resolve4();
+            resolve5();
           };
           const timer = setTimeout(done, 1e4);
           ch.on("storyRendered", done);
@@ -5233,7 +5370,7 @@ Usage:
                      --branch: implement it on that exploration, never in a pull request to main
   bridge request create --component Button --kind new-variant --title "Add a danger ghost variant"
                      --summary "..." [--change field=before:after ...] [--figma url]
-                     [--exploration explore/<name>] [--dry-run] [--json]
+                     [--exploration explore/<name>] [--product <key>] [--dry-run] [--json]
   bridge request jira-sync
                      GitHub Action step: mirror a request issue to Jira (see docs/REQUESTS.md)
 
@@ -5388,6 +5525,7 @@ Claude Code is not installed (no \`claude\` on PATH). Install it (npm install -g
         changes: (a.flags.change ?? []).map(parseChange),
         ...figma ? { figmaUrl: figma } : {},
         ...exploration ? { exploration } : {},
+        ...flag(a, "product") ? { product: flag(a, "product") } : {},
         source: "cli",
         dryRun
       });
@@ -5433,7 +5571,7 @@ staging branch without touching main (an explore/<name> branch with a draft pull
 
 Usage:
   bridge explore start <name> --purpose "..." [--use-case ${EXPLORATION_USE_CASES.map((u) => u.value).join("|")}]
-                       [--experimental "..." ...] [--dry-run] [--json]
+                       [--experimental "..." ...] [--product <key>] [--dry-run] [--json]
                      GitHub token: the branch and the draft pull request on GitHub. Without one, in a git repo:
                      a local branch only, nothing pushed
   bridge explore list [--all] [--json]
@@ -5471,7 +5609,7 @@ async function runExplore(a, root, io = defaultIO()) {
       if (!name || !purpose) throw new RequestUsageError('Usage: bridge explore start <name> --purpose "What you want to learn"');
       const useCase = flag2(a, "use-case");
       const ctx = await context2(root, io);
-      const r = await explorations.startExploration(ctx, { name, purpose, ...exploreSource(io.env), ...useCase ? { useCase } : {}, ...a.flags.experimental ? { experimental: a.flags.experimental } : {}, dryRun: has2(a, "dry-run") });
+      const r = await explorations.startExploration(ctx, { name, purpose, ...exploreSource(io.env), ...useCase ? { useCase } : {}, ...a.flags.experimental ? { experimental: a.flags.experimental } : {}, ...flag2(a, "product") ? { product: flag2(a, "product") } : {}, dryRun: has2(a, "dry-run") });
       if (json) return io.print(JSON.stringify(r, null, 2)), 0;
       if (r.status === "dry-run") {
         io.print(`Dry run, nothing written.
@@ -5541,6 +5679,231 @@ ${EXPLORE_HELP}`);
   }
 }
 
+// src/branch.ts
+import { readFile as readFile6 } from "node:fs/promises";
+import { resolve as resolve3 } from "node:path";
+import { BridgeContext as BridgeContext4, branches, studio } from "@bridge-ds/mcp";
+var BRANCH_HELP = `bridge branch: branches in review, the same actions as Bridge Studio
+
+Usage:
+  bridge branch list [--limit 20] [--json]      what needs me: the review queue, mine first
+  bridge branch status <n> [--json]             status, approvals, tests, main, may I merge, next step
+  bridge branch comments <n> [--json]           the conversation and line threads (ids to reply to)
+  bridge branch ready <n>                       send a draft for review (its author)
+  bridge branch draft <n>                       back to draft (its author)
+  bridge branch review <n> --approve [--body "..."] | --request-changes "..." | --comment "..."
+  bridge branch ask <n> [--dry-run]              ask someone else to review (who can give the missing approvals)
+  bridge branch comment <n> "text" [--reply-to <id>]
+  bridge branch merge <n> [--override "reason"] [--dry-run]
+                                                same gate as the Merge button; --override: owner override,
+                                                the reason is posted on the branch first
+  bridge branch close <n> | bridge branch reopen <n>
+  bridge branch update <n> [--choice <key>=mine|theirs ...] [--dry-run]
+                                                update from main; token conflicts: pick per key
+  bridge branch try <n> [--json]                try it in a product, share it with a product team
+  bridge branch combine <n> <n> [<n> <n>] [--pick <key>=<n> ...] [--json]
+                                                try 2 to 4 token branches together (writes nothing)
+  bridge products [--json]                      the products and the one this folder belongs to
+  bridge settings [--json]                      roles, who ships, owner override, protection, products
+  bridge coverage [Component] [--json]          which components are in Figma
+  bridge docs save <Component> --file docs.json [--pr <n>] [--title "..."] [--jira DS-42]
+                   [--product admin] [--dry-run] [--json]
+                                                save usage guidance as in the Library edit mode
+
+Start work for a product: bridge propose|explore start|request create ... --product <key> [--jira DS-42].
+GitHub token: GITHUB_TOKEN or BRIDGE_GITHUB_TOKEN, else \`gh auth token\`. Exit codes: 0 ok, 2 usage or setup error.`;
+var flag3 = (a, k) => a.flags[k]?.[a.flags[k].length - 1];
+var has3 = (a, k) => Boolean(a.flags[k]);
+async function context3(root, io) {
+  const token = io.env.BRIDGE_GITHUB_TOKEN || io.env.GITHUB_TOKEN || io.ghToken();
+  return BridgeContext4.create({ root, ...token ? { token } : {}, ...io.fetch ? { fetch: io.fetch } : {} });
+}
+function number(a, at, usage) {
+  const raw = a._[at];
+  if (!raw) throw new RequestUsageError(`Usage: ${usage}`);
+  return branches.branchNumber(raw);
+}
+function pairs(list2, what) {
+  const out = {};
+  for (const s of list2 ?? []) {
+    const i = s.lastIndexOf("=");
+    if (i <= 0) throw new RequestUsageError(`--${what} needs key=value, got "${s}".`);
+    out[s.slice(0, i)] = s.slice(i + 1);
+  }
+  return out;
+}
+var said = (r) => String(r.said ?? r.summary ?? r.status ?? "Done.");
+async function runBranch(a, root, io = defaultIO()) {
+  const sub = a._[1];
+  if (!sub || sub === "help" || has3(a, "help")) {
+    io.print(BRANCH_HELP);
+    return sub || has3(a, "help") ? 0 : 2;
+  }
+  const json = has3(a, "json");
+  const ctx = await context3(root, io);
+  const out = (r, text) => (json ? io.print(JSON.stringify(r, null, 2)) : text(), 0);
+  switch (sub) {
+    case "list": {
+      const limit = flag3(a, "limit");
+      const r = await branches.whatNeedsMe(ctx, limit ? { limit: Number(limit) } : {});
+      return out(r, () => {
+        io.print(r.summary);
+        for (const b of r.branches) io.print(`#${b.pr}  ${b.statusLabel.padEnd(22)} ${b.title}${b.needsYou ? `  <- ${b.needsYou}` : ""}`);
+      });
+    }
+    case "status": {
+      const r = await branches.branchStatus(ctx, { pr: number(a, 2, "bridge branch status <n>") });
+      return out(r, () => {
+        io.print(`#${r.pr} ${r.title} (${r.product.name})`);
+        io.print(`${r.status.label}. ${r.approvalNeeded} needed; approved by ${r.approvals.approvedBy.map((x) => `@${x}`).join(", ") || "nobody yet"}.`);
+        if (r.merge.blockedBy?.length) for (const x of r.merge.blockedBy) io.print(`  ${x}`);
+        io.print(`Next: ${r.next}`);
+        io.print(r.url);
+      });
+    }
+    case "comments": {
+      const r = await branches.listComments(ctx, { pr: number(a, 2, "bridge branch comments <n>") });
+      return out(r, () => {
+        for (const c of r.conversation) io.print(`@${c.author}: ${c.body}`);
+        for (const t of r.threads) io.print(`[thread ${t.id}] ${t.file}:${t.line ?? ""} @${t.author}: ${t.body}${t.replies.length ? ` (${t.replies.length} replies)` : ""}`);
+      });
+    }
+    case "ready": {
+      const r = await branches.sendForReview(ctx, { pr: number(a, 2, "bridge branch ready <n>") });
+      return out(r, () => io.print(r.said));
+    }
+    case "draft": {
+      const r = await branches.backToDraft(ctx, { pr: number(a, 2, "bridge branch draft <n>") });
+      return out(r, () => io.print(r.said));
+    }
+    case "review": {
+      const n = number(a, 2, 'bridge branch review <n> --approve | --request-changes "..." | --comment "..."');
+      const decision = has3(a, "approve") ? "approve" : has3(a, "request-changes") ? "request_changes" : has3(a, "comment") ? "comment" : null;
+      if (!decision) throw new RequestUsageError('Say what you decide: --approve, --request-changes "what to change" or --comment "text".');
+      const body = decision === "approve" ? flag3(a, "body") : flag3(a, decision === "request_changes" ? "request-changes" : "comment");
+      const r = await branches.reviewBranch(ctx, { pr: n, decision, ...body && body !== "true" ? { body } : {} });
+      return out(r, () => io.print(r.said));
+    }
+    case "ask": {
+      const r = await branches.askSomeoneElse(ctx, { pr: number(a, 2, "bridge branch ask <n>"), dryRun: has3(a, "dry-run") });
+      return out(r, () => io.print(r.said));
+    }
+    case "comment": {
+      const n = number(a, 2, 'bridge branch comment <n> "text"');
+      const body = a._.slice(3).join(" ") || flag3(a, "body");
+      if (!body) throw new RequestUsageError('Usage: bridge branch comment <n> "text" [--reply-to <id>]');
+      const reply = flag3(a, "reply-to");
+      const r = await branches.commentOnBranch(ctx, { pr: n, body, ...reply ? { replyTo: Number(reply) } : {} });
+      return out(r, () => io.print(r.said));
+    }
+    case "merge": {
+      const n = number(a, 2, 'bridge branch merge <n> [--override "reason"] [--dry-run]');
+      const reason = flag3(a, "override");
+      const r = await branches.mergeBranch(ctx, { pr: n, ...reason ? { overrideReason: reason } : {}, dryRun: has3(a, "dry-run") });
+      return out(r, () => io.print(r.said));
+    }
+    case "close": {
+      const r = await branches.closeBranch(ctx, { pr: number(a, 2, "bridge branch close <n>") });
+      return out(r, () => io.print(r.said));
+    }
+    case "reopen": {
+      const r = await branches.reopenBranch(ctx, { pr: number(a, 2, "bridge branch reopen <n>") });
+      return out(r, () => io.print(r.said));
+    }
+    case "update": {
+      const n = number(a, 2, "bridge branch update <n> [--choice key=mine|theirs] [--dry-run]");
+      const choices = pairs(a.flags.choice, "choice");
+      for (const [k, v] of Object.entries(choices)) if (v !== "mine" && v !== "theirs") throw new RequestUsageError(`--choice ${k}= takes mine or theirs, got "${v}".`);
+      const r = await branches.updateFromMain(ctx, { pr: n, ...Object.keys(choices).length ? { choices } : {}, dryRun: has3(a, "dry-run") });
+      return out(r, () => {
+        io.print(said(r));
+        for (const c of r.conflicts ?? []) io.print(`  ${c.key}  (${c.token}, default ${c.default ?? "none: pick one"})`);
+      });
+    }
+    case "try": {
+      const r = await branches.tryBranch(ctx, { pr: number(a, 2, "bridge branch try <n>") });
+      return out(r, () => {
+        for (const p of r.tryInProduct) io.print(`${p.name}: ${p.url ?? p.how}`);
+        io.print(`
+Share with a product team: ${r.share.install ? r.share.install : r.share.sentence}`);
+      });
+    }
+    case "combine": {
+      const prs = a._.slice(2);
+      const picks = Object.fromEntries(Object.entries(pairs(a.flags.pick, "pick")).map(([k, v]) => [k, branches.branchNumber(v)]));
+      const r = await branches.combineBranches(ctx, { prs, ...Object.keys(picks).length ? { picks } : {} });
+      return out(r, () => {
+        io.print(`${r.tokens} tokens change together.`);
+        for (const c of r.conflicts) io.print(`  ${c.key}: pick one of ${c.options.map((o) => `#${o.use}`).join(", ")}${c.picked ? ` (picked #${c.picked})` : ""}`);
+        for (const [k, v] of Object.entries(r.open)) io.print(`${k}: ${v}`);
+        io.print(r.next);
+      });
+    }
+    default:
+      throw new RequestUsageError(`Unknown branch command "${sub}".
+
+${BRANCH_HELP}`);
+  }
+}
+async function runStudioRead(cmd, a, root, io = defaultIO()) {
+  const ctx = await context3(root, io);
+  const json = has3(a, "json");
+  if (cmd === "products") {
+    const r2 = await branches.listProducts(ctx);
+    if (json) return io.print(JSON.stringify(r2, null, 2)), 0;
+    for (const p of r2.products) io.print(`${p.key === r2.current.key ? "*" : " "} ${p.key.padEnd(12)} ${p.name}${p.default ? " (default)" : ""}${p.path ? `  ${p.path}` : ""}${p.repo ? `  ${p.repo}` : ""}`);
+    io.print(`
+This folder: ${r2.current.name}. Pick another with --product <key>.`);
+    return 0;
+  }
+  if (cmd === "settings") {
+    const r2 = await studio.getSettings(ctx);
+    if (json) return io.print(JSON.stringify(r2, null, 2)), 0;
+    io.print(`Design approval: ${r2.roles.designApproval.join(", ") || "any reviewer"}`);
+    io.print(`Tech approval: ${r2.roles.techApproval.join(", ") || "any reviewer"}`);
+    io.print(`Merge: ${r2.roles.ship}`);
+    io.print(`Owner override: ${r2.ownerOverride.on ? `${r2.ownerOverride.who.join(", ")}. ${r2.ownerOverride.reason}` : r2.ownerOverride.reason}`);
+    io.print(`Protection: ${r2.protection}`);
+    io.print(`Products: ${r2.products.map((p) => p.name).join(", ")}`);
+    return 0;
+  }
+  const r = await studio.figmaCoverage(ctx, a._[1] ? { component: a._[1] } : {});
+  if (json) return io.print(JSON.stringify(r, null, 2)), 0;
+  io.print(r.summary);
+  for (const c of r.components) io.print(`  ${c.name.padEnd(20)} ${c.inFigma}${c.why ? ` (${c.why})` : ""}`);
+  if (r.fidelity) io.print(r.fidelity);
+  return 0;
+}
+async function runDocsSave(a, root, io = defaultIO()) {
+  const component = a._[2];
+  const file = flag3(a, "file");
+  if (!component || !file) throw new RequestUsageError('Usage: bridge docs save <Component> --file docs.json [--pr <n>] [--title "..."] [--jira DS-42] [--product admin] [--dry-run]');
+  let docs;
+  try {
+    docs = JSON.parse(await readFile6(resolve3(root, file), "utf8"));
+  } catch (e) {
+    throw new RequestUsageError(`${file} is not a readable JSON file: ${e.message}`);
+  }
+  const ctx = await context3(root, io);
+  const pr = flag3(a, "pr");
+  const r = await studio.saveDocs(ctx, {
+    component,
+    docs,
+    ...pr ? { pr } : {},
+    ...flag3(a, "title") ? { title: flag3(a, "title") } : {},
+    ...flag3(a, "notes") ? { notes: flag3(a, "notes") } : {},
+    ...flag3(a, "jira") ? { jira: flag3(a, "jira") } : {},
+    ...flag3(a, "product") ? { product: flag3(a, "product") } : {},
+    dryRun: has3(a, "dry-run")
+  });
+  if (has3(a, "json")) io.print(JSON.stringify(r, null, 2));
+  else io.print(r.status === "dry-run" || r.status === "preview" ? `${r.said ?? "Dry run, nothing written."}
+
+${r.path}:
+${r.content}` : String(r.said));
+  return 0;
+}
+
 // src/protection.ts
 var UNKNOWN = { kind: "unknown", missing: ["review", "checks", "history", "deletion"] };
 async function protectionReport(opts) {
@@ -5573,7 +5936,7 @@ async function rolesReport(opts) {
 }
 
 // src/index.ts
-import { brand, BridgeContext as BridgeContext4, CONFIG_FILE as CONFIG_FILE2, core, detectConfig, GitRefSource, history as hist, LocalSource, ops, optionsFromArgv, serveStdio, toConfigJson, VERSION } from "@bridge-ds/mcp";
+import { brand, BridgeContext as BridgeContext5, CONFIG_FILE as CONFIG_FILE2, core, detectConfig, GitRefSource, history as hist, LocalSource, ops, optionsFromArgv, serveStdio, toConfigJson, VERSION } from "@bridge-ds/mcp";
 var MCP_PACKAGE = "@bridge-ds/mcp";
 var HELP = `bridge ${VERSION}: design system as code, for you and your Claude
 
@@ -5588,9 +5951,13 @@ Usage:
   bridge tokens <query> [--json]      search tokens by name, description or value
   bridge diff <base> [--json|--md]    designer-readable token diff: working tree vs <base> (git ref)
   bridge propose --title "..." --set path=value [--set ...] [--file f | --mode theme=dark]
-                 [--edits edits.json] [--summary "..."] [--branch explore/<name>] [--dry-run]
+                 [--edits edits.json] [--summary "..."] [--branch explore/<name>] [--pr <n>]
+                 [--product <key>] [--jira DS-42] [--dry-run]
                                       validate + contrast + new local bridge/* branch (never pushes).
-                                      --branch: write the edits to the checked-out exploration instead
+                                      --branch: write the edits to the checked-out exploration instead.
+                                      --pr: add them to that branch in review (GitHub token).
+                                      --product: the product it is for (bridge products); --jira: the
+                                      ticket key, first in the branch name and title
   bridge brand list [--json]          brands: slug, name, default, primary action color, theme overrides
   bridge brand create <slug> --from bridge --primary <hex|hue> --neutral <hex|hue>
                  [--name "Acme"] [--accent x] [--link x] [--radius soft|balanced|crisp|i,c,co,o]
@@ -5646,6 +6013,16 @@ Usage:
                                       explorations: an explore/<name> branch with a draft pull request
                                       labeled exploration, previews and a snapshot package for a product
                                       staging branch. Never merged as is: promote it to review or close it
+  bridge branch list|status|comments|ready|draft|review|ask|comment|merge|close|reopen|update|try|combine
+                                      branches in review, the same actions as Bridge Studio
+                                      (\`bridge branch help\`): what needs me, send for review, review,
+                                      merge through the same gate (owner override with a reason), update
+                                      from main with token conflicts, try it in a product, try together
+  bridge products | bridge settings | bridge coverage [Component]
+                                      products (and this folder's), Studio settings safe to read, which
+                                      components are in Figma
+  bridge docs save <Component> --file docs.json [--pr n] [--jira DS-42] [--product key] [--dry-run]
+                                      save usage guidance as in the Library edit mode (GitHub token)
   bridge mcp [--root dir | --repo owner/name]   start the MCP server on stdio
 
 Options:
@@ -5662,23 +6039,23 @@ function parse(argv) {
       const [k, inline] = a.slice(2).split(/=(.*)/s, 2);
       const next = argv[i + 1];
       const fileArg = k === "json" && /\.json$/i.test(next ?? "") || k === "md" && /\.(md|markdown)$/i.test(next ?? "");
-      const takesValue = inline === void 0 && next !== void 0 && !next.startsWith("--") && (fileArg || !["force", "json", "md", "strict", "dry-run", "help", "fix", "write", "no-regress", "plan", "keep-unchanged", "restore-conflicts", "breaking", "claude", "all", "offline"].includes(k));
+      const takesValue = inline === void 0 && next !== void 0 && !next.startsWith("--") && (fileArg || !["force", "json", "md", "strict", "dry-run", "help", "fix", "write", "no-regress", "plan", "keep-unchanged", "restore-conflicts", "breaking", "claude", "all", "offline", "approve"].includes(k));
       (out.flags[k] ??= []).push(inline ?? (takesValue ? argv[++i] : "true"));
     } else out._.push(a);
   }
   return out;
 }
-var flag3 = (a, k) => a.flags[k]?.[a.flags[k].length - 1];
-var has3 = (a, k) => Boolean(a.flags[k]);
+var flag4 = (a, k) => a.flags[k]?.[a.flags[k].length - 1];
+var has4 = (a, k) => Boolean(a.flags[k]);
 var print = (s) => process.stdout.write(`${s}
 `);
 var modeArg = (s) => s ? Object.fromEntries(s.split(",").map((kv) => kv.split("="))) : void 0;
 async function init(a, root) {
   const cfgPath = join6(root, CONFIG_FILE2);
   let config;
-  if (existsSync6(cfgPath) && !has3(a, "force")) {
+  if (existsSync6(cfgPath) && !has4(a, "force")) {
     print(`${CONFIG_FILE2} exists, keeping it (--force to regenerate).`);
-    config = (await (await BridgeContext4.create({ root })).config()).config;
+    config = (await (await BridgeContext5.create({ root })).config()).config;
   } else {
     const src = new LocalSource(root);
     const files = await src.list("");
@@ -5694,7 +6071,7 @@ async function init(a, root) {
   const inRepo = !relServer.startsWith("..") && !isAbsolute(relServer);
   const server = (dir) => inRepo ? { command: "node", args: [relServer, "--root", dir] } : { command: "npx", args: ["-y", MCP_PACKAGE, "--root", dir] };
   const mcpPath = join6(root, ".mcp.json");
-  const existing = existsSync6(mcpPath) ? JSON.parse(await readFile6(mcpPath, "utf8")) : {};
+  const existing = existsSync6(mcpPath) ? JSON.parse(await readFile7(mcpPath, "utf8")) : {};
   existing.mcpServers = { ...existing.mcpServers ?? {}, bridge: server(".") };
   await writeFile5(mcpPath, `${JSON.stringify(existing, null, 2)}
 `);
@@ -5706,14 +6083,14 @@ async function init(a, root) {
   print(`  claude mcp add bridge -- ${desktop.command} ${desktop.args.join(" ")}`);
 }
 async function check(a, root) {
-  const ctx = await BridgeContext4.create({ root });
+  const ctx = await BridgeContext5.create({ root });
   const v = await ops.validateTokens(ctx, { includeWarnings: true });
   const c = await ops.checkContrast(ctx, {});
   const warnings = "warnings" in v ? v.warnings ?? [] : [];
-  const failed = !v.valid || "failing" in c && (c.failing ?? 0) > 0 || has3(a, "strict") && warnings.length > 0;
+  const failed = !v.valid || "failing" in c && (c.failing ?? 0) > 0 || has4(a, "strict") && warnings.length > 0;
   const protection = await protectionOf(a, root, ctx);
   const roles = await rolesOf(a, root, ctx);
-  if (has3(a, "json")) {
+  if (has4(a, "json")) {
     print(JSON.stringify({ ok: !failed, validation: v, contrast: c, ...protection ? { protection: protection.state } : {}, ...roles?.teams.length ? { teams: roles.teams } : {} }, null, 2));
     return failed ? 1 : 0;
   }
@@ -5732,7 +6109,7 @@ async function check(a, root) {
   return failed ? 1 : 0;
 }
 async function protectionOf(a, root, ctx) {
-  if (has3(a, "offline") || process.env.BRIDGE_OFFLINE === "1") return void 0;
+  if (has4(a, "offline") || process.env.BRIDGE_OFFLINE === "1") return void 0;
   const { config } = await ctx.config();
   const repo = config.repo ? `${config.repo.owner}/${config.repo.name}` : await originRepo(root);
   if (!repo) return void 0;
@@ -5740,7 +6117,7 @@ async function protectionOf(a, root, ctx) {
   return protectionReport({ repo, defaultBranch: config.repo?.defaultBranch ?? "main", token });
 }
 async function rolesOf(a, root, ctx) {
-  if (has3(a, "offline") || process.env.BRIDGE_OFFLINE === "1") return void 0;
+  if (has4(a, "offline") || process.env.BRIDGE_OFFLINE === "1") return void 0;
   const { config } = await ctx.config();
   const repo = config.repo ? `${config.repo.owner}/${config.repo.name}` : await originRepo(root);
   if (!repo) return void 0;
@@ -5750,9 +6127,9 @@ async function rolesOf(a, root, ctx) {
 async function tokens(a, root) {
   const q = a._.slice(1).join(" ");
   if (!q) throw new UsageError("bridge tokens <query>");
-  const ctx = await BridgeContext4.create({ root });
-  const r = await ops.searchTokens(ctx, { query: q, limit: Number(flag3(a, "limit") ?? 20) });
-  if (has3(a, "json")) return print(JSON.stringify(r, null, 2));
+  const ctx = await BridgeContext5.create({ root });
+  const r = await ops.searchTokens(ctx, { query: q, limit: Number(flag4(a, "limit") ?? 20) });
+  if (has4(a, "json")) return print(JSON.stringify(r, null, 2));
   if (!r.results.length) return print(`No token matches "${q}".`);
   const w = Math.max(...r.results.map((x) => x.path.length));
   for (const t of r.results) print(`${t.path.padEnd(w)}  ${String(t.value).padEnd(10)}  ${(t.tier ?? "").padEnd(9)}  ${t.description ?? ""}`);
@@ -5760,20 +6137,20 @@ async function tokens(a, root) {
 async function diff(a, root) {
   const base = a._[1];
   if (!base) throw new UsageError("bridge diff <base>   (a git ref: main, HEAD~1, a sha)");
-  const ctx = await BridgeContext4.create({ root });
+  const ctx = await BridgeContext5.create({ root });
   const { config } = await ctx.config();
   const before = await core.loadTokenSet(new GitRefSource(root, base), config);
   const after = await ctx.tokens();
   const changes = core.diff(before, after);
-  const pairs = await core.readContrastPairs(ctx.source, config).catch(() => []);
-  const delta2 = pairs.length ? core.contrastDelta(core.runContrast(before, pairs, config.contrast?.modes), core.runContrast(after, pairs, config.contrast?.modes)) : [];
+  const pairs2 = await core.readContrastPairs(ctx.source, config).catch(() => []);
+  const delta2 = pairs2.length ? core.contrastDelta(core.runContrast(before, pairs2, config.contrast?.modes), core.runContrast(after, pairs2, config.contrast?.modes)) : [];
   const tier = core.classify(changes, [], config);
   const imp = core.impact(before, after, changes, 30);
-  if (has3(a, "json")) {
+  if (has4(a, "json")) {
     print(JSON.stringify({ base, changes, contrast: delta2, tier, impact: imp }, null, 2));
     return 0;
   }
-  if (has3(a, "md")) {
+  if (has4(a, "md")) {
     print(`## Token changes since \`${base}\`
 
 ${core.tokenTable(changes)}
@@ -5808,24 +6185,37 @@ ${imp.total} other token(s) change value through aliases:`);
   return delta2.some((d) => d.passBefore && !d.passAfter) ? 1 : 0;
 }
 async function propose(a, root) {
-  const title = flag3(a, "title");
+  const title = flag4(a, "title");
   if (!title) throw new UsageError('bridge propose --title "Darken muted text" --set color.text.muted={palette.neutral.700} --mode theme=light');
   const edits = [];
-  const file = flag3(a, "file");
-  const mode2 = modeArg(flag3(a, "mode"));
+  const file = flag4(a, "file");
+  const mode2 = modeArg(flag4(a, "mode"));
   for (const s of a.flags.set ?? []) {
     const i = s.indexOf("=");
     if (i < 0) throw new UsageError(`--set needs path=value, got "${s}"`);
     edits.push({ op: "set", path: s.slice(0, i), value: s.slice(i + 1), ...file ? { file } : {}, ...mode2 ? { mode: mode2 } : {} });
   }
-  const editsFile = flag3(a, "edits");
-  if (editsFile) edits.push(...JSON.parse(await readFile6(resolve3(editsFile), "utf8")));
+  const editsFile = flag4(a, "edits");
+  if (editsFile) edits.push(...JSON.parse(await readFile7(resolve4(editsFile), "utf8")));
   if (!edits.length) throw new UsageError("Give at least one --set path=value or --edits file.json");
-  const ctx = await BridgeContext4.create({ root });
-  const summary = flag3(a, "summary");
-  const branch = flag3(a, "branch");
-  const r = await ops.proposeTokenChange(ctx, { title, edits, ...summary ? { summary } : {}, ...branch ? { branch } : {}, dryRun: has3(a, "dry-run") });
-  if (has3(a, "json")) print(JSON.stringify(r, null, 2));
+  const pr = flag4(a, "pr");
+  const token = pr ? process.env.BRIDGE_GITHUB_TOKEN || process.env.GITHUB_TOKEN || defaultIO().ghToken() : void 0;
+  const ctx = await BridgeContext5.create({ root, ...token ? { token } : {} });
+  const summary = flag4(a, "summary");
+  const branch = flag4(a, "branch");
+  const jira = flag4(a, "jira");
+  const product = flag4(a, "product");
+  const r = await ops.proposeTokenChange(ctx, {
+    title,
+    edits,
+    ...summary ? { summary } : {},
+    ...branch ? { branch } : {},
+    ...pr ? { pr } : {},
+    ...jira ? { jira } : {},
+    ...product ? { product } : {},
+    dryRun: has4(a, "dry-run")
+  });
+  if (has4(a, "json")) print(JSON.stringify(r, null, 2));
   else {
     print(`status: ${r.status}${r.why ? ` (${r.why})` : ""}`);
     if (r.tier) print(`tier ${r.tier}, ${r.bump}`);
@@ -5840,17 +6230,17 @@ ${r.prBody}`);
 }
 async function brandCmd(a, root) {
   const sub = a._[1];
-  const ctx = await BridgeContext4.create({ root });
+  const ctx = await BridgeContext5.create({ root });
   if (sub === "list") {
     const r2 = await brand.listBrands(ctx);
-    if (has3(a, "json")) print(JSON.stringify(r2.brands, null, 2));
+    if (has4(a, "json")) print(JSON.stringify(r2.brands, null, 2));
     else for (const b of r2.brands) print(`${b.default ? "*" : " "} ${b.slug.padEnd(14)} ${b.name.padEnd(18)} ${b.primary ?? ""}${b.overrides.length ? `  overrides: ${b.overrides.join(", ")}` : ""}`);
     return 0;
   }
   if (sub !== "create") throw new UsageError('bridge brand list | bridge brand create <slug> --from bridge --primary "#1F5F3A" --neutral "#2A2F2C"');
   const slug = a._[2];
   if (!slug) throw new UsageError('bridge brand create <slug> --from bridge --primary "#1F5F3A" --neutral "#2A2F2C"');
-  const opt = (k) => flag3(a, k);
+  const opt = (k) => flag4(a, k);
   const fonts = { ...opt("heading") ? { heading: opt("heading") } : {}, ...opt("text") ? { text: opt("text") } : {} };
   const r = await brand.proposeBrand(ctx, {
     slug,
@@ -5863,9 +6253,9 @@ async function brandCmd(a, root) {
     ...opt("radius") ? { radius: opt("radius") } : {},
     ...Object.keys(fonts).length ? { fonts } : {},
     ...opt("notes") ? { notes: opt("notes") } : {},
-    dryRun: has3(a, "dry-run")
+    dryRun: has4(a, "dry-run")
   });
-  if (has3(a, "json")) {
+  if (has4(a, "json")) {
     const { fileContents: _f, ...rest } = r;
     print(JSON.stringify(rest, null, 2));
     return r.status === "blocked" ? 1 : 0;
@@ -5886,7 +6276,7 @@ async function brandCmd(a, root) {
   return r.status === "blocked" ? 1 : 0;
 }
 async function figmaReferences(a, root) {
-  let sha = flag3(a, "sha");
+  let sha = flag4(a, "sha");
   if (!sha) {
     try {
       sha = execFileSync2("git", ["rev-parse", "HEAD"], { cwd: root, encoding: "utf8" }).trim();
@@ -5894,49 +6284,49 @@ async function figmaReferences(a, root) {
       sha = "unknown";
     }
   }
-  const only = (flag3(a, "only") ?? "").split(",").filter(Boolean);
+  const only = (flag4(a, "only") ?? "").split(",").filter(Boolean);
   const r = await captureFigmaReferences({
-    storybook: resolve3(root, flag3(a, "storybook") ?? "storybook-static"),
-    specs: resolve3(root, flag3(a, "specs") ?? "packages/react/component-specs.json"),
-    out: resolve3(root, flag3(a, "out") ?? "figma-references"),
+    storybook: resolve4(root, flag4(a, "storybook") ?? "storybook-static"),
+    specs: resolve4(root, flag4(a, "specs") ?? "packages/react/component-specs.json"),
+    out: resolve4(root, flag4(a, "out") ?? "figma-references"),
     sha,
     ...only.length ? { only } : {},
-    log: has3(a, "json") ? void 0 : (line) => print(line)
+    log: has4(a, "json") ? void 0 : (line) => print(line)
   });
-  if (has3(a, "json")) print(JSON.stringify({ manifest: r.manifestPath, captured: r.captured, skipped: r.skipped }, null, 2));
+  if (has4(a, "json")) print(JSON.stringify({ manifest: r.manifestPath, captured: r.captured, skipped: r.skipped }, null, 2));
   return 0;
 }
 async function impact(a, root) {
-  const only = (flag3(a, "only") ?? "").split(",").filter(Boolean);
+  const only = (flag4(a, "only") ?? "").split(",").filter(Boolean);
   for (const x of only) if (x !== "stories" && x !== "app") throw new UsageError(`--only takes stories or app, got "${x}"`);
-  const num2 = (k) => flag3(a, k) !== void 0 ? Number(flag3(a, k)) : void 0;
+  const num2 = (k) => flag4(a, k) !== void 0 ? Number(flag4(a, k)) : void 0;
   const threshold = num2("threshold");
   if (threshold !== void 0 && !(threshold >= 0 && threshold <= 1)) throw new UsageError("--threshold is between 0 and 1 (pixelmatch color distance)");
-  const imageBase = flag3(a, "image-base");
-  const artifactUrl = flag3(a, "artifact-url");
-  const out = flag3(a, "out");
-  const cacheDir = flag3(a, "cache");
+  const imageBase = flag4(a, "image-base");
+  const artifactUrl = flag4(a, "artifact-url");
+  const out = flag4(a, "out");
+  const cacheDir = flag4(a, "cache");
   const maxStories = num2("max-stories");
   const r = await runImpact({
     root,
-    base: flag3(a, "base") ?? "main",
-    head: flag3(a, "head") ?? "HEAD",
-    ...out ? { out: resolve3(out) } : {},
+    base: flag4(a, "base") ?? "main",
+    head: flag4(a, "head") ?? "HEAD",
+    ...out ? { out: resolve4(out) } : {},
     ...only.length ? { only } : {},
     ...threshold !== void 0 ? { threshold } : {},
-    ...cacheDir ? { cacheDir: resolve3(cacheDir) } : {},
+    ...cacheDir ? { cacheDir: resolve4(cacheDir) } : {},
     ...maxStories ? { maxStoriesPerComponent: maxStories } : {},
     ...imageBase !== void 0 ? { imageBase } : {},
     ...artifactUrl ? { artifactUrl } : {},
-    plan: has3(a, "plan"),
-    keepUnchanged: has3(a, "keep-unchanged")
+    plan: has4(a, "plan"),
+    keepUnchanged: has4(a, "keep-unchanged")
   });
-  if (has3(a, "json")) {
+  if (has4(a, "json")) {
     print(JSON.stringify({ summary: r.summary, manifest: r.manifestPath, comment: r.commentPath ?? null, ...r.manifest.summary, selection: r.manifest.selection }, null, 2));
     return 0;
   }
   const sel = r.manifest.selection;
-  if (has3(a, "plan")) {
+  if (has4(a, "plan")) {
     print(`Plan ${r.manifest.base.ref} (${r.manifest.base.sha.slice(0, 7)}) -> ${r.manifest.head.ref} (${r.manifest.head.sha.slice(0, 7)})`);
     print(`  tokens changing value: ${sel.tokens.length}${sel.tokens.length ? ` (${sel.tokens.filter((t) => t.kind === "direct").map((t) => t.path).slice(0, 6).join(", ")})` : ""}`);
     print(`  components: ${sel.components.map((c) => c.id).join(", ") || "none"}`);
@@ -5952,12 +6342,12 @@ async function impact(a, root) {
 }
 var day = (iso) => iso.slice(0, 10);
 async function historyCmd(a, root) {
-  const ctx = await BridgeContext4.create({ root });
+  const ctx = await BridgeContext5.create({ root });
   const token = a._[1];
-  const limit = Number(flag3(a, "limit") ?? 20);
+  const limit = Number(flag4(a, "limit") ?? 20);
   if (token) {
     const r2 = await hist.getTokenHistory(ctx, { path: token, limit });
-    if (has3(a, "json")) return print(JSON.stringify(r2, null, 2)), 0;
+    if (has4(a, "json")) return print(JSON.stringify(r2, null, 2)), 0;
     if (!r2.total) return print(`No recorded change of ${r2.path} in ${r2.source}.`), 0;
     print(`${r2.path}: ${r2.total} change(s)  (${r2.source})
 `);
@@ -5968,9 +6358,9 @@ async function historyCmd(a, root) {
     }
     return 0;
   }
-  const tier = flag3(a, "tier");
-  const r = await hist.getHistory(ctx, { limit, ...flag3(a, "author") ? { author: flag3(a, "author") } : {}, ...tier ? { tier: Number(tier) } : {}, ...flag3(a, "version") ? { version: flag3(a, "version") } : {}, ...has3(a, "breaking") ? { breaking: true } : {} });
-  if (has3(a, "json")) return print(JSON.stringify(r, null, 2)), 0;
+  const tier = flag4(a, "tier");
+  const r = await hist.getHistory(ctx, { limit, ...flag4(a, "author") ? { author: flag4(a, "author") } : {}, ...tier ? { tier: Number(tier) } : {}, ...flag4(a, "version") ? { version: flag4(a, "version") } : {}, ...has4(a, "breaking") ? { breaking: true } : {} });
+  if (has4(a, "json")) return print(JSON.stringify(r, null, 2)), 0;
   print(`${r.source}${r.currentVersion ? `, package version ${r.currentVersion}` : ""}`);
   if (!r.total) return print(r.note ?? "No token change matches."), 0;
   for (const v of r.versions) print(`  ${v.version.padEnd(11)} ${day(v.date)}  ${v.entries} change(s), ${v.tokenChanges} token edit(s)${v.breaking ? ", breaking" : ""}`);
@@ -5988,10 +6378,10 @@ ${r.truncated}`);
 async function revertCmd(a, root) {
   const target = a._[1];
   if (!target) throw new UsageError("bridge revert <pr|commit|id> [--dry-run]   (ids from `bridge history`)");
-  const ctx = await BridgeContext4.create({ root });
+  const ctx = await BridgeContext5.create({ root });
   const resolutions = Object.fromEntries((a.flags["use-before"] ?? []).map((k) => [k, "use-before"]));
-  const r = await hist.proposeRevert(ctx, { target, resolutions, restoreConflicts: has3(a, "restore-conflicts"), dryRun: has3(a, "dry-run") });
-  if (has3(a, "json")) {
+  const r = await hist.proposeRevert(ctx, { target, resolutions, restoreConflicts: has4(a, "restore-conflicts"), dryRun: has4(a, "dry-run") });
+  if (has4(a, "json")) {
     print(JSON.stringify(r, null, 2));
     return r.status === "blocked" ? 1 : 0;
   }
@@ -6016,25 +6406,25 @@ async function audit(a, root) {
   const target = a._[1];
   if (!target) throw new UsageError("bridge audit <path>   (a product folder or file that uses the design system)");
   if (!existsSync6(target)) throw new UsageError(`No such file or folder: ${target}`);
-  const dsRoot = flag3(a, "ds") ? resolve3(flag3(a, "ds")) : existsSync6(join6(root, CONFIG_FILE2)) ? root : findDesignSystemRoot(root);
+  const dsRoot = flag4(a, "ds") ? resolve4(flag4(a, "ds")) : existsSync6(join6(root, CONFIG_FILE2)) ? root : findDesignSystemRoot(root);
   if (!dsRoot) throw new UsageError(`No ${CONFIG_FILE2} found: run bridge audit from the design system repo or pass --ds <dir>.`);
   const ds = loadDesignSystem(dsRoot);
-  if (has3(a, "fix")) {
-    const write = has3(a, "write");
+  if (has4(a, "fix")) {
+    const write = has4(a, "write");
     const changes = fixCss(target, ds.index, write);
     const n = changes.reduce((acc, c) => acc + c.edits.length, 0);
     for (const c of changes) for (const e of c.edits) print(`${c.file}:${e.line}:${e.column}  ${e.from} -> ${e.to}`);
     print(n ? `${write ? "Replaced" : "Would replace"} ${n} value(s) in ${changes.length} file(s) with exact token matches.${write ? "" : " Run again with --write to apply."}` : "Nothing to fix: no CSS value equals a token exactly.");
     return 0;
   }
-  const baselinePath = flag3(a, "baseline");
+  const baselinePath = flag4(a, "baseline");
   let baseline;
   if (baselinePath) {
     if (!existsSync6(baselinePath)) throw new UsageError(`Baseline not found: ${baselinePath}`);
-    baseline = JSON.parse(await readFile6(baselinePath, "utf8"));
+    baseline = JSON.parse(await readFile7(baselinePath, "utf8"));
   }
-  const label = flag3(a, "label");
-  const allowlistPath = flag3(a, "allowlist");
+  const label = flag4(a, "label");
+  const allowlistPath = flag4(a, "allowlist");
   if (allowlistPath && !existsSync6(allowlistPath)) throw new UsageError(`Allowlist not found: ${allowlistPath}`);
   let allowlist;
   try {
@@ -6044,8 +6434,8 @@ async function audit(a, root) {
   }
   const report = runAudit(target, { ds: dsRoot, version: VERSION, ...label ? { label } : {}, ...baseline ? { baseline } : {}, ...allowlist ? { allowlist } : {} });
   const md = auditMarkdown(report);
-  const jsonOut = flag3(a, "json");
-  const mdOut = flag3(a, "md");
+  const jsonOut = flag4(a, "json");
+  const mdOut = flag4(a, "md");
   if (jsonOut && jsonOut !== "true") await writeFile5(jsonOut, `${JSON.stringify(report, null, 2)}
 `);
   if (mdOut && mdOut !== "true") await writeFile5(mdOut, `${md}
@@ -6085,7 +6475,7 @@ async function audit(a, root) {
   for (const f of report.files) for (const e of f.ignoreErrors ?? []) process.stderr.write(`${report.target.path}/${f.path}:${e.line}: ${e.message}
 `);
   let code = 0;
-  const failUnder = flag3(a, "fail-under");
+  const failUnder = flag4(a, "fail-under");
   if (failUnder !== void 0) {
     const min = Number(failUnder);
     if (!Number.isFinite(min)) throw new UsageError("--fail-under needs a number, e.g. --fail-under 80");
@@ -6096,7 +6486,7 @@ async function audit(a, root) {
       code = 1;
     }
   }
-  if (has3(a, "no-regress") && report.baseline) {
+  if (has4(a, "no-regress") && report.baseline) {
     const b = report.baseline;
     if ((b.tokenAdoption.delta ?? 0) < 0 || (b.componentAdoption.delta ?? 0) < 0 || b.hardcoded.delta > 0) {
       process.stderr.write("bridge audit: adoption regressed since the baseline\n");
@@ -6108,9 +6498,9 @@ async function audit(a, root) {
 async function docsCmd(a, root) {
   const [, sub, name] = a._;
   if (sub !== "draft" || !name) throw new UsageError("Usage: bridge docs draft <Component> [--json]");
-  const ctx = await BridgeContext4.create({ root });
+  const ctx = await BridgeContext5.create({ root });
   const d = await ops.draftDocsOp(ctx, { name });
-  if (has3(a, "json")) {
+  if (has4(a, "json")) {
     print(JSON.stringify({ component: d.component, path: d.path, exists: d.exists, prefill: d.prefill, prompt: d.prompt }, null, 2));
     return 0;
   }
@@ -6141,12 +6531,15 @@ async function main() {
   const argv = process.argv.slice(2);
   const a = parse(argv);
   const cmd = a._[0];
-  const root = resolve3(flag3(a, "root") ?? process.cwd());
+  const root = resolve4(flag4(a, "root") ?? process.cwd());
   if (cmd === "request") return runRequest(a, root);
   if (cmd === "explore") return runExplore(a, root);
-  if (!cmd || has3(a, "help") || cmd === "help") {
+  if (cmd === "branch") return runBranch(a, root);
+  if (cmd === "products" || cmd === "settings" || cmd === "coverage") return runStudioRead(cmd, a, root);
+  if (cmd === "docs" && a._[1] === "save") return runDocsSave(a, root);
+  if (!cmd || has4(a, "help") || cmd === "help") {
     print(HELP);
-    return cmd || has3(a, "help") ? 0 : 2;
+    return cmd || has4(a, "help") ? 0 : 2;
   }
   if (cmd === "--version" || cmd === "version") return print(VERSION), 0;
   switch (cmd) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bridge-ds/cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "type": "module",
   "description": "bridge CLI: set up Bridge in a design system repo, check tokens in CI, search and diff tokens, propose changes, start the MCP server.",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "build:package": "node ../../scripts/build-packages.mjs cli"
   },
   "dependencies": {
-    "@bridge-ds/mcp": "^0.3.3",
-    "@bridge-ds/visual": "^0.3.0",
+    "@bridge-ds/mcp": "^0.4.0",
+    "@bridge-ds/visual": "^0.3.1",
     "typescript": "5.9.3"
   },
   "devDependencies": {