@frockbot/plugin-flock 0.3.5 → 0.3.7

package/assets/manifest.json

@@ -52,7 +52,7 @@
       },
       {
         "id": "matte-black-top-hat",
-        "label": "Matte-black top hat \u00b7 Qwen layer",
+        "label": "Matte-black top hat",
         "parent": "upper-neutral",
         "kind": "headwear"
       },
@@ -278,7 +278,7 @@
       },
       {
         "id": "purple-scarf",
-        "label": "Purple silk scarf \u00b7 Qwen layer",
+        "label": "Purple silk scarf",
         "parent": "lower-neutral",
         "kind": "neckwear"
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-flock",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "private": false,
   "type": "module",
   "exports": {
@@ -27,16 +27,16 @@
     "typecheck": "vue-tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@frockbot/client-core": "0.3.5",
-    "@frockbot/client-ui": "0.3.5",
-    "@frockbot/configuration-core": "0.3.5",
-    "@frockbot/kernel-contracts": "0.3.5",
-    "@frockbot/plugin-shell": "0.3.5",
+    "@frockbot/client-core": "0.3.7",
+    "@frockbot/client-ui": "0.3.7",
+    "@frockbot/configuration-core": "0.3.7",
+    "@frockbot/kernel-contracts": "0.3.7",
+    "@frockbot/plugin-shell": "0.3.7",
     "cordis": "4.0.0-rc.8",
     "vue": "3.5.41"
   },
   "devDependencies": {
-    "@frockbot/plugin-testkit": "0.3.5",
+    "@frockbot/plugin-testkit": "0.3.7",
     "@types/bun": "1.4.0",
     "@vitejs/plugin-vue": "6.0.8",
     "css-tree": "2.3.1",

package/src/client/FlockOverlay.vue

@@ -123,10 +123,7 @@ onBeforeUnmount(() => restoreFocus?.focus());
                 : "Change the look"
             }}
           </h1>
-          <p>
-            Keep this look or tailor each layer. Your choice is saved with the
-            Bot.
-          </p>
+          <p>Keep this look, or change any layer.</p>
           <label v-if="flock.overlay === 'create'" class="flock-name"
             >Bot name<input
               v-model.trim="flock.draftName"

package/src/client/FlockSidebar.vue

@@ -45,7 +45,7 @@ function botName(botId: string, fallback: string): string {
   return flock.value.profiles[botId]?.name ?? fallback;
 }
 function botSubtitle(botId: string): string {
-  return flock.value.profiles[botId]?.title ?? botId;
+  return flock.value.profiles[botId]?.title ?? "No messages yet";
 }
 function previewText(botId: string): string {
   return flock.value.unread[botId]?.lastMessage?.text ?? botSubtitle(botId);

package/src/client/index.ts

@@ -1,6 +1,6 @@
 import type { ClientPlugin } from "@frockbot/client-core";
 import type { FrockBotWebData } from "@frockbot/plugin-shell/shared";
-import { ref, type Ref } from "vue";
+import { ref, watch, type Ref } from "vue";
 import {
   decodeBotLifecycleDirectoryViewV1,
   decodeBotIdentityDirectoryViewV1,
@@ -91,6 +91,8 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
     throw new Error("Flock hosted transport is unavailable");
   const request = ctx.transport.hostedRequest.bind(ctx.transport);
   let shell: Ref<FrockBotWebData> | undefined;
+  /** Stops the watcher that keeps a renamed Bot's sidebar row in step. */
+  let stopNameWatch: (() => void) | undefined;
   let authenticatedUserId: string | undefined;
   let loadGeneration = 0;
   let selectionGeneration = 0;
@@ -117,6 +119,24 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
     draftSheep: randomSheepRecipeV1(),
     bindShell(value) {
       shell = value;
+      // A rename is saved on the Bot's own settings, and the sidebar reads a
+      // directory it loaded once — so the row kept the old name until the page
+      // was reloaded. The row follows the settings the Shell is already
+      // holding rather than waiting for a second read of the directory.
+      stopNameWatch?.();
+      stopNameWatch = watch(
+        () => value.value.botSettings?.profile.name,
+        (name) => {
+          const botId = value.value.botSettings?.botId;
+          if (!botId || !name) return;
+          const profile = state.value.profiles[botId];
+          if (!profile || profile.name === name) return;
+          state.value.profiles = {
+            ...state.value.profiles,
+            [botId]: { ...profile, name },
+          };
+        },
+      );
     },
     async load() {
       const generation = ++loadGeneration;
@@ -158,9 +178,7 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
             if (receipt) {
               clearPendingCreate(userId);
               if (receipt.status === "rejected")
-                throw new Error(
-                  receipt.failure ?? "Pending Bot creation was rejected",
-                );
+                throw new Error(receipt.failure ?? "Couldn't create the Bot.");
             }
             state.value.directory = decodeDirectoryViewV1(
               await request("/api/bots"),
@@ -220,7 +238,11 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
         const selected = preferredBot?.botId ?? activeBots[0]?.botId;
         if (preferred && !preferredBot) replacePreferredBot(selected);
         if (selected && shell) await state.value.select(selected);
-        else if (!selected) state.value.openCreate();
+        // Only a User with no Bots at all is asked to make one. Archiving your
+        // last Bot leaves you with an archived list to restore from, and a
+        // dialog opening over it puts its backdrop between you and Restore.
+        else if (!selected && state.value.directory.bots.length === 0)
+          state.value.openCreate();
       } catch (error) {
         state.value.error =
           error instanceof Error ? error.message : "Could not load your flock";
@@ -360,9 +382,9 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
           ),
         );
         if (receipt.status === "rejected")
-          throw new Error(receipt.failure ?? "Bot archive was rejected");
+          throw new Error(receipt.failure ?? "Couldn't archive this Bot.");
         if (receipt.status === "pending") {
-          state.value.error = "Bot archive is retrying in the backend.";
+          state.value.error = "Still archiving — this will finish shortly.";
           return;
         }
         state.value.overlay = undefined;
@@ -388,9 +410,9 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
           ),
         );
         if (receipt.status === "rejected")
