canopycms 0.0.68-int.113 → 0.0.68-int.114

package/dist/cli/generate-ai-content.js

@@ -22,7 +22,7 @@ function redactCredentials(message) {
   let result = message;
   result = result.replace(/(:\/\/)[^/\s@]+@/g, "$1***@");
   result = result.replace(/(\bauthorization\s*:\s*(?:basic|bearer|token)\s+)[A-Za-z0-9+/=._~-]+/gi, "$1***");
-  result = result.replace(/eC1hY2Nlc3MtdG9rZW46[A-Za-z0-9+/]*={0,2}/g, "***");
+  result = result.replace(/eC1hY2Nlc3MtdG9rZW46(?:[A-Za-z0-9+/]|%2[BbFf])*(?:=|%3[Dd]){0,2}/g, "***");
   result = result.replace(/\b(?:gh[pousr]|github_pat)_[A-Za-z0-9_]{8,}/g, "***");
   result = result.replace(/\b(Bearer\s+)[A-Za-z0-9._~+/=-]{8,}/g, "$1***");
   result = result.replace(/-----BEGIN [A-Z]{0,9} ?PRIVATE KEY-----[\s\S]*?(?:-----END [A-Z]{0,9} ?PRIVATE KEY-----|$)/g, "<private-key>");
@@ -2684,6 +2684,45 @@ var DEFAULT_SEO_FIELD_NAMES = {
   noindex: "noindex",
   twitterCard: "twitterCard"
 };
+var asRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+var asText = (value) => {
+  if (typeof value !== "string")
+    return void 0;
+  const trimmed = value.trim();
+  return trimmed === "" ? void 0 : trimmed;
+};
+var asFlag = (value) => typeof value === "boolean" ? value : void 0;
+var asImageUrl = (value) => {
+  const text = asText(value);
+  if (text)
+    return text;
+  return asText(asRecord(value)?.src);
+};
+var asOgType = (value) => {
+  const text = asText(value);
+  return text === "website" || text === "article" || text === "profile" ? text : void 0;
+};
+var asTwitterCard = (value) => {
+  const text = asText(value);
+  return text === "summary" || text === "summary_large_image" ? text : void 0;
+};
+function extractSeoFields(entryData, opts = {}) {
+  const names = { ...DEFAULT_SEO_FIELD_NAMES, ...opts.fields };
+  const entry = asRecord(entryData);
+  const source = opts.group ? asRecord(entry?.[opts.group]) : entry;
+  return {
+    title: asText(source?.[names.title]) ?? asText(opts.fallbackTitle),
+    description: asText(source?.[names.description]) ?? asText(opts.fallbackDescription),
+    ogImage: asImageUrl(source?.[names.ogImage]),
+    ogType: asOgType(source?.[names.ogType]),
+    canonical: asText(source?.[names.canonical]),
+    noindex: asFlag(source?.[names.noindex]),
+    twitterCard: asTwitterCard(source?.[names.twitterCard])
+  };
+}
+function isNoindexEntry(entryData, opts = {}) {
+  return extractSeoFields(entryData, opts).noindex === true;
+}
 
 // dist/entry-schema.js
 function buildResolvedReference(data, meta, body) {
@@ -4240,7 +4279,7 @@ var getFormatExtension = (format) => {
   return ".json";
 };
 var isDataOnlyFormat = (format) => format === "json" || format === "yaml";
-var asRecord = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
+var asRecord2 = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
 
 // dist/paths/index.js
 init_normalize();
@@ -4812,7 +4851,7 @@ var ContentStore = class {
       fields = entryTypeConfig?.schema || [];
     }
     if (format === "json") {
-      const data = asRecord(JSON.parse(raw));
+      const data = asRecord2(JSON.parse(raw));
       doc = {
         collection: schemaItem.logicalPath,
         collectionName: schemaItem.name,
@@ -4822,7 +4861,7 @@ var ContentStore = class {
         absolutePath
       };
     } else if (format === "yaml") {
-      const data = asRecord(yamlParse(raw));
+      const data = asRecord2(yamlParse(raw));
       doc = {
         collection: schemaItem.logicalPath,
         collectionName: schemaItem.name,
@@ -6196,17 +6235,21 @@ var ENTRY_LINK_PATTERN = new RegExp(`entry:(${BASE58_CHAR}{12})(#[^\\s)>"']*)?`,
 function resolveEntryUrl(location, contentRoot) {
   return computeEntryUrl(location.collection ?? "", location.slug ?? "", contentRoot);
 }
-function resolveEntryLinksInText(text, idIndex, contentRoot, customResolver) {
+function resolveEntryLinksInText(text, idIndex, contentRoot, customResolver, options = {}) {
+  const { isLinkable } = options;
   const parts = splitByCodeRegions(text);
   return parts.map((part) => {
     if (part.isCode)
       return part.text;
-    return part.text.replace(ENTRY_LINK_PATTERN, (_match, id, anchor) => {
-      const location = idIndex.findById(id);
-      if (!location || location.type !== "entry" || !location.collection || !location.slug) {
+    const partText = isLinkable ? unwrapInlineLinks(part.text, (id) => !isLinkable(id) || !findEntry(idIndex, id)) : part.text;
+    return partText.replace(ENTRY_LINK_PATTERN, (_match, id, anchor) => {
+      const location = findEntry(idIndex, id);
+      if (!location) {
         log6.warn("resolve", `Entry link target not found: entry:${id}`);
-        return anchor ?? "#";
+        return isLinkable ? "#" : anchor ?? "#";
       }
+      if (isLinkable && !isLinkable(id))
+        return "#";
       let url;
       if (customResolver) {
         url = customResolver({
@@ -6221,6 +6264,46 @@ function resolveEntryLinksInText(text, idIndex, contentRoot, customResolver) {
     });
   }).join("");
 }
+function findEntry(idIndex, id) {
+  const location = idIndex.findById(id);
+  if (!location || location.type !== "entry" || !location.collection || !location.slug) {
+    return void 0;
+  }
+  return location;
+}
+var INLINE_LINK_TARGET = new RegExp(`\\]\\(entry:(${BASE58_CHAR}{12})(?:#[^\\s)>"'\\]]*)?(?:[ \\t]+"[^"\\n]*")?\\)`, "g");
+function unwrapInlineLinks(text, shouldUnwrap) {
+  let out = "";
+  let cursor = 0;
+  let scanFloor = 0;
+  for (const match of text.matchAll(INLINE_LINK_TARGET)) {
+    const close = match.index;
+    if (close < cursor || !shouldUnwrap(match[1]))
+      continue;
+    const open = findOpeningBracket(text, close, Math.max(cursor, scanFloor));
+    if (open === -1) {
+      scanFloor = close;
+      continue;
+    }
+    const isImage = open > cursor && text[open - 1] === "!" && text[open - 2] !== "\\";
+    const start = isImage ? open - 1 : open;
+    out += text.slice(cursor, start) + text.slice(open + 1, close);
+    cursor = close + match[0].length;
+  }
+  return out + text.slice(cursor);
+}
+function findOpeningBracket(text, close, floor) {
+  let depth = 1;
+  for (let i = close - 1; i >= floor; i--) {
+    if (i > floor && text[i - 1] === "\\")
+      continue;
+    if (text[i] === "]")
+      depth++;
+    else if (text[i] === "[" && --depth === 0)
+      return i;
+  }
+  return -1;
+}
 function splitByCodeRegions(text) {
   const parts = [];
   let current = "";
@@ -6295,6 +6378,7 @@ function splitByCodeRegions(text) {
 // dist/ai/generate.js
 async function generateAIContent(options) {
   const { store, flatSchema, contentRoot, config, entryLinkUrl, generatedAt, buildId } = options;
+  assertValidNoindexConfig(config);
   const files = /* @__PURE__ */ new Map();
   const idIndex = await store.idIndex();
   const read = {
@@ -6331,6 +6415,16 @@ async function generateAIContent(options) {
   let round = allPending;
   for (; ; ) {
     for (const pending of round) {
+      if (pending.body !== void 0) {
+        const linked = /* @__PURE__ */ new Set();
+        pending.entry.body = resolveEntryLinksInText(pending.body, idIndex, contentRoot, entryLinkUrl, {
+          isLinkable: (id) => {
+            linked.add(id);
+            return exported.has(id);
+          }
+        });
+        pending.linkedIds = [...linked];
+      }
       maskUnexportedTargets(pending.entry, exported);
       pending.entry.appendedSections = void 0;
       await runEntryTransform(pending.entry, pending.absolutePath, pending.contentId, config);
@@ -6338,11 +6432,19 @@ async function generateAIContent(options) {
     const failed = renderAll(round, config, references);
     if (failed.length === 0)
       break;
+    const failedIds = /* @__PURE__ */ new Set();
     for (const pending of failed) {
-      if (pending.contentId !== null)
-        exported.delete(pending.contentId);
+      if (pending.contentId === null)
+        continue;
+      exported.delete(pending.contentId);
+      failedIds.add(pending.contentId);
     }
-    round = allPending.filter((pending) => isRendered(pending) && maskUnexportedTargets(pending.entry, exported));
+    round = allPending.filter((pending) => {
+      if (!isRendered(pending))
+        return false;
+      const masked = maskUnexportedTargets(pending.entry, exported);
+      return masked || pending.linkedIds.some((id) => failedIds.has(id));
+    });
   }
   const manifestCollections = collectionNodes.map((node) => emitCollection(node, files));
   const manifestRootEntries = emitEntries(rootEntries, files);
@@ -6411,6 +6513,7 @@ async function collectCollection(read, collection, flatSchema) {
 }
 async function collectEntries(read, collection, cleanPath) {
   const { store, contentRoot, config, idIndex, entryLinkUrl, resolveTarget } = read;
+  const skipNoindex = config?.exclude?.noindex !== false;
   const pending = [];
   const listed = await store.getCollectionEntryPaths(collection.logicalPath);
   const directEntries = listed.filter((e) => e.collection === collection.logicalPath);
@@ -6427,15 +6530,19 @@ async function collectEntries(read, collection, cleanPath) {
       const doc = await store.read(listEntry.collection, listEntry.slug, {
         resolveReferences: false
       });
+      if (skipNoindex && isNoindexEntry(doc.data, config?.seo))
+        continue;
       doc.data = await resolveReferenceFields(doc.data, entryTypeConfig.schema, resolveTarget);
       const aiEntry = docToAIEntry(doc, listEntry.slug, entryTypeName, entryTypeConfig, cleanPath);
-      if (aiEntry.body) {
-        aiEntry.body = resolveEntryLinksInText(aiEntry.body, idIndex, contentRoot, entryLinkUrl);
-      }
+      const body = aiEntry.body;
+      if (body)
+        aiEntry.body = resolveEntryLinksInText(body, idIndex, contentRoot, entryLinkUrl);
       if (config?.exclude?.where?.(aiEntry))
         continue;
       pending.push({
         entry: aiEntry,
+        body,
+        linkedIds: [],
         contentId: extractIdFromFilename(path13.basename(listEntry.relativePath)),
         absolutePath: doc.absolutePath,
         collectionPath: collection.logicalPath,
@@ -6476,6 +6583,31 @@ function emitCollection(node, files) {
     subcollections: manifestSubcollections.length > 0 ? manifestSubcollections : void 0
   };
 }
+function assertValidNoindexConfig(config) {
+  const noindex = config?.exclude?.noindex;
+  if (noindex !== void 0 && typeof noindex !== "boolean") {
+    throw new Error(`AI content config: exclude.noindex must be a boolean, got ${typeof noindex}`);
+  }
+  const seo = config?.seo;
+  if (seo === void 0)
+    return;
+  if (typeof seo !== "object" || seo === null || Array.isArray(seo)) {
+    throw new Error("AI content config: seo must be an object of { group?, fields? }");
+  }
+  const { group, fields } = seo;
+  if (group !== void 0 && typeof group !== "string") {
+    throw new Error("AI content config: seo.group must be a string");
+  }
+  if (fields === void 0)
+    return;
+  if (typeof fields !== "object" || fields === null || Array.isArray(fields) || Object.values(fields).some((name) => typeof name !== "string")) {
+    throw new Error("AI content config: seo.fields must map SEO fields to field-name strings");
+  }
+  const unknown = Object.keys(fields).filter((key) => !(key in DEFAULT_SEO_FIELD_NAMES));
+  if (unknown.length > 0) {
+    throw new Error(`AI content config: unknown seo.fields key(s): ${unknown.join(", ")}`);
+  }
+}
 function stripContentRoot(logicalPath, contentRoot) {
   if (logicalPath.startsWith(contentRoot + "/")) {
     return logicalPath.slice(contentRoot.length + 1);
@@ -7322,7 +7454,7 @@ async function ensureRemoteGitConfig(gitDir, git = simpleGit2().env(gitChildEnv(
 var REMOTE_GIT_MAX_LOOSE_OBJECTS = 50;
 var REMOTE_GIT_MAX_PACKS = 6;
 async function countObjects(git, gitDir) {
-  const output = await git.raw(["--git-dir", gitDir, "count-objects", "-v"]);
+  const output = await git.raw(["--git-dir", gitDir, "count-objects", "-v", "--end-of-options"]);
   const fields = new Map(output.split("\n").map((line) => {
     const [name, value = ""] = line.split(": ");
     return [name, value.trim()];
@@ -7342,8 +7474,8 @@ async function repackBareRemoteIfNeeded(gitDir, git = simpleGit2().env(gitChildE
     return { repacked: false, before };
   }
   const startedAt = Date.now();
-  await git.raw(["--git-dir", gitDir, "repack", "-a", "-d", "--cruft", "-q"]);
-  await git.raw(["--git-dir", gitDir, "pack-refs", "--all"]);
+  await git.raw(["--git-dir", gitDir, "repack", "-a", "-d", "--cruft", "-q", "--end-of-options"]);
+  await git.raw(["--git-dir", gitDir, "pack-refs", "--all", "--end-of-options"]);
   const after = await countObjects(git, gitDir);
   return { repacked: true, before, after, ms: Date.now() - startedAt };
 }
@@ -7678,10 +7810,10 @@ var GitManager = class _GitManager {
    * Delete `refs/heads/<branch>` from a bare local mirror, if present. A
    * no-op (not an error) when the ref doesn't exist.
    *
-   * The explicit path for removing a deleted branch's local head, which the
-   * sync loop deliberately is not (reconcileTrackedBranches never deletes a
-   * head — see GITHUB_TRACKING_REF_PREFIX). Called by api/branch.ts's
-   * deleteBranchHandler: a head left in `remote.git` forever makes the
+   * The path that removes a deleted branch's local head at once; the sync
+   * loop's reconcileTrackedBranches removes one only after GitHub no longer
+   * has the branch. Called by api/branch.ts's deleteBranchHandler: a head
+   * left in `remote.git` makes the
    * create -> publish -> squash-merge -> delete -> reuse-the-name cycle reject
    * the reused branch's first publish non-fast-forward against the stale head
    * (`GitManager.push()` pushes the branch to the same name, and a squash-merged old tip is
@@ -9263,10 +9395,10 @@ var readEntryData = async (filePath, format, bodyFieldName = "body") => {
   try {
     const raw = await fs20.readFile(filePath, "utf8");
     if (format === "json") {
-      return asRecord(JSON.parse(raw));
+      return asRecord2(JSON.parse(raw));
     }
     if (format === "yaml") {
-      return asRecord(yamlParse2(raw));
+      return asRecord2(yamlParse2(raw));
     }
     const parsed = matter3(raw);
     const data = { ...parsed.data ?? {} };

package/dist/content-reader.js

@@ -8,6 +8,7 @@ import { isDeployedStatic, isBuildMode, readsFromCheckout } from './build-mode.j
 import { isNotFoundError } from './utils/error.js';
 import { resolveEntryLinksInData } from './entry-link-resolver.js';
 import { baseBranchOf } from './utils/base-branch.js';
+import { CONTENT_READER_USER_ID } from './system-users.js';
 /**
  * Server-side helper to read content directly from a branch workspace. A branch with no workspace
  * reads as NOT_FOUND unless `allowCreateBranch` or a `getBranchContext` resolver says otherwise.
@@ -18,7 +19,7 @@ export const createContentReader = (options) => {
     const basePathOverride = options.basePathOverride;
     const defaultBranch = options.defaultBranch ?? services.config.defaultActiveBranch ?? baseBranchOf(services.config);
     const allowCreateBranch = options.allowCreateBranch ?? false;
-    const createdBy = options.createdBy ?? 'canopycms-content-reader';
+    const createdBy = options.createdBy ?? CONTENT_READER_USER_ID;
     const resolveBranchContext = async (branchName) => {
         // Static deployments and builds read from the checkout: loadOrCreateBranchContext
         // returns a synthetic cwd context without git ops, regardless of allowCreateBranch

package/dist/context.js

@@ -8,6 +8,7 @@ import { buildContentTree as buildContentTreeImpl, } from './content-tree.js';
 import { listEntries as listEntriesImpl, } from './content-listing.js';
 import { createDebugLogger } from './utils/debug.js';
 import { baseBranchOf } from './utils/base-branch.js';
+import { CONTEXT_USER_ID } from './system-users.js';
 const log = createDebugLogger({ prefix: 'Context' });
 /** True when a ContentStoreError indicates a path/entry wasn't found (expected during candidate probing). */
 function isLookupFailure(err) {
@@ -114,7 +115,7 @@ export function createCanopyContext(options) {
                     config: services.config,
                     branchName: activeBranch,
                     mode: services.config.mode,
-                    createdBy: 'canopycms-context',
+                    createdBy: CONTEXT_USER_ID,
                     remoteUrl: services.config.defaultRemoteUrl,
                 });
             }

package/dist/editor/BranchManager.js

@@ -4,10 +4,13 @@ import { useRef, useState } from 'react';
 import { Badge, Button, Group, Paper, ScrollArea, Stack, Text, TextInput, Textarea, Collapse, Tooltip, } from '@mantine/core';
 import { BranchComments } from './comments/BranchComments.js';
 import { UserBadge } from './components/UserBadge.js';
+import { userIdLabel } from './user-display.js';
 // Import directly from helpers to avoid server-only code in authorization barrel
 import { isAdmin, isReviewer } from '../authorization/helpers.js';
 import { clientOperatingStrategy } from '../operating-mode/client.js';
 import { formatRelativeTime } from './relative-time.js';
+import { PROTECTED_BRANCH_PRESENTATION, branchStatusPresentation } from './branch-status.js';
+import { SYSTEM_USER_ID } from '../system-users.js';
 /**
  * Compute what actions the current user can perform on a branch.
  * Uses the same hybrid permission model as the backend:
@@ -30,9 +33,9 @@ export const getBranchPermissions = (branch, user) => {
     const userIsReviewer = isReviewer(user.groups);
     const userIsCreator = branch.createdBy === user.userId;
     // The system-branch grant is disabled on the protected base branch -- its
-    // auto-provision marker (createdBy: 'canopycms-system') would otherwise let
+    // auto-provision marker (createdBy: SYSTEM_USER_ID) would otherwise let
     // anyone with general access submit/withdraw/delete it.
-    const isSystemBranch = branch.createdBy === 'canopycms-system' && !branch.isProtected;
+    const isSystemBranch = branch.createdBy === SYSTEM_USER_ID && !branch.isProtected;
     const userInACL = (branch.access?.users?.includes(user.userId) ||
         user.groups?.some((g) => branch.access?.groups?.includes(g))) ??
         false;
@@ -72,10 +75,6 @@ export const getBranchPermissions = (branch, user) => {
         branch.pullRequestState !== 'closed';
     return { canSubmit, canWithdraw, canDelete, canRequestChanges };
 };
-const statusColorMap = {
-    editing: { color: 'brand', variant: 'light' },
-    submitted: { color: 'green', variant: 'light' },
-};
 export const BranchManager = ({ branches, mode, user, onSelect, onBeforeCreate, onCreate, onDelete, onSubmit, onWithdraw, onRequestChanges, onClose: _, comments = [], currentUserId, canResolve = false, onAddComment, onResolveThread, highlightThreadId, onGetUserMetadata, }) => {
     const supportsBranching = clientOperatingStrategy(mode).supportsBranching();
     const [showCreateForm, setShowCreateForm] = useState(false);
@@ -110,21 +109,18 @@ export const BranchManager = ({ branches, mode, user, onSelect, onBeforeCreate,
             setCreating(false);
         }
     };
-    return (_jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, "data-testid": "branch-manager", children: [currentUserId && onAddComment && onResolveThread && (_jsx(Stack, { pt: "sm", children: _jsx(BranchComments, { comments: comments, currentUserId: currentUserId, canResolve: canResolve, onAddComment: onAddComment, onResolveThread: onResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: onGetUserMetadata }) })), !!supportsBranching && (_jsxs(Stack, { gap: "sm", pt: "sm", children: [_jsx(Button, { variant: "light", size: "sm", fullWidth: true, onClick: () => setShowCreateForm(!showCreateForm), disabled: creating, "data-testid": "create-branch-button", children: showCreateForm ? 'Cancel' : 'Create New Branch' }), _jsx(Collapse, { in: showCreateForm, children: _jsx(Paper, { withBorder: true, p: "md", radius: "md", children: _jsxs(Stack, { gap: "sm", children: [_jsx(TextInput, { label: "Branch Name", placeholder: "feature/my-branch", value: newBranchName, onChange: (e) => setNewBranchName(e.target.value), required: true, disabled: creating, "data-testid": "branch-name-input" }), _jsx(TextInput, { label: "Title (optional)", placeholder: "Brief description", value: newBranchTitle, onChange: (e) => setNewBranchTitle(e.target.value), disabled: creating, "data-testid": "branch-title-input" }), _jsx(Textarea, { label: "Description (optional)", placeholder: "Detailed description of the changes", value: newBranchDescription, onChange: (e) => setNewBranchDescription(e.target.value), minRows: 2, disabled: creating, "data-testid": "branch-description-textarea" }), _jsx(Button, { onClick: handleCreate, disabled: !newBranchName.trim(), loading: creating, fullWidth: true, "data-testid": "create-branch-submit", children: "Create Branch" })] }) }) })] })), _jsx(ScrollArea, { style: { flex: 1 }, pb: "md", children: branches.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", py: "md", children: !supportsBranching ? 'Branch management is not available.' : 'No branches available.' })) : (_jsx(Stack, { gap: "sm", children: branches.map((b) => {
-                        const statusColor = statusColorMap[b.status] ?? {
-                            color: 'neutral',
-                            variant: 'light',
-                        };
+    return (_jsxs(Stack, { h: "100%", style: { display: 'flex', flexDirection: 'column' }, gap: 0, "data-testid": "branch-manager", children: [currentUserId && onAddComment && onResolveThread && (_jsx(Stack, { pt: "sm", children: _jsx(BranchComments, { comments: comments, currentUserId: currentUserId, canResolve: canResolve, onAddComment: onAddComment, onResolveThread: onResolveThread, highlightThreadId: highlightThreadId, onGetUserMetadata: onGetUserMetadata }) })), !!supportsBranching && (_jsxs(Stack, { gap: "sm", pt: "sm", children: [_jsx(Button, { variant: "light", size: "sm", fullWidth: true, onClick: () => setShowCreateForm(!showCreateForm), disabled: creating, "data-testid": "create-branch-button", children: showCreateForm ? 'Cancel' : 'Create New Branch' }), _jsx(Collapse, { in: showCreateForm, children: _jsx(Paper, { withBorder: true, p: "md", children: _jsxs(Stack, { gap: "sm", children: [_jsx(TextInput, { label: "Branch Name", placeholder: "feature/my-branch", value: newBranchName, onChange: (e) => setNewBranchName(e.target.value), required: true, disabled: creating, "data-testid": "branch-name-input" }), _jsx(TextInput, { label: "Title (optional)", placeholder: "Brief description", value: newBranchTitle, onChange: (e) => setNewBranchTitle(e.target.value), disabled: creating, "data-testid": "branch-title-input" }), _jsx(Textarea, { label: "Description (optional)", placeholder: "Detailed description of the changes", value: newBranchDescription, onChange: (e) => setNewBranchDescription(e.target.value), minRows: 2, disabled: creating, "data-testid": "branch-description-textarea" }), _jsx(Button, { size: "sm", onClick: handleCreate, disabled: !newBranchName.trim(), loading: creating, fullWidth: true, "data-testid": "create-branch-submit", children: "Create Branch" })] }) }) })] })), _jsx(ScrollArea, { style: { flex: 1 }, pb: "md", children: branches.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", py: "md", children: !supportsBranching ? 'Branch management is not available.' : 'No branches available.' })) : (_jsx(Stack, { gap: "sm", children: branches.map((b) => {
+                        const statusBadge = branchStatusPresentation(b.status);
                         const perms = getBranchPermissions(b, user);
-                        return (_jsx(Paper, { withBorder: true, radius: "md", p: "md", shadow: "xs", "data-testid": `branch-list-item-${b.name}`, children: _jsxs(Group, { justify: "space-between", align: "flex-start", children: [_jsxs(Stack, { gap: 4, children: [_jsxs(Group, { gap: "xs", children: [_jsx(Text, { fw: 600, children: b.name }), _jsx(Badge, { color: statusColor.color, variant: statusColor.variant, "data-testid": `branch-status-badge-${b.name}`, children: b.status }), b.status === 'archived' && b.mergedAt && (_jsx(Badge, { color: "teal", variant: "light", "data-testid": `branch-merged-badge-${b.name}`, children: "Merged" })), b.isProtected && (_jsx(Badge, { color: "neutral", variant: "outline", "data-testid": `branch-protected-badge-${b.name}`, children: "Protected" })), b.pullRequestNumber && (_jsxs(Badge, { color: b.pullRequestState === 'closed'
+                        return (_jsx(Paper, { withBorder: true, p: "md", shadow: "xs", "data-testid": `branch-list-item-${b.name}`, children: _jsxs(Group, { justify: "space-between", align: "flex-start", children: [_jsxs(Stack, { gap: 4, children: [_jsxs(Group, { gap: "xs", children: [_jsx(Text, { fw: 600, children: b.name }), statusBadge && (_jsx(Badge, { color: statusBadge.color, variant: statusBadge.variant, "data-testid": `branch-status-badge-${b.name}`, "data-status": b.status, children: statusBadge.label })), b.status === 'archived' && b.mergedAt && (_jsx(Badge, { color: "teal", variant: "light", "data-testid": `branch-merged-badge-${b.name}`, children: "Merged" })), b.isProtected && (_jsx(Badge, { color: PROTECTED_BRANCH_PRESENTATION.color, variant: PROTECTED_BRANCH_PRESENTATION.variant, "data-testid": `branch-protected-badge-${b.name}`, children: PROTECTED_BRANCH_PRESENTATION.label })), b.pullRequestNumber && (_jsxs(Badge, { color: b.pullRequestState === 'closed'
                                                             ? 'red'
                                                             : b.pullRequestState === 'merged'
                                                                 ? 'violet'
                                                                 : 'blue', variant: "light", children: ["PR #", b.pullRequestNumber, b.pullRequestState === 'closed' ? ' (closed)' : ''] })), b.commentCount !== undefined && b.commentCount > 0 && (_jsxs(Badge, { color: "grape", variant: "light", children: [b.commentCount, " ", b.commentCount === 1 ? 'comment' : 'comments'] })), b.syncStatus === 'sync-failed' && (_jsx(Tooltip, { label: "GitHub sync failed \u2014 an admin can retry it from System health.", disabled: Boolean(b.syncFailureReason), multiline: true, maw: 320, children: _jsx(Badge, { color: "red", variant: "light", "data-testid": `sync-failed-badge-${b.name}`, children: "Sync failed" }) })), b.syncStatus === 'pending-sync' && (_jsx(Tooltip, { label: "Changes are on their way to GitHub.", children: _jsx(Badge, { color: "gray", variant: "light", "data-testid": `pending-sync-badge-${b.name}`, children: "Syncing\u2026" }) })), b.conflictStatus === 'conflicts-detected' && (_jsx(Tooltip, { label: "This branch's version was kept for conflicting entries during a rebase \u2014 review the flagged entries.", children: _jsxs(Badge, { color: "orange", variant: "light", "data-testid": `conflicts-badge-${b.name}`, children: ["Conflicts", b.conflictFiles?.length ? ` (${b.conflictFiles.length})` : ''] }) }))] }), b.syncStatus === 'sync-failed' && b.syncFailureReason && (_jsxs(Text, { size: "xs", c: "red", maw: 480, "data-testid": `sync-failed-reason-${b.name}`, children: [b.syncFailureReason, b.status === 'submitted' &&
-                                                        ' Withdraw this branch to unlock it for editing.'] })), _jsxs(Group, { gap: "xs", align: "center", children: [b.updatedAt && (_jsx(Tooltip, { label: new Date(b.updatedAt).toLocaleString(), children: _jsxs(Text, { size: "xs", c: "dimmed", children: ["Updated ", formatRelativeTime(b.updatedAt)] }) })), b.createdBy && (_jsxs(_Fragment, { children: [_jsx(Text, { size: "xs", c: "dimmed", children: "\u2022" }), _jsx(Text, { size: "xs", c: "dimmed", children: "Owner:" }), onGetUserMetadata ? (_jsx(UserBadge, { userId: b.createdBy, getUserMetadata: onGetUserMetadata, variant: "avatar-name", size: "xs", showEmailTooltip: true, showBadge: true, badgeVariant: "light", color: "gray" })) : (_jsx(Text, { size: "xs", c: "dimmed", children: b.createdBy }))] })), b.pullRequestUrl && (_jsxs(_Fragment, { children: [_jsx(Text, { size: "xs", c: "dimmed", children: "\u2022" }), _jsx(Text, { size: "xs", c: "blue", component: "a", href: b.pullRequestUrl, target: "_blank", rel: "noopener noreferrer", style: {
+                                                        ' Withdraw this branch to unlock it for editing.'] })), _jsxs(Group, { gap: "xs", align: "center", children: [b.updatedAt && (_jsx(Tooltip, { label: new Date(b.updatedAt).toLocaleString(), children: _jsxs(Text, { size: "xs", c: "dimmed", children: ["Updated ", formatRelativeTime(b.updatedAt)] }) })), b.createdBy && (_jsxs(_Fragment, { children: [_jsx(Text, { size: "xs", c: "dimmed", children: "\u2022" }), _jsx(Text, { size: "xs", c: "dimmed", children: "Owner:" }), onGetUserMetadata ? (_jsx(UserBadge, { userId: b.createdBy, getUserMetadata: onGetUserMetadata, variant: "avatar-name", size: "xs", showEmailTooltip: true, showBadge: true, badgeVariant: "light", color: "gray" })) : (_jsx(Text, { size: "xs", c: "dimmed", children: userIdLabel(b.createdBy) }))] })), b.pullRequestUrl && (_jsxs(_Fragment, { children: [_jsx(Text, { size: "xs", c: "dimmed", children: "\u2022" }), _jsx(Text, { size: "xs", c: "blue", component: "a", href: b.pullRequestUrl, target: "_blank", rel: "noopener noreferrer", style: {
                                                                     textDecoration: 'underline',
                                                                     cursor: 'pointer',
-                                                                }, children: "View PR" })] }))] }), b.access && (_jsxs(Group, { gap: 6, children: [b.access.users?.map((u) => onGetUserMetadata ? (_jsx(UserBadge, { userId: u, getUserMetadata: onGetUserMetadata, variant: "avatar-only", size: "xs", showEmailTooltip: true }, u)) : (_jsx(Badge, { variant: "outline", color: "neutral", children: u }, u))), b.access.groups?.map((g) => (_jsx(Badge, { variant: "outline", color: "neutral", children: g }, g)))] }))] }), _jsxs(Group, { gap: 8, children: [_jsx(Button, { size: "xs", variant: "light", onClick: () => onSelect?.(b.name), "data-testid": `switch-to-branch-button-${b.name}`, children: "Open" }), b.status === 'submitted' || b.status === 'approved' ? (_jsx(Tooltip, { label: "Only the branch creator can withdraw", disabled: perms.canWithdraw, children: _jsx(Button, { size: "xs", variant: "light", color: "orange", onClick: () => onWithdraw?.(b.name), disabled: !perms.canWithdraw, "data-testid": `withdraw-branch-button-${b.name}`, children: "Withdraw" }) })) : (_jsx(Tooltip, { label: b.isProtected
+                                                                }, children: "View PR" })] }))] }), b.access && (_jsxs(Group, { gap: 6, children: [b.access.users?.map((u) => onGetUserMetadata ? (_jsx(UserBadge, { userId: u, getUserMetadata: onGetUserMetadata, variant: "avatar-only", size: "xs", showEmailTooltip: true }, u)) : (_jsx(Badge, { variant: "outline", color: "neutral", children: u }, u))), b.access.groups?.map((g) => (_jsx(Badge, { variant: "outline", color: "neutral", children: g }, g)))] }))] }), _jsxs(Group, { gap: 8, children: [_jsx(Button, { variant: "light", onClick: () => onSelect?.(b.name), "data-testid": `switch-to-branch-button-${b.name}`, children: "Open" }), b.status === 'submitted' || b.status === 'approved' ? (_jsx(Tooltip, { label: "Only the branch creator can withdraw", disabled: perms.canWithdraw, children: _jsx(Button, { variant: "light", color: "orange", onClick: () => onWithdraw?.(b.name), disabled: !perms.canWithdraw, "data-testid": `withdraw-branch-button-${b.name}`, children: "Withdraw" }) })) : (_jsx(Tooltip, { label: b.isProtected
                                                     ? 'The base branch cannot be submitted'
                                                     : // A status arm: canSubmit folds in the server's status rule as
                                                         // well as the base-branch one, so an archived (or any
@@ -132,9 +128,9 @@ export const BranchManager = ({ branches, mode, user, onSelect, onBeforeCreate,
                                                         // generic "Only the branch creator can submit".
                                                         b.status !== 'editing'
                                                             ? `A branch with status "${b.status}" cannot be submitted`
-                                                            : 'Only the branch creator can submit', disabled: perms.canSubmit, children: _jsx(Button, { size: "xs", variant: "light", color: "green", onClick: () => onSubmit?.(b.name), disabled: !perms.canSubmit, "data-testid": `submit-branch-button-${b.name}`, children: "Submit" }) })), _jsx(Tooltip, { label: b.pullRequestState === 'closed'
+                                                            : 'Only the branch creator can submit', disabled: perms.canSubmit, children: _jsx(Button, { variant: "light", color: "green", onClick: () => onSubmit?.(b.name), disabled: !perms.canSubmit, "data-testid": `submit-branch-button-${b.name}`, children: "Submit" }) })), _jsx(Tooltip, { label: b.pullRequestState === 'closed'
                                                     ? 'PR was closed on GitHub without merging'
-                                                    : 'Only Reviewers or Admins can request changes', disabled: perms.canRequestChanges, children: _jsx(Button, { size: "xs", variant: "outline", color: "neutral", onClick: () => onRequestChanges?.(b.name), disabled: !perms.canRequestChanges, "data-testid": `request-changes-branch-button-${b.name}`, children: "Request changes" }) }), _jsx(Tooltip, { label: b.isProtected
+                                                    : 'Only Reviewers or Admins can request changes', disabled: perms.canRequestChanges, children: _jsx(Button, { variant: "outline", color: "neutral", onClick: () => onRequestChanges?.(b.name), disabled: !perms.canRequestChanges, "data-testid": `request-changes-branch-button-${b.name}`, children: "Request changes" }) }), _jsx(Tooltip, { label: b.isProtected
                                                     ? 'The base branch cannot be deleted'
                                                     : // A status arm, mirroring the Submit tooltip above: without it,
                                                         // a branch blocked by its own status reads the generic "Only
@@ -143,6 +139,6 @@ export const BranchManager = ({ branches, mode, user, onSelect, onBeforeCreate,
                                                         // mean an open PR is blocking deletion.
                                                         b.status === 'submitted' || b.status === 'approved'
                                                             ? `Cannot delete branch with open PR (status "${b.status}")`
-                                                            : 'Only Admin or branch creator can delete', disabled: perms.canDelete, children: _jsx(Button, { size: "xs", variant: "outline", color: "red", onClick: () => onDelete?.(b.name), disabled: !perms.canDelete, "data-testid": `delete-branch-button-${b.name}`, children: "Delete" }) })] })] }) }, b.name));
+                                                            : 'Only Admin or branch creator can delete', disabled: perms.canDelete, children: _jsx(Button, { variant: "outline", color: "red", onClick: () => onDelete?.(b.name), disabled: !perms.canDelete, "data-testid": `delete-branch-button-${b.name}`, children: "Delete" }) })] })] }) }, b.name));
                     }) })) })] }));
 };

package/dist/editor/CommentsPanel.js

@@ -3,6 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { Badge, Button, Drawer, Group, Paper, ScrollArea, Stack, Text, Textarea, Title, Switch, } from '@mantine/core';
 import { UserBadge } from './components/UserBadge.js';
+import { userIdLabel } from './user-display.js';
 import { formatRelativeTime } from './relative-time.js';
 export const CommentsPanel = ({ branchName, comments, canResolve, onAddComment, onResolveThread, onClose, onJumpToField, onJumpToEntry, onJumpToBranch, onGetUserMetadata, }) => {
     const [newCommentText, setNewCommentText] = useState('');
@@ -40,26 +41,26 @@ export const CommentsPanel = ({ branchName, comments, canResolve, onAddComment,
             setIsSubmitting(false);
         }
     };
-    return (_jsx(Drawer, { opened: true, onClose: onClose, position: "right", size: 420, title: _jsxs("div", { children: [_jsx(Title, { order: 4, children: "Comments" }), _jsx(Text, { size: "xs", c: "dimmed", children: branchName })] }), children: _jsxs(Stack, { gap: "md", h: "100%", style: { display: 'flex', flexDirection: 'column' }, children: [_jsx(Paper, { withBorder: true, p: "md", children: _jsxs(Stack, { gap: "sm", children: [replyTo && (_jsxs(Group, { justify: "space-between", children: [_jsx(Text, { size: "xs", c: "dimmed", children: "Replying to thread" }), _jsx(Button, { size: "xs", variant: "subtle", onClick: () => setReplyTo(null), children: "Cancel" })] })), !replyTo && (_jsxs(Text, { size: "xs", c: "dimmed", children: ["Posts a branch-level comment on \"", branchName, "\". Use a field's \"New comment\" link for field-specific threads."] })), _jsx(Textarea, { placeholder: replyTo ? 'Write a reply...' : 'Write a comment...', value: newCommentText, onChange: (e) => setNewCommentText(e.target.value), minRows: 3, disabled: isSubmitting, "data-testid": "comment-textarea" }), _jsx(Button, { onClick: handleAddComment, size: "sm", loading: isSubmitting, disabled: !newCommentText.trim(), "data-testid": "comment-submit", children: replyTo ? 'Reply' : 'Add Comment' })] }) }), _jsxs(Group, { justify: "space-between", children: [_jsxs(Text, { size: "sm", fw: 500, children: [filteredThreads.length, " ", filteredThreads.length === 1 ? 'thread' : 'threads'] }), _jsx(Switch, { label: "Show resolved", checked: showResolved, onChange: (e) => setShowResolved(e.currentTarget.checked), size: "sm" })] }), _jsx(ScrollArea, { style: { flex: 1 }, children: filteredThreads.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", ta: "center", py: "xl", children: showResolved ? 'No comments yet' : 'No unresolved comments' })) : (_jsx(Stack, { gap: "md", children: filteredThreads.map((thread) => (_jsx(Paper, { withBorder: true, p: "md", bg: thread.resolved ? 'gray.0' : undefined, "data-testid": "comment-thread", children: _jsxs(Stack, { gap: "xs", children: [_jsxs(Group, { justify: "space-between", align: "flex-start", children: [_jsxs(Group, { gap: "xs", children: [_jsx(Badge, { size: "xs", variant: "outline", color: thread.type === 'field'
+    return (_jsx(Drawer, { opened: true, onClose: onClose, position: "right", size: 420, title: _jsxs("div", { children: [_jsx(Title, { order: 4, children: "Comments" }), _jsx(Text, { size: "xs", c: "dimmed", children: branchName })] }), children: _jsxs(Stack, { gap: "md", h: "100%", style: { display: 'flex', flexDirection: 'column' }, children: [_jsx(Paper, { withBorder: true, p: "md", children: _jsxs(Stack, { gap: "sm", children: [replyTo && (_jsxs(Group, { justify: "space-between", children: [_jsx(Text, { size: "xs", c: "dimmed", children: "Replying to thread" }), _jsx(Button, { variant: "subtle", onClick: () => setReplyTo(null), children: "Cancel" })] })), !replyTo && (_jsxs(Text, { size: "xs", c: "dimmed", children: ["Posts a branch-level comment on \"", branchName, "\". Use a field's \"New comment\" link for field-specific threads."] })), _jsx(Textarea, { placeholder: replyTo ? 'Write a reply...' : 'Write a comment...', value: newCommentText, onChange: (e) => setNewCommentText(e.target.value), minRows: 3, disabled: isSubmitting, "data-testid": "comment-textarea" }), _jsx(Button, { onClick: handleAddComment, size: "sm", loading: isSubmitting, disabled: !newCommentText.trim(), "data-testid": "comment-submit", children: replyTo ? 'Reply' : 'Add Comment' })] }) }), _jsxs(Group, { justify: "space-between", children: [_jsxs(Text, { size: "sm", fw: 500, children: [filteredThreads.length, " ", filteredThreads.length === 1 ? 'thread' : 'threads'] }), _jsx(Switch, { label: "Show resolved", checked: showResolved, onChange: (e) => setShowResolved(e.currentTarget.checked), size: "sm" })] }), _jsx(ScrollArea, { style: { flex: 1 }, children: filteredThreads.length === 0 ? (_jsx(Text, { size: "sm", c: "dimmed", ta: "center", py: "xl", children: showResolved ? 'No comments yet' : 'No unresolved comments' })) : (_jsx(Stack, { gap: "md", children: filteredThreads.map((thread) => (_jsx(Paper, { withBorder: true, p: "md", bg: thread.resolved ? 'gray.0' : undefined, "data-testid": "comment-thread", children: _jsxs(Stack, { gap: "xs", children: [_jsxs(Group, { justify: "space-between", align: "flex-start", children: [_jsxs(Group, { gap: "xs", children: [_jsx(Badge, { size: "xs", variant: "outline", color: thread.type === 'field'
                                                             ? 'blue'
                                                             : thread.type === 'entry'
                                                                 ? 'grape'
-                                                                : 'gray', children: thread.type }), thread.entryPath && (_jsx(Badge, { size: "xs", variant: "light", children: thread.entryPath })), thread.canopyPath && (_jsx(Badge, { size: "xs", variant: "dot", children: thread.canopyPath })), thread.resolved && (_jsx(Badge, { size: "xs", color: "green", variant: "light", children: "Resolved" }))] }), _jsx(Group, { gap: "xs", children: canResolve && !thread.resolved && (_jsx(Button, { size: "xs", variant: "subtle", color: "green", onClick: () => handleResolve(thread.id), loading: isSubmitting, children: "Resolve" })) })] }), _jsxs(Group, { gap: "xs", children: [thread.type === 'field' &&
+                                                                : 'gray', children: thread.type }), thread.entryPath && (_jsx(Badge, { size: "xs", variant: "light", children: thread.entryPath })), thread.canopyPath && (_jsx(Badge, { size: "xs", variant: "dot", children: thread.canopyPath })), thread.resolved && (_jsx(Badge, { size: "xs", color: "green", variant: "light", children: "Resolved" }))] }), _jsx(Group, { gap: "xs", children: canResolve && !thread.resolved && (_jsx(Button, { variant: "subtle", color: "green", onClick: () => handleResolve(thread.id), loading: isSubmitting, children: "Resolve" })) })] }), _jsxs(Group, { gap: "xs", children: [thread.type === 'field' &&
                                                 thread.entryPath &&
                                                 thread.canopyPath &&
-                                                onJumpToField && (_jsx(Button, { size: "xs", variant: "light", onClick: () => {
+                                                onJumpToField && (_jsx(Button, { variant: "light", onClick: () => {
                                                     onJumpToField(thread.entryPath, thread.canopyPath, thread.id);
                                                     onClose();
-                                                }, children: "Jump to field" })), thread.type === 'entry' && thread.entryPath && onJumpToEntry && (_jsx(Button, { size: "xs", variant: "light", onClick: () => {
+                                                }, children: "Jump to field" })), thread.type === 'entry' && thread.entryPath && onJumpToEntry && (_jsx(Button, { variant: "light", onClick: () => {
                                                     onJumpToEntry(thread.entryPath, thread.id);
                                                     onClose();
-                                                }, children: "Jump to entry" })), thread.type === 'branch' && onJumpToBranch && (_jsx(Button, { size: "xs", variant: "light", onClick: () => {
+                                                }, children: "Jump to entry" })), thread.type === 'branch' && onJumpToBranch && (_jsx(Button, { variant: "light", onClick: () => {
                                                     onJumpToBranch(thread.id);
                                                     onClose();
                                                 }, children: "Open branch discussion" }))] }), thread.comments.map((comment, idx) => (_jsxs("div", { children: [idx > 0 && (_jsx("div", { style: {
                                                     borderTop: '1px solid var(--mantine-color-gray-3)',
                                                     margin: '8px 0',
-                                                } })), _jsxs(Stack, { gap: 4, children: [_jsxs(Group, { gap: "xs", children: [onGetUserMetadata ? (_jsx(UserBadge, { userId: comment.userId, getUserMetadata: onGetUserMetadata, variant: "avatar-name", size: "xs", showEmailTooltip: true, showBadge: true, badgeVariant: "light", color: "gray" })) : (_jsx(Text, { size: "xs", fw: 500, children: comment.userId })), _jsx(Text, { size: "xs", c: "dimmed", title: new Date(comment.timestamp).toLocaleString(), children: formatRelativeTime(comment.timestamp) })] }), _jsx(Text, { size: "sm", style: { whiteSpace: 'pre-wrap' }, children: comment.text })] })] }, comment.id))), !thread.resolved && (_jsx(Button, { size: "xs", variant: "subtle", onClick: () => {
+                                                } })), _jsxs(Stack, { gap: 4, children: [_jsxs(Group, { gap: "xs", children: [onGetUserMetadata ? (_jsx(UserBadge, { userId: comment.userId, getUserMetadata: onGetUserMetadata, variant: "avatar-name", size: "xs", showEmailTooltip: true, showBadge: true, badgeVariant: "light", color: "gray" })) : (_jsx(Text, { size: "xs", fw: 500, children: userIdLabel(comment.userId) })), _jsx(Text, { size: "xs", c: "dimmed", title: new Date(comment.timestamp).toLocaleString(), children: formatRelativeTime(comment.timestamp) })] }), _jsx(Text, { size: "sm", style: { whiteSpace: 'pre-wrap' }, children: comment.text })] })] }, comment.id))), !thread.resolved && (_jsx(Button, { variant: "subtle", onClick: () => {
                                             setReplyTo(thread.id);
                                             setNewCommentText('');
                                         }, mt: "xs", children: "Reply" }))] }) }, thread.id))) })) })] }) }));