From 4b1b89a0353c414072678284d170005ee612dad5 Mon Sep 17 00:00:00 2001
From: Sawyer Cutler <sawyer@dirtroad.dev>
Date: Mon, 24 Aug 2026 00:12:54 -0700
Subject: [PATCH 1/2] CL-6840: Cover workbench rename failure toast string

---
 packages/chat-ui/src/strings.test.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/chat-ui/src/strings.test.ts b/packages/chat-ui/src/strings.test.ts
index ea2938039..aa1d4ffa3 100644
--- a/packages/chat-ui/src/strings.test.ts
+++ b/packages/chat-ui/src/strings.test.ts
@@ -15,6 +15,12 @@ describe("toast confirmation copy", () => {
     );
   });
 
+  test("rename failure tells the person to try again", () => {
+    expect(CHAT_STRINGS.workbenchRenameError).toBe(
+      "Couldn't rename that workbench — try again.",
+    );
+  });
+
   test("pin copy follows the state the workbench just entered", () => {
     expect(CHAT_STRINGS.workbenchPinnedToast(true, "Deploy notes")).toBe(
       "Pinned Deploy notes",

From ae0515c2e6f5ce6df2438b61ec502875cd7b252d Mon Sep 17 00:00:00 2001
From: Sawyer Cutler <sawyer@dirtroad.dev>
Date: Mon, 24 Aug 2026 00:12:54 -0700
Subject: [PATCH 2/2] CL-6840: Toast when workbench rename fails

---
 apps/web/src/shell/workbench-list.tsx | 1 +
 packages/chat-ui/src/strings.ts       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/web/src/shell/workbench-list.tsx b/apps/web/src/shell/workbench-list.tsx
index fcba53bfd..f6566a7e5 100644
--- a/apps/web/src/shell/workbench-list.tsx
+++ b/apps/web/src/shell/workbench-list.tsx
@@ -301,6 +301,7 @@ function WorkbenchRow({
       // Revert the optimistic title on failure; the list will refetch on
       // the next scope selection and reconcile either way.
       setTitle(workbench.title);
+      toast(CHAT_STRINGS.workbenchRenameError);
     }
   }
 
diff --git a/packages/chat-ui/src/strings.ts b/packages/chat-ui/src/strings.ts
index 604819b1a..91ff9f072 100644
--- a/packages/chat-ui/src/strings.ts
+++ b/packages/chat-ui/src/strings.ts
@@ -133,6 +133,7 @@ export const CHAT_STRINGS = {
   forkThreadOriginBanner: "Forked from a message in",
   workbenchCreatedToast: (title: string) => `Created · ${title}`,
   workbenchRenamedToast: (title: string) => `Renamed to ${title}`,
+  workbenchRenameError: "Couldn't rename that workbench — try again.",
   workbenchPinnedToast: (pinned: boolean, title: string) =>
     pinned ? `Pinned ${title}` : `Unpinned ${title}`,
   workbenchPinToggleError: (pinned: boolean) =>