@backmatter/studio 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backmatter/studio",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "The Backmatter editing surface: document editor, AI chat, publish. Mounted on your site or hosted on the dashboard.",
   "type": "module",
   "publishConfig": {
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@ai-sdk/react": "^4.0.100",
-    "@backmatter/core": "^0.0.27",
+    "@backmatter/core": "^0.0.28",
     "@base-ui/react": "^1.6.0",
     "@central-icons-react/round-outlined-radius-2-stroke-1.5": "1.2.15",
     "@dnd-kit/abstract": "^0.5.0",

package/src/api.ts

@@ -1,5 +1,4 @@
 // packages/studio/src/api.ts
-import { encodeDocLocale } from "@backmatter/core";
 import { replicaQuery, type ReplicaCache } from "./replica/cache";
 import type { ReplicaBody } from "./replica/types";
 import { apiCredentials, apiHeaders, apiUrl, reportUnauthorized } from "./studio-config";
@@ -160,7 +159,6 @@ export type WorkspaceDetail = {
   githubDefaultBranch: string | null;
   contentRoot: string | null;
   githubDirectory: string | null;
-  locales: string[];
   siteUrls: string[];
   /** Last `@backmatter/studio` version each site reported, keyed by origin. */
   studioVersions?: Record<string, { version: string; seenAt: string }>;
@@ -399,7 +397,6 @@ export type ChangeStatus = "modified" | "added" | "conflict" | "deleted";
 export type DocStatus = "clean" | ChangeStatus;
 
 export type GitChange = {
-  locale: string;
   type: string;
   slug: string;
   status: ChangeStatus;
@@ -454,7 +451,6 @@ export type CommitResult = {
   message: string;
   branch: string;
   files: Array<{
-    locale: string;
     type: string;
     slug: string;
     githubPath: string;
@@ -474,7 +470,7 @@ export function commitWorkspace(workspaceId: string, message?: string) {
 export function defaultCommitMessage(changes: GitChange[]) {
   if (changes.length === 1) {
     const f = changes[0]!;
-    return `backmatter: update ${f.type}/${f.slug} (${f.locale})`;
+    return `backmatter: update ${f.type}/${f.slug}`;
   }
   return `backmatter: update ${changes.length} files`;
 }
@@ -486,7 +482,6 @@ export function notifyWorkspaceChanged() {
 
 export type TreeChangeDetail = {
   workspaceId: string;
-  locale: string;
   type: string;
   slug: string;
   status?: DocStatus;
@@ -512,12 +507,11 @@ export function notifyHeadChanged() {
  */
 export function publishCommittedFiles(
   workspaceId: string,
-  files: Array<{ locale: string; type: string; slug: string; githubSha: string }>,
+  files: Array<{ type: string; slug: string; githubSha: string }>,
 ) {
   for (const file of files) {
     notifyTreeChanged({
       workspaceId,
-      locale: file.locale,
       type: file.type,
       slug: file.slug,
       ...(file.githubSha ? { status: "clean" } : { remove: true }),
@@ -561,22 +555,18 @@ export async function importContent(workspaceId: string) {
 export const pullFromGithub = importContent;
 
 export type DocListItem = {
-  locale: string;
   type: string;
   slug: string;
   status: DocStatus;
 };
 
-export { encodeDocLocale };
-
 export function docApiPath(
   workspaceId: string,
-  locale: string,
   type: string,
   slug: string,
   suffix = "",
 ) {
-  return `/workspaces/${workspaceId}/docs/${encodeURIComponent(encodeDocLocale(locale))}/${encodeURIComponent(type)}/${encodeURIComponent(slug)}${suffix}`;
+  return `/workspaces/${workspaceId}/docs/${encodeURIComponent(type)}/${encodeURIComponent(slug)}${suffix}`;
 }
 
 export function fetchDocs(workspaceId: string) {
@@ -597,7 +587,7 @@ export function fetchDocNav(
     q?: string;
     limit?: number;
     offset?: number;
-    current?: { locale: string; type: string; slug: string };
+    current?: { type: string; slug: string };
   } = {},
 ) {
   const qs = new URLSearchParams({ nav: "1" });
@@ -605,7 +595,6 @@ export function fetchDocNav(
   if (input.limit !== undefined) qs.set("limit", String(input.limit));
   if (input.offset !== undefined) qs.set("offset", String(input.offset));
   if (input.current) {
-    qs.set("locale", input.current.locale);
     qs.set("type", input.current.type);
     qs.set("slug", input.current.slug);
   }
@@ -614,13 +603,11 @@ export function fetchDocNav(
 
 export function fetchDoc(
   workspaceId: string,
-  locale: string,
   type: string,
   slug: string,
 ) {
   return api<{
     doc: {
-      locale: string;
       type: string;
       slug: string;
       branch: string;
@@ -643,7 +630,7 @@ export function fetchDoc(
       } | null;
       parseError?: string | null;
     };
-  }>(docApiPath(workspaceId, locale, type, slug));
+  }>(docApiPath(workspaceId, type, slug));
 }
 
 /** `head` = committed on the branch; `tree` = my uncommitted working copy. */
@@ -652,14 +639,12 @@ export type ContentSource = "head" | "tree";
 /** Save into my working tree (autosave). */
 export function saveDoc(
   workspaceId: string,
-  locale: string,
   type: string,
   slug: string,
   input: { frontmatter: Record<string, unknown>; body: string },
 ) {
   return api<{
     doc: {
-      locale: string;
       type: string;
       slug: string;
       source: "tree";
@@ -667,7 +652,7 @@ export function saveDoc(
       headSha: string | null;
       raw: string;
     };
-  }>(docApiPath(workspaceId, locale, type, slug), {
+  }>(docApiPath(workspaceId, type, slug), {
     method: "PUT",
     body: JSON.stringify(input),
   });
@@ -676,12 +661,11 @@ export function saveDoc(
 /** Drop my uncommitted copy; the doc reads from HEAD again. */
 export function revertDoc(
   workspaceId: string,
-  locale: string,
   type: string,
   slug: string,
 ) {
   return api<{ ok: true }>(
-    docApiPath(workspaceId, locale, type, slug, "/tree"),
+    docApiPath(workspaceId, type, slug, "/tree"),
     { method: "DELETE" },
   );
 }
@@ -689,13 +673,12 @@ export function revertDoc(
 /** Resolve a conflict: keep mine (rebase onto the new HEAD) or take theirs (revert). */
 export function resolveDoc(
   workspaceId: string,
-  locale: string,
   type: string,
   slug: string,
   strategy: "mine" | "theirs",
 ) {
   return api<{ ok: true; status: DocStatus; headSha: string | null }>(
-    docApiPath(workspaceId, locale, type, slug, "/resolve"),
+    docApiPath(workspaceId, type, slug, "/resolve"),
     { method: "POST", body: JSON.stringify({ strategy }) },
   );
 }
@@ -746,7 +729,6 @@ export type ChatChangeSummary = {
   userId: string;
   branch: string;
   resourceKind: "content";
-  locale: string;
   type: string;
   slug: string;
   op: "write" | "create";

package/src/chat/ChangeCard.tsx

@@ -29,15 +29,7 @@ export function ChangeCard({
   const [expanded, setExpanded] = useState(false);
   const nav = useWorkspaceNav();
   const label = `${change.type}/${change.slug}`;
-  const to = nav
-    ? contentDocPath(
-        nav.workspaceSlug,
-        change.type,
-        change.slug,
-        change.locale,
-        nav.defaultLocale,
-      )
-    : "#";
+  const to = nav ? contentDocPath(nav.workspaceSlug, change.type, change.slug) : "#";
   const status = change.status;
 
   return (
@@ -69,7 +61,7 @@ export function ChangeCard({
         )}
         {change.diff?.renamedFrom ? (
           <span {...stylex.props(styles.badge)}>
-            {change.diff.renamedFrom} → {change.slug}
+            {`${change.diff.renamedFrom} → ${change.slug}`}
           </span>
         ) : change.op === "create" ? (
           <span {...stylex.props(styles.badge)}>new</span>

package/src/chat/ChatMessage.tsx

@@ -19,6 +19,7 @@ import {
   stackChanges,
   toolLabel,
   trimPartialPlaceholder,
+  changesInToolOutput,
   type WriteToolOutput,
 } from "./chat-helpers";
 import { CheckIcon, EyeIcon, FileIcon, SearchIcon, UndoIcon } from "./icons";
@@ -33,7 +34,7 @@ type ToolPart = Extract<UIMessage["parts"][number], { toolCallId: string }>;
 type ListDocsOutput = { docs: DocCardItem[]; total?: number };
 type SearchDocsOutput = {
   matches: Array<{
-    docRef: { locale: string; type: string; slug: string };
+    docRef: { type: string; slug: string };
     source?: string;
     excerpt?: string;
     title?: string | null;
@@ -256,13 +257,7 @@ export function ChatMessage({
           const failed =
             tp.state === "output-error" ||
             (out !== null && (write || commit) && !out.ok);
-          const outChange = write && out && out.ok ? out.change : null;
-          const change = outChange
-            ? {
-                ...(session.changes[outChange.id] ?? outChange),
-                summary: session.changes[outChange.id]?.summary ?? outChange.summary,
-              }
-            : null;
+          const written = write && out && out.ok ? changesInToolOutput(out) : [];
           // Doc lists placed inline via [[docs]] are not repeated here. While
           // streaming, the placeholder usually arrives a moment after the tool
           // result, so hold the fallback back until the stream has ended;
@@ -271,7 +266,14 @@ export function ChatMessage({
             tp.state === "output-available" && !inlined.has(i) && !streaming
               ? docListFromTool(name, tp.output)
               : null;
-          const viewStatus = change ? presentedChangeStatus(change, stack) : null;
+          const cards = written.map((raw) => {
+            const change = {
+              ...(session.changes[raw.id] ?? raw),
+              summary: session.changes[raw.id]?.summary ?? raw.summary,
+            };
+            const viewStatus = presentedChangeStatus(change, stack);
+            return { change, viewStatus };
+          });
           return (
             <Reveal key={tp.toolCallId} active={streaming} origin="start">
               <div {...stylex.props(styles.toolBlock)}>
@@ -294,16 +296,19 @@ export function ChatMessage({
                     emptyLabel={name === "searchDocs" ? "No matches" : "No documents"}
                   />
                 ) : null}
-                {change && viewStatus ? (
-                  <ChangeCard
-                    change={{ ...change, status: viewStatus }}
-                    workspaceId={workspaceId}
-                    busy={busyId === change.id}
-                    canAct={canAct && !streaming}
-                    onKeep={() => void act(change.id, () => session.keep(change.id))}
-                    onUndo={() => void act(change.id, () => session.undo(change.id))}
-                  />
-                ) : null}
+                {cards.map(({ change, viewStatus }) =>
+                  viewStatus ? (
+                    <ChangeCard
+                      key={change.id}
+                      change={{ ...change, status: viewStatus }}
+                      workspaceId={workspaceId}
+                      busy={busyId === change.id}
+                      canAct={canAct && !streaming}
+                      onKeep={() => void act(change.id, () => session.keep(change.id))}
+                      onUndo={() => void act(change.id, () => session.undo(change.id))}
+                    />
+                  ) : null,
+                )}
               </div>
             </Reveal>
           );

package/src/chat/ChatProvider.tsx

@@ -56,9 +56,10 @@ import {
 import {
   changeIdsInMessage,
   isWriteTool,
+  changesInToolOutput,
+  detailForTreePatch,
   treeStatusPatches,
   type TreeStatusPatch,
-  type WriteToolOutput,
 } from "./chat-helpers";
 import {
   initialPanelState,
@@ -158,27 +159,24 @@ const modelStorageKey = (ws: string) => `backmatter-chat-model:${ws}`;
 function publishTreePatches(workspaceId: string, patches: TreeStatusPatch[]) {
   let published = false;
   for (const patch of patches) {
-    notifyTreeChanged({
-      workspaceId,
-      locale: patch.locale,
-      type: patch.type,
-      slug: patch.slug,
-      ...(patch.absent ? { remove: true } : { status: patch.status }),
-    });
+    notifyTreeChanged(detailForTreePatch(workspaceId, patch));
     // A published file stays on screen; head-changed reloads it once. A file
     // that disappeared still needs the open editor to drop it.
     if (patch.absent || patch.status !== "clean") {
-      notifyDocChanged({ locale: patch.locale, type: patch.type, slug: patch.slug });
+      notifyDocChanged({ type: patch.type, slug: patch.slug });
     }
     if (patch.status === "clean") published = true;
   }
   if (published) notifyHeadChanged();
+  // The per-file patch updates the tree immediately. A refetch picks up a
+  // file the patch missed, and drops one the server no longer lists.
+  notifyTreeChanged();
 }
 
 function refFromInput(input: unknown): DocRef | null {
   const ref = (input as { docRef?: Partial<DocRef> } | undefined)?.docRef;
-  if (!ref || !ref.locale || !ref.type || !ref.slug) return null;
-  return { locale: ref.locale, type: ref.type, slug: ref.slug };
+  if (!ref || !ref.type || !ref.slug) return null;
+  return { type: ref.type, slug: ref.slug };
 }
 
 export function ChatProvider({
@@ -636,9 +634,13 @@ function LiveSession({
           seen.add(part.toolCallId);
           const patches = treeStatusPatches(part.output);
           if (patches.length > 0) publishTreePatches(workspaceId, patches);
-          const out = part.output as WriteToolOutput | undefined;
-          if (write && out?.ok) {
-            setChanges((prev) => ({ ...prev, [out.change.id]: out.change }));
+          const found = write ? changesInToolOutput(part.output) : [];
+          if (found.length > 0) {
+            setChanges((prev) => {
+              const next = { ...prev };
+              for (const change of found) next[change.id] = change;
+              return next;
+            });
             if (patches.length === 0) {
               if (ref) notifyDocChanged(ref);
               notifyTreeChanged();
@@ -655,7 +657,7 @@ function LiveSession({
   const applyChangeResult = useCallback((change: ChatChangeSummary, notify: boolean) => {
     setChanges((prev) => ({ ...prev, [change.id]: { ...prev[change.id], ...change } }));
     if (notify) {
-      notifyDocChanged({ locale: change.locale, type: change.type, slug: change.slug });
+      notifyDocChanged({ type: change.type, slug: change.slug });
       notifyTreeChanged();
     }
   }, []);

package/src/chat/DocListCard.tsx

@@ -14,7 +14,6 @@ import { ChevronDownIcon, FileIcon } from "./icons";
 const hover = "@media (hover: hover)";
 
 export type DocCardItem = {
-  locale: string;
   type: string;
   slug: string;
   title?: string | null;
@@ -57,7 +56,6 @@ export function DocListCard({
 
   const groups = groupByType(items);
   const multiType = groups.length > 1;
-  const multiLocale = new Set(items.map((d) => d.locale)).size > 1;
   const hidden = expanded ? 0 : Math.max(0, items.length - COLLAPSED_ROWS);
   const truncated = total !== undefined && total > items.length ? total - items.length : 0;
 
@@ -78,10 +76,9 @@ export function DocListCard({
             ) : null}
             {shown.map((doc) => (
               <DocRow
-                key={`${doc.locale}/${doc.type}/${doc.slug}`}
+                key={`${doc.type}/${doc.slug}`}
                 doc={doc}
                 workspaceId={workspaceId}
-                showLocale={multiLocale}
               />
             ))}
           </div>
@@ -109,22 +106,12 @@ export function DocListCard({
 function DocRow({
   doc,
   workspaceId,
-  showLocale,
 }: {
   doc: DocCardItem;
   workspaceId: string;
-  showLocale: boolean;
 }) {
   const nav = useWorkspaceNav();
-  const to = nav
-    ? contentDocPath(
-        nav.workspaceSlug,
-        doc.type,
-        doc.slug,
-        doc.locale,
-        nav.defaultLocale,
-      )
-    : "#";
+  const to = nav ? contentDocPath(nav.workspaceSlug, doc.type, doc.slug) : "#";
   const title = doc.title?.trim() || doc.slug;
   const status = docCardBadge(doc);
   const secondary = doc.path ?? `${doc.type}/${doc.slug}`;
@@ -136,7 +123,6 @@ function DocRow({
           <FileIcon size={13} />
         </span>
         <span {...stylex.props(styles.title)}>{title}</span>
-        {showLocale ? <span {...stylex.props(styles.locale)}>{doc.locale}</span> : null}
         {status ? (
           <span
             {...stylex.props(

package/src/chat/MentionPopover.tsx

@@ -3,7 +3,7 @@ import { useEffect, useMemo, useState, type RefObject } from "react";
 import { Popover } from "@base-ui/react/popover";
 import * as stylex from "@stylexjs/stylex";
 import { fetchDocs } from "../api";
-import type { DocRef } from "../chrome/EditorFocusContext";
+import { docKey, type DocRef } from "../chrome/EditorFocusContext";
 import { colors, type } from "../styles/tokens.stylex";
 import { cx, popup, popupClassName } from "../ui/popup";
 import { FileIcon } from "./icons";
@@ -52,9 +52,9 @@ export function MentionPopover({
   }, [workspaceId]);
 
   const items = useMemo(() => {
-    const excluded = new Set(exclude.map((r) => `${r.locale}/${r.type}/${r.slug}`));
+    const excluded = new Set(exclude.map((r) => docKey(r)));
     return filterDocs(
-      docs.filter((d) => !excluded.has(`${d.locale}/${d.type}/${d.slug}`)),
+      docs.filter((d) => !excluded.has(docKey(d))),
       query,
     );
   }, [docs, query, exclude]);
@@ -69,7 +69,7 @@ export function MentionPopover({
       else if (key === "ArrowUp") setActive((i) => Math.max(i - 1, 0));
       else if (key === "Enter" || key === "Tab") {
         const item = items[active];
-        if (item) onSelect({ locale: item.locale, type: item.type, slug: item.slug });
+        if (item) onSelect({ type: item.type, slug: item.slug });
         else onClose();
       } else if (key === "Escape") onClose();
     };
@@ -79,7 +79,7 @@ export function MentionPopover({
   }, [items, active, onSelect, onClose, keyHandlerRef]);
 
   const activeId = items[active]
-    ? `mention-${items[active].locale}-${items[active].type}-${items[active].slug}`
+    ? `mention-${items[active].type}-${items[active].slug}`
     : undefined;
 
   return (
@@ -113,13 +113,13 @@ export function MentionPopover({
             ) : (
               items.map((item, i) => (
                 <div
-                  key={`${item.locale}/${item.type}/${item.slug}`}
-                  id={`mention-${item.locale}-${item.type}-${item.slug}`}
+                  key={docKey(item)}
+                  id={`mention-${item.type}-${item.slug}`}
                   role="option"
                   aria-selected={i === active}
                   onMouseEnter={() => setActive(i)}
                   onMouseDown={(e) => e.preventDefault()}
-                  onClick={() => onSelect({ locale: item.locale, type: item.type, slug: item.slug })}
+                  onClick={() => onSelect({ type: item.type, slug: item.slug })}
                   {...stylex.props(popup.item, styles.item, i === active && popup.itemHighlighted)}
                 >
                   <FileIcon size={12} />
@@ -127,7 +127,6 @@ export function MentionPopover({
                     {item.type}/{item.slug}
                   </span>
                   <span {...stylex.props(popup.itemMeta)}>
-                    {item.locale}
                     {item.status === "added"
                       ? " · new"
                       : item.status !== "clean"

package/src/chat/PointerChip.tsx

@@ -11,7 +11,7 @@ import { CloseIcon, PointerIcon } from "./icons";
 const hover = "@media (hover: hover)";
 
 export function pointerKey(pointer: ChatPointer): string {
-  return `${pointer.locale}/${pointer.type}/${pointer.slug}/${pointer.blockId ?? ""}/${pointer.quote}`;
+  return `${pointer.type}/${pointer.slug}/${pointer.blockId ?? ""}/${pointer.quote}`;
 }
 
 function pointerLabel(pointer: ChatPointer): string {

package/src/chat/chat-context.ts

@@ -1,5 +1,6 @@
 // packages/studio/src/chat/chat-context.ts
 import {
+  docKey,
   sameDocRef,
   type DocRef,
   type EditorFocus,
@@ -7,7 +8,6 @@ import {
 
 /** An element the user pointed at on the site. The agent edits that block, or the quote. */
 export type ChatPointer = {
-  locale: string;
   type: string;
   slug: string;
   blockId: string | null;
@@ -28,7 +28,6 @@ export type ChatRequestContext = {
 
 function samePointer(a: ChatPointer, b: ChatPointer): boolean {
   return (
-    a.locale === b.locale &&
     a.type === b.type &&
     a.slug === b.slug &&
     a.blockId === b.blockId &&
@@ -61,13 +60,13 @@ export function removePointer(list: ChatPointer[], next: ChatPointer): ChatPoint
 }
 
 export function chatPointerFromGrab(
-  doc: { locale?: unknown; type?: unknown; slug?: unknown },
+  doc: { type?: unknown; slug?: unknown },
   grab: unknown,
 ): ChatPointer | null {
-  if (!doc || typeof doc.locale !== "string" || typeof doc.type !== "string" || typeof doc.slug !== "string") {
+  if (!doc || typeof doc.type !== "string" || typeof doc.slug !== "string") {
     return null;
   }
-  if (!doc.locale || !doc.type || !doc.slug) return null;
+  if (!doc.type || !doc.slug) return null;
   if (!grab || typeof grab !== "object") return null;
   const value = grab as Record<string, unknown>;
   if (value.blockId !== null && typeof value.blockId !== "string") return null;
@@ -75,7 +74,6 @@ export function chatPointerFromGrab(
   if (value.blockIndex !== null && typeof value.blockIndex !== "number") return null;
   if (typeof value.quote !== "string") return null;
   return {
-    locale: doc.locale,
     type: doc.type,
     slug: doc.slug,
     blockId: value.blockId,
@@ -100,7 +98,7 @@ export function buildChatContext(input: {
   for (const m of input.mentions) {
     if (sameDocRef(m, focusDoc)) continue;
     if (mentions.some((x) => sameDocRef(x, m))) continue;
-    mentions.push({ locale: m.locale, type: m.type, slug: m.slug });
+    mentions.push({ type: m.type, slug: m.slug });
   }
   const pointers: ChatPointer[] = [];
   for (const pointer of input.pointers) {
@@ -118,3 +116,5 @@ export function addMention(list: DocRef[], ref: DocRef): DocRef[] {
 export function removeMention(list: DocRef[], ref: DocRef): DocRef[] {
   return list.filter((x) => !sameDocRef(x, ref));
 }
+
+export { docKey };