-          throw new Error(receipt.failure ?? "Bot restore was rejected");
+          throw new Error(receipt.failure ?? "Couldn't restore this Bot.");
         if (receipt.status === "pending") {
-          state.value.error = "Bot restore is retrying in the backend.";
+          state.value.error = "Still restoring — this will finish shortly.";
           return;
         }
         await state.value.load();
@@ -419,18 +441,16 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
           clearPendingSheep(userId, botId);
           if (receipt.status === "rejected")
             reconciliationFailure =
-              receipt.failure ?? "Pending sheep update was rejected";
+              receipt.failure ?? "Couldn't save the sheep.";
         } catch (error) {
           if (!isDefinitiveFlockFailure(error)) {
             state.value.error =
-              "A previous sheep update could not be reconciled. Try again before editing.";
+              "Your last change to this sheep didn't save. Try again.";
             return;
           }
           clearPendingSheep(userId, botId);
           reconciliationFailure =
-            error instanceof Error
-              ? error.message
-              : "Pending sheep update was rejected";
+            error instanceof Error ? error.message : "Couldn't save the sheep.";
         }
         try {
           identity = decodeSheepIdentityViewV1(
@@ -441,7 +461,7 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
           state.value.error =
             error instanceof Error
               ? error.message
-              : "Could not reconcile the previous sheep update";
+              : "Couldn't finish saving your last change.";
           return;
         }
       }
@@ -479,7 +499,7 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
         );
         if (receipt.status === "rejected") {
           clearPendingCreate(userId);
-          throw new Error(receipt.failure ?? "Bot creation was rejected");
+          throw new Error(receipt.failure ?? "Couldn't create the Bot.");
         }
         clearPendingCreate(userId);
         replacePreferredBot(command.botId);
@@ -521,7 +541,7 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
         );
         if (receipt.status === "rejected") {
           clearPendingSheep(userId, botId);
-          throw new Error(receipt.failure ?? "Sheep update was rejected");
+          throw new Error(receipt.failure ?? "Couldn't save the sheep.");
         }
         clearPendingSheep(userId, botId);
         state.value.identities[botId] = decodeSheepIdentityViewV1(
@@ -608,6 +628,7 @@ export const flockClientPlugin: ClientPlugin = (ctx) => {
 
   return [
     () => clearInterval(poll),
+    () => stopNameWatch?.(),
     ctx.provide(flockWebDataKey, state),
     ctx.slot({
       slot: "frockbot.sidebar-bots",