@backmatter/studio 0.0.12 → 0.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backmatter/studio",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "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.26",
+    "@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;
@@ -474,7 +471,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 +483,6 @@ export function notifyWorkspaceChanged() {
 
 export type TreeChangeDetail = {
   workspaceId: string;
-  locale: string;
   type: string;
   slug: string;
   status?: DocStatus;
@@ -512,12 +508,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 +556,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) {
@@ -605,7 +596,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 +604,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 +631,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 +640,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 +653,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 +662,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 +674,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 }) },
   );
 }
@@ -729,6 +713,7 @@ export type ChatChangeDiff = {
   added: number;
   removed: number;
   renamedFrom?: string;
+  renamedFromLocale?: string;
   hunks: Array<{
     oldStart: number;
     oldLines: number;

package/src/chat/ChangeCard.tsx

@@ -28,7 +28,9 @@ export function ChangeCard({
 }) {
   const [expanded, setExpanded] = useState(false);
   const nav = useWorkspaceNav();
-  const label = `${change.type}/${change.slug}`;
+  const label = change.locale
+    ? `${change.locale}/${change.type}/${change.slug}`
+    : `${change.type}/${change.slug}`;
   const to = nav
     ? contentDocPath(
         nav.workspaceSlug,
@@ -69,7 +71,9 @@ export function ChangeCard({
         )}
         {change.diff?.renamedFrom ? (
           <span {...stylex.props(styles.badge)}>
-            {change.diff.renamedFrom} → {change.slug}
+            {change.diff.renamedFromLocale
+              ? `${change.diff.renamedFromLocale}/${change.diff.renamedFrom} → ${change.locale}/${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";
@@ -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,13 +159,7 @@ 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") {
@@ -173,6 +168,9 @@ function publishTreePatches(workspaceId: string, patches: TreeStatusPatch[]) {
     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 {
@@ -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();

package/src/chat/chat-helpers.ts

@@ -7,11 +7,28 @@ import type { ChatChangeSummary, ChatThread, DocStatus, ChatChangeStatus } from
 import type { DocRef } from "../chrome/EditorFocusContext";
 
 export type WriteToolOutput =
-  | { ok: true; change: ChatChangeSummary }
+  | { ok: true; change?: ChatChangeSummary; changes?: ChatChangeSummary[] }
   | { ok: false; error: string; message: string };
 
 export function isWriteTool(name: string) {
-  return name === "writeDoc" || name === "createDoc" || name === "renameDoc";
+  return (
+    name === "writeDoc" ||
+    name === "createDoc" ||
+    name === "renameDoc" ||
+    name === "deleteDoc" ||
+    name === "deleteFolder" ||
+    name === "moveFolder"
+  );
+}
+
+/** One write tool may record several files, as a folder move or delete does. */
+export function changesInToolOutput(output: unknown): ChatChangeSummary[] {
+  if (!output || typeof output !== "object") return [];
+  const body = output as { ok?: boolean; change?: ChatChangeSummary; changes?: ChatChangeSummary[] };
+  if (body.ok === false) return [];
+  const many = Array.isArray(body.changes) ? body.changes.filter((change) => change?.id) : [];
+  if (many.length > 0) return many;
+  return body.change?.id ? [body.change] : [];
 }
 
 export function isCommitTool(name: string) {
@@ -39,7 +56,6 @@ export function treeStatusPatches(output: unknown): TreeStatusPatch[] {
     const item = row as Partial<TreeStatusPatch>;
     if (
       typeof item.locale !== "string" ||
-      !item.locale ||
       typeof item.type !== "string" ||
       !item.type ||
       typeof item.slug !== "string" ||
@@ -60,6 +76,28 @@ export function treeStatusPatches(output: unknown): TreeStatusPatch[] {
   return patches;
 }
 
+/** A deleted or absent row leaves the content tree. Other rows update status. */
+export function detailForTreePatch(
+  workspaceId: string,
+  patch: TreeStatusPatch,
+): {
+  workspaceId: string;
+  locale: string;
+  type: string;
+  slug: string;
+  status?: TreeStatusPatch["status"];
+  remove?: boolean;
+} {
+  const gone = patch.absent === true || patch.status === "deleted";
+  return {
+    workspaceId,
+    locale: patch.locale,
+    type: patch.type,
+    slug: patch.slug,
+    ...(gone ? { remove: true } : { status: patch.status }),
+  };
+}
+
 export function toolLabel(name: string, input: unknown, output: unknown, state: string): string {
   const ref = (input as { docRef?: { type?: string; slug?: string } } | undefined)?.docRef;
   const doc = ref?.type && ref.slug ? `${ref.type}/${ref.slug}` : "";
@@ -84,6 +122,17 @@ export function toolLabel(name: string, input: unknown, output: unknown, state:
       return running ? `Creating ${doc}…` : `Created ${doc}`;
     case "renameDoc":
       return running ? `Renaming ${doc}…` : `Renamed ${doc}`;
+    case "deleteDoc":
+      return running ? `Deleting ${doc}…` : `Deleted ${doc}`;
+    case "deleteFolder": {
+      const path = (input as { path?: string } | undefined)?.path ?? "folder";
+      return running ? `Deleting ${path}…` : `Deleted ${path}`;
+    }
+    case "moveFolder": {
+      const from = (input as { from?: string } | undefined)?.from ?? "folder";
+      const to = (input as { to?: string } | undefined)?.to ?? "";
+      return running ? `Moving ${from}…` : `Moved ${from} to ${to}`;
+    }
     case "commit": {
       if (running) return "Publishing…";
       const published = output as { ok?: boolean; files?: unknown[] } | undefined;
@@ -221,8 +270,7 @@ export function changeIdsInMessage(message: UIMessage): string[] {
     if (!isToolUIPart(part)) continue;
     if (!isWriteTool(getToolName(part))) continue;
     if (part.state !== "output-available") continue;
-    const out = part.output as WriteToolOutput | undefined;
-    if (out?.ok) ids.push(out.change.id);
+    for (const change of changesInToolOutput(part.output)) ids.push(change.id);
   }
   return ids;
 }
@@ -267,9 +315,9 @@ export function stackChanges(
     for (const part of message.parts) {
       if (!isToolUIPart(part) || part.state !== "output-available") continue;
       if (!isWriteTool(getToolName(part))) continue;
-      const out = part.output as WriteToolOutput | undefined;
-      if (!out?.ok) continue;
-      byId.set(out.change.id, out.change);
+      for (const change of changesInToolOutput(part.output)) {
+        byId.set(change.id, change);
+      }
     }
   }
   for (const change of Object.values(overrides)) {