@frockbot/plugin-shell 0.3.4 → 0.3.6

package/src/client/index.test.ts

@@ -516,7 +516,7 @@ describe("Bot selection", () => {
     const requestCount = requests.length;
     await expect(
       provided.value.callPackageUiTool(contribution, "package_author", {}),
-    ).rejects.toThrow("did not declare");
+    ).rejects.toThrow("isn't allowed to use");
     expect(requests).toHaveLength(requestCount);
   });
 
@@ -571,6 +571,47 @@ describe("Bot selection", () => {
     expect(provided.value.settingsError).toBe("Bot settings unavailable");
   });
 
+  test("says a deployment has no Catalog instead of relaying the gateway's sentence", async () => {
+    // F4: the Plugins/Catalog surface rendered `catalog generation was not
+    // found` beside "No Catalog entry matches that search", for a User who had
+    // searched nothing on a deployment that had published nothing.
+    let provided: Ref<FrockBotWebData> | undefined;
+    let failure = new Error("catalog generation was not found");
+    await shellClientPlugin({
+      transport: {
+        turn: () => Promise.resolve({ runId: "run", text: "", events: [] }),
+        readConfiguration: () => Promise.reject(new Error("unused")),
+        hostedRequest: (path) => {
+          expect(path).toBe("/catalog/v1/index");
+          return Promise.reject(failure);
+        },
+      },
+      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.loadPackageCatalog();
+    expect(provided.value.packageCatalog).toEqual([]);
+    expect(provided.value.packageCatalogGeneration).toBeUndefined();
+    expect(provided.value.settingsError).toBe(
+      "No plugins are published for this deployment yet.",
+    );
+
+    // A genuine fault still reaches the operator, labelled as one.
+    failure = new Error("R2 is down");
+    await provided.value.loadPackageCatalog();
+    expect(provided.value.settingsError).toBe(
+      "Plugins could not be loaded: R2 is down",
+    );
+  });
+
   test("commits a catalog without overwriting newer User settings", async () => {
     let provided: Ref<FrockBotWebData> | undefined;
     const catalogManifest = Promise.withResolvers<unknown>();
@@ -648,7 +689,7 @@ describe("Bot selection", () => {
       },
       accountValues: undefined,
       platformModel: undefined,
-      expectedLabel: "Model name · Model provider · Bot override",
+      expectedLabel: "Model name · Model provider · this Bot only",
       expectedProjection: "bot",
       ready: true,
     },
@@ -683,7 +724,7 @@ describe("Bot selection", () => {
       botValues: {},
       accountValues: undefined,
       platformModel: undefined,
-      expectedLabel: "Model unavailable",
+      expectedLabel: "No model available — set one up in Models",
       expectedProjection: "none",
       ready: false,
     },
@@ -900,7 +941,7 @@ describe("Bot selection", () => {
 
     expect(provided.value.modelReady).toBe(false);
     expect(provided.value.modelLabel).toBe(
-      'Connection "model-connection" is disabled; enable or reconnect it',
+      "That account needs reconnecting before this Bot can reply.",
     );
   });
 
@@ -1217,7 +1258,7 @@ describe("detached Turn projection", () => {
       { role: "user", status: "completed" },
       {
         role: "assistant",
-        text: "Provider reconciliation is required",
+        text: "This Bot couldn't finish its reply. Try again.",
         status: "error",
       },
     ]);
@@ -1482,6 +1523,55 @@ describe("active durable Turn projection", () => {
     ]);
   });
 
+  test("a Turn that sent something draws the send, not the model's own text", () => {
+    const state: Pick<
+      FrockBotWebData,
+      "messages" | "activeRunId" | "activeRun"
+    > = { messages: [] };
+
+    projectDurableRuns(
+      state,
+      [],
+      [
+        {
+          runId: "run-once",
+          input: "ping",
+          status: "completed",
+          responseText: "pong",
+          events: [
+            { type: "send/to-user", payload: { type: "text", text: "pong" } },
+          ],
+        },
+      ],
+    );
+
+    expect(state.messages[1]?.text).toBe("");
+    expect(state.messages[1]?.sends).toHaveLength(1);
+  });
+
+  test("a Turn that sent nothing still draws the model's text", () => {
+    const state: Pick<
+      FrockBotWebData,
+      "messages" | "activeRunId" | "activeRun"
+    > = { messages: [] };
+
+    projectDurableRuns(
+      state,
+      [],
+      [
+        {
+          runId: "run-plain",
+          input: "ping",
+          status: "completed",
+          responseText: "pong",
+          events: [],
+        },
+      ],
+    );
+
+    expect(state.messages[1]?.text).toBe("pong");
+  });
+
   test("streams running text without a banner and clears busy state", () => {
     const state: Pick<
       FrockBotWebData,
@@ -1562,11 +1652,11 @@ describe("active durable Turn projection", () => {
     expect(reconciliation.activeRun).toEqual({
       runId: "run-reconciliation",
       status: "reconciliation-required",
-      message: "Provider result needs confirmation",
+      message: "Something went wrong mid-reply. Try again to pick it up.",
       canResume: true,
     });
     expect(reconciliation.messages[1]).toMatchObject({
-      text: "Provider result needs confirmation",
+      text: "This reply stopped partway. Try again to continue it.",
       status: "reconciliation-required",
     });
   });
@@ -1845,16 +1935,19 @@ describe("hosted Stop", () => {
     await provided.value.stopRun();
     expect(provided.value.activeRun).toMatchObject({
       status: "reconciliation-required",
-      message:
-        "Stop accepted; reconciling the provider outcome before cancelling.",
-      canResume: false,
+      message: "Stopping…",
+      // A parked Turn is offered the resolve control, Stop included: hiding
+      // it there hid it in exactly the case Stop creates.
+      canResume: true,
     });
 
     await provided.value.stopRun();
     expect(provided.value.activeRun).toBeUndefined();
     expect(provided.value.activeRunId).toBeUndefined();
+    // The Turn keeps whatever it had already said; the notice is the line
+    // that says why it ends where it does.
     expect(provided.value.messages[1]).toMatchObject({
-      text: "Stopped by an authenticated Stop command.",
+      notice: "You stopped this.",
       status: "aborted",
     });
 
@@ -1911,12 +2004,15 @@ describe("hosted Stop", () => {
 
     await provided.value.stopRun();
 
-    expect(lookups).toBe(1);
+    // Two, and deliberately: a client that finds itself holding an active run
+    // it did not start now observes it (a reload mid-Turn, a second tab), and
+    // Stop then observes the settlement it asked for.
+    expect(lookups).toBe(2);
     expect(provided.value.activeRun).toBeUndefined();
     expect(provided.value.activeRunId).toBeUndefined();
     expect(provided.value.messages.at(-1)).toMatchObject({
       runId: "run-1",
-      text: "Stopped by an authenticated Stop command.",
+      notice: "You stopped this.",
       status: "aborted",
     });
   });
@@ -2506,7 +2602,7 @@ describe("Connection operation reconciliation", () => {
     ).rejects.toThrow("Connection state update failed");
     await expect(
       provided.value.disconnectConnection("connection-1"),
-    ).rejects.toThrow("Connection revocation failed");
+    ).rejects.toThrow("Couldn't disconnect that account.");
     expect(commands).toEqual([
       "connection/update-label",
       "connection/set-enabled",
@@ -2897,7 +2993,7 @@ describe("a message sent while a Turn is running", () => {
     // The superseded Turn keeps the quiet treatment a stopped one gets.
     expect(state.messages[1]).toMatchObject({
       status: "aborted",
-      text: "Interrupted by your next message.",
+      notice: "Interrupted by your next message.",
     });
   });