@frockbot/plugin-shell 0.3.3 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-shell",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "private": false,
   "type": "module",
   "exports": {
@@ -47,41 +47,41 @@
   },
   "dependencies": {
     "@cordisjs/plugin-webui": "0.8.2",
-    "@frockbot/agent-runtime": "0.3.3",
-    "@frockbot/application-foundation": "0.3.3",
-    "@frockbot/catalog-core": "0.3.3",
-    "@frockbot/client-core": "0.3.3",
-    "@frockbot/client-ui": "0.3.3",
-    "@frockbot/computer-core": "0.3.3",
-    "@frockbot/computer-host-protocol": "0.3.3",
-    "@frockbot/configuration-core": "0.3.3",
-    "@frockbot/connection-core": "0.3.3",
-    "@frockbot/kernel-agent-loop": "0.3.3",
-    "@frockbot/kernel-composition": "0.3.3",
-    "@frockbot/kernel-contracts": "0.3.3",
-    "@frockbot/kernel-do": "0.3.3",
-    "@frockbot/machine-protocol": "0.3.3",
-    "@frockbot/plugin-applets": "0.3.3",
-    "@frockbot/plugin-authoring": "0.3.3",
-    "@frockbot/plugin-bot-template": "0.3.3",
-    "@frockbot/plugin-computer": "0.3.3",
-    "@frockbot/plugin-flock": "0.3.3",
-    "@frockbot/plugin-image": "0.3.3",
-    "@frockbot/plugin-machine-messages": "0.3.3",
-    "@frockbot/plugin-mcp": "0.3.3",
-    "@frockbot/plugin-memory": "0.3.3",
-    "@frockbot/plugin-package-catalog": "0.3.3",
-    "@frockbot/plugin-routines": "0.3.3",
-    "@frockbot/plugin-skills": "0.3.3",
-    "@frockbot/plugin-subagents": "0.3.3",
-    "@frockbot/plugin-user-machine": "0.3.3",
-    "@frockbot/protocol": "0.3.3",
+    "@frockbot/agent-runtime": "0.3.4",
+    "@frockbot/application-foundation": "0.3.4",
+    "@frockbot/catalog-core": "0.3.4",
+    "@frockbot/client-core": "0.3.4",
+    "@frockbot/client-ui": "0.3.4",
+    "@frockbot/computer-core": "0.3.4",
+    "@frockbot/computer-host-protocol": "0.3.4",
+    "@frockbot/configuration-core": "0.3.4",
+    "@frockbot/connection-core": "0.3.4",
+    "@frockbot/kernel-agent-loop": "0.3.4",
+    "@frockbot/kernel-composition": "0.3.4",
+    "@frockbot/kernel-contracts": "0.3.4",
+    "@frockbot/kernel-do": "0.3.4",
+    "@frockbot/machine-protocol": "0.3.4",
+    "@frockbot/plugin-applets": "0.3.4",
+    "@frockbot/plugin-authoring": "0.3.4",
+    "@frockbot/plugin-bot-template": "0.3.4",
+    "@frockbot/plugin-computer": "0.3.4",
+    "@frockbot/plugin-flock": "0.3.4",
+    "@frockbot/plugin-image": "0.3.4",
+    "@frockbot/plugin-machine-messages": "0.3.4",
+    "@frockbot/plugin-mcp": "0.3.4",
+    "@frockbot/plugin-memory": "0.3.4",
+    "@frockbot/plugin-package-catalog": "0.3.4",
+    "@frockbot/plugin-routines": "0.3.4",
+    "@frockbot/plugin-skills": "0.3.4",
+    "@frockbot/plugin-subagents": "0.3.4",
+    "@frockbot/plugin-user-machine": "0.3.4",
+    "@frockbot/protocol": "0.3.4",
     "cordis": "4.0.0-rc.8",
     "vue": "3.5.41"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "latest",
-    "@frockbot/plugin-tools": "0.3.3",
+    "@frockbot/plugin-tools": "0.3.4",
     "@types/bun": "1.3.6",
     "@types/node": "26.2.0",
     "@vitejs/plugin-vue": "6.0.8",

package/src/client/FrockBotApp.vue

@@ -267,9 +267,31 @@ const macDesktop =
   typeof navigator !== "undefined" &&
   /Electron/u.test(navigator.userAgent) &&
   /Mac/u.test(navigator.platform);
-const botName = computed(
-  () => state.value.botSettings?.profile.name ?? "Barebones",
-);
+// The Bot's own name, or nothing: an account with no Bot, and a Bot whose
+// settings have not arrived yet, must never be given a made-up name.
+const botName = computed(() => state.value.botSettings?.profile.name ?? "");
+const hasBot = computed(() => Boolean(state.value.activeBotId));
+/**
+ * The greeting, the composer placeholder and the not-ready line all read off
+ * the same two facts: whether a Bot is open, and what the model resolver said.
+ * `state.modelLabel` already carries the resolver's own repairable failure
+ * sentence when the binding failed, so the surface repeats it rather than
+ * inventing "Model unavailable" of its own.
+ */
+const threadHeading = computed(() => {
+  if (!hasBot.value) return "No Bots yet.";
+  if (!botName.value) return state.value.modelReady ? "Ready." : "Not ready.";
+  return state.value.modelReady
+    ? `${botName.value} is ready.`
+    : `${botName.value} isn't ready.`;
+});
+const threadHint = computed(() => {
+  if (!hasBot.value) return "Add your first sheep to start a conversation.";
+  if (state.value.modelReady) {
+    return "Start with a conversation. Cordis plugins can add the rest.";
+  }
+  return state.value.modelLabel;
+});
 /** A Turn is executing. The composer stays open; only Stop depends on this. */
 const isRunning = computed(() => Boolean(state.value.runningRunId));
 const isConnecting = computed(() => state.value.connection !== "ready");
@@ -278,6 +300,11 @@ const isConnecting = computed(() => state.value.connection !== "ready");
  * running Turn. So the only things that close the composer are the ones that
  * would make any message impossible.
  */
+const composerPlaceholder = computed(() => {
+  if (isConnecting.value) return "Connecting…";
+  if (!state.value.modelReady) return state.value.modelLabel;
+  return botName.value ? `Message ${botName.value}` : "Message";
+});
 const canSend = computed(
   () =>
     state.value.connection === "ready" &&
@@ -778,7 +805,7 @@ function handleComposerKeydown(event: KeyboardEvent): void {
           <span class="bot-identity"
             ><k-slot name="frockbot.bot-identity"
           /></span>
-          <div class="workspace-title">
+          <div v-if="hasBot" class="workspace-title">
             <strong>{{ botName }}</strong>
             <small>{{ state.modelLabel }}</small>
           </div>
@@ -793,20 +820,8 @@ function handleComposerKeydown(event: KeyboardEvent): void {
         >
           <div v-if="messages.length === 0" class="empty-thread">
             <div class="empty-mark"><UiIcon name="sparkle" size="lg" /></div>
-            <h1>
-              {{
-                state.modelReady
-                  ? `${botName} is ready.`
-                  : `${botName} isn't ready.`
-              }}
-            </h1>
-            <p>
-              {{
-                state.modelReady
-                  ? "Start with a conversation. Cordis plugins can add the rest."
-                  : "Check this Bot's model Connection."
-              }}
-            </p>
+            <h1>{{ threadHeading }}</h1>
+            <p>{{ threadHint }}</p>
           </div>
           <article
             v-for="message in messages"
@@ -975,7 +990,12 @@ function handleComposerKeydown(event: KeyboardEvent): void {
           </div>
         </Transition>
 
+        <!--
+          No Bot, no composer. A disabled input under a made-up Bot name reads
+          as a broken Bot; the first-run pane above points at making one.
+        -->
         <form
+          v-if="hasBot"
           class="composer"
           :class="{ 'composer-busy': isRunning }"
           @submit.prevent="sendMessage"
@@ -1038,13 +1058,7 @@ function handleComposerKeydown(event: KeyboardEvent): void {
               ref="composerInput"
               v-model="draft"
               aria-label="Message"
-              :placeholder="
-                isConnecting
-                  ? 'Connecting…'
-                  : !state.modelReady
-                    ? 'Model unavailable'
-                    : `Message ${botName}`
-              "
+              :placeholder="composerPlaceholder"
               :disabled="isConnecting || !state.modelReady"
               rows="1"
               role="combobox"

package/src/client/index.test.ts

@@ -826,6 +826,84 @@ describe("Bot selection", () => {
     },
   );
 
+  /**
+   * The composer placeholder and the not-ready line in `FrockBotApp.vue` are
+   * `state.modelLabel`, so a genuinely broken binding has to reach that label
+   * as the resolver's own repairable sentence rather than a flat "Model
+   * unavailable" the User cannot act on.
+   */
+  test("labels a Bot whose model Connection is disabled with the resolver's failure", async () => {
+    let provided: Ref<FrockBotWebData> | undefined;
+    const bot = initializeBotSettingsV1("broken-model-bot");
+    const user: UserSettingsViewV1 = {
+      schemaVersion: 1,
+      revision: 1,
+      profile: { name: "User" },
+      packages: [
+        { packageId: "model-provider", version: "0.0.1", state: "installed" },
+      ],
+      connections: [
+        {
+          connectionId: "model-connection",
+          packageId: "model-provider",
+          connectionTypeId: "model-account",
+          displayName: "Work",
+          state: "disabled",
+          providerType: "model-provider",
+          safeMetadata: {},
+        },
+      ],
+      platformModel: {
+        connectionId: "model-connection",
+        providerModelId: "model-id",
+      },
+    };
+    await shellClientPlugin({
+      transport: {
+        turn: () => Promise.resolve({ runId: "run", text: "", events: [] }),
+        readConfiguration: (query) =>
+          Promise.resolve(query.type === "user/get" ? user : bot),
+      },
+      slot: () => () => {},
+      inject: () => {
+        throw new Error("unexpected client provider injection");
+      },
+      provide: (_key, value) => {
+        provided = value as Ref<FrockBotWebData>;
+        return () => {};
+      },
+    });
+    if (!provided) throw new Error("shell data was not provided");
+    provided.value.activeBotId = bot.botId;
+    provided.value.pluginCatalog = [
+      {
+        packageId: "model-provider",
+        displayName: "Model provider",
+        version: "0.0.1",
+        capabilities: [
+          { id: "models", kind: "model", connectionTypes: ["model-account"] },
+        ],
+        connectionTypes: [
+          {
+            id: "model-account",
+            displayName: "Model account",
+            allowMultiple: false,
+            authorizationKind: "api-key",
+            capabilities: ["models"],
+          },
+        ],
+        settings: [],
+      },
+    ];
+
+    await provided.value.loadBotSettings();
+
+    expect(provided.value.modelReady).toBe(false);
+    expect(provided.value.modelLabel).toBe(
+      'Connection "model-connection" is disabled; enable or reconnect it',
+    );
+  });
+
   test("saves Bot-scoped Package settings through the generic command", async () => {
     type PackageSettingsWebData = FrockBotWebData & {
       saveBotPackageSettings(

package/src/client/index.ts

@@ -1088,14 +1088,18 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
   function updateModelLabel(): void {
     const bot = web.value.botSettings;
     const user = web.value.userSettings;
-    if (!bot || !user) {
+    if (!user) {
       web.value.modelSource = "none";
       web.value.modelReady = false;
       web.value.modelLabel = modelRuntimeLabel({ source: "none" });
       return;
     }
     const effective = resolveEffectiveBotModelV1({
-      bot: toRaw(bot),
+      // Before the first Bot exists — and in the window before a selected
+      // Bot's settings arrive — the account's own effective model is still
+      // the truth. An empty Bot scope simply declines to override it, so the
+      // shell reports the account model instead of claiming it is unavailable.
+      bot: bot ? toRaw(bot) : { packageValues: {} },
       user: toRaw(user),
       packages: toRaw(web.value.pluginCatalog).map((pkg) => ({
         packageId: pkg.packageId,

package/src/client/no-bot-model-label.test.ts

@@ -0,0 +1,122 @@
+import { plugin } from "bun";
+import { expect, test } from "bun:test";
+import type { UserSettingsViewV1 } from "@frockbot/configuration-core";
+import type { Ref } from "vue";
+import type { FrockBotWebData } from "../shared.js";
+
+// Bun has no single-file-component loader; the shell's Vue modules stand in as
+// empty components, exactly as `index.test.ts` does.
+plugin({
+  name: "shell-client-vue-no-bot-loader",
+  setup(build) {
+    build.onLoad({ filter: /\.vue$/ }, () => ({
+      contents: "export default {};",
+      loader: "js",
+    }));
+  },
+});
+
+const { shellClientPlugin } = await import("./index.js");
+
+/**
+ * A first-run account: the platform model resolves against a ready ambient
+ * Flock AI Connection whose Catalog is fresh, and no Bot has been created yet.
+ * The account's model is available, so the shell must not tell the User it is
+ * unavailable before they have made their first Bot.
+ */
+test("does not report the account model unavailable before a Bot exists", async () => {
+  const user: UserSettingsViewV1 = {
+    schemaVersion: 1,
+    revision: 3,
+    profile: { name: "FrockBot user" },
+    packages: [
+      { packageId: "provider-flock-ai", version: "0.0.1", state: "installed" },
+    ],
+    connections: [
+      {
+        connectionId: "flock-ai-ambient",
+        packageId: "provider-flock-ai",
+        connectionTypeId: "flock-ai-account",
+        displayName: "Flock AI",
+        state: "ready",
+        providerType: "flock-ai",
+        safeMetadata: {},
+        modelCatalog: {
+          schemaVersion: 1,
+          generation: "flock-ai-static-v1",
+          state: "fresh",
+          models: [
+            {
+              providerModelId: "@flock/auto",
+              displayName: "Auto (recommended)",
+              capabilities: { tools: true, vision: false, reasoning: true },
+              source: "discovered",
+            },
+          ],
+        },
+      },
+    ],
+    platformModel: {
+      connectionId: "flock-ai-ambient",
+      providerModelId: "@flock/auto",
+    },
+  };
+
+  let provided: Ref<FrockBotWebData> | undefined;
+  await shellClientPlugin({
+    transport: {
+      turn: () => Promise.resolve({ runId: "run", text: "", events: [] }),
+      readApplicationManifest: () =>
+        Promise.resolve({
+          schemaVersion: 1,
+          deployment: { userId: "development", applicationHash: "hash-1" },
+          applicationHash: "hash-1",
+          packages: [
+            {
+              id: "provider-flock-ai",
+              displayName: "Flock AI",
+              version: "0.0.1",
+              contributions: ["backend", "runtime"],
+              configuration: {
+                settings: [],
+                connectionTypes: [
+                  {
+                    id: "flock-ai-account",
+                    displayName: "Flock AI",
+                    allowMultiple: false,
+                    authorization: { kind: "ambient-native" },
+                    capabilities: ["flock-ai-models"],
+                  },
+                ],
+                capabilities: [
+                  {
+                    id: "flock-ai-models",
+                    kind: "model",
+                    connectionTypes: ["flock-ai-account"],
+                    admission: { turnTypes: ["chat"] },
+                  },
+                ],
+              },
+            },
+          ],
+        }),
+      readConfiguration: () => Promise.resolve(user),
+    },
+    slot: () => () => {},
+    inject: () => {
+      throw new Error("unexpected client provider injection");
+    },
+    provide: (_key, value) => {
+      provided = value as Ref<FrockBotWebData>;
+      return () => {};
+    },
+  });
+  if (!provided) throw new Error("shell data was not provided");
+
+  await provided.value.loadPluginCatalog();
+
+  // No Bot has been created, so `activeBotId` is unset.
+  expect(provided.value.activeBotId).toBeUndefined();
+  expect(provided.value.modelLabel).toBe("Auto (recommended) · Flock AI");
+  expect(provided.value.modelReady).toBe(true);
+});