@frockbot/plugin-shell 0.1.3 → 0.1.4

package/src/client/index.ts

@@ -25,12 +25,11 @@ import type {
   BotProfile,
   BotProfilePatchV1,
   BotSettingsViewV1,
-  ConfigurationCommandV1,
   JsonValue,
-  ModelAssignment,
-  OperationReceiptV1,
+  PackageSettingValueV1,
   UserSettingsViewV1,
 } from "@frockbot/configuration-core";
+import { resolveEffectiveBotModelV1 } from "@frockbot/configuration-core";
 import {
   decodeCatalogEntryV1,
   decodeCatalogIndexV1,
@@ -57,7 +56,7 @@ import {
   decodeTaskListViewV1,
   decodeTaskViewV1,
 } from "@frockbot/plugin-subagents/shared";
-import { ref } from "vue";
+import { ref, toRaw, type Ref } from "vue";
 import {
   frockBotWebDataKey,
   type FrockBotWebData,
@@ -172,7 +171,7 @@ function activeRunView(run: ClientRun): WebActiveRun | undefined {
     return {
       runId: run.runId,
       status: run.status,
-      message: "Stop accepted; waiting for durable settlement.",
+      message: "Stop requested; finishing up.",
       canResume: false,
     };
   }
@@ -660,11 +659,21 @@ export function decodePluginCatalog(value: unknown): PluginCatalogItem[] {
         connectionTypes: capability.connectionTypes,
       }),
     );
-    // A Package with neither a Connection Type nor a Capability contributes
-    // nothing the Plugins surface can install or assign. A Capability that
-    // takes no Connection still counts: a tool Package a User installs and
-    // assigns without any credential is exactly that shape.
-    if (connectionTypes.length === 0 && decodedCapabilities.length === 0) {
+    // User- and Bot-scoped declarations are needed for generic effective
+    // model resolution. Connection-scoped settings stay with their Connection
+    // and never enter Package-level settings forms.
+    const settings = (decoded.configuration?.settings ?? []).filter((setting) =>
+      setting.scopes.some((scope) => scope === "user" || scope === "bot"),
+    );
+    // A settings-only Package still contributes enablement: disabling it is
+    // what makes its retained controls inert. A Capability that takes no
+    // Connection likewise counts because enabling its Package grants it to
+    // all of the User's Bots.
+    if (
+      connectionTypes.length === 0 &&
+      decodedCapabilities.length === 0 &&
+      settings.length === 0
+    ) {
       return [];
     }
     const decodedConnections = connectionTypes.map((connection) => {
@@ -688,12 +697,7 @@ export function decodePluginCatalog(value: unknown): PluginCatalogItem[] {
         version: candidate.version,
         capabilities: decodedCapabilities,
         connectionTypes: decodedConnections,
-        // User-scoped settings only: a `bot`-scoped one is not the Plugins
-        // surface's to edit, and a Connection-scoped one is edited with its
-        // Connection.
-        settings: (decoded.configuration?.settings ?? []).filter((setting) =>
-          setting.scopes.includes("user"),
-        ),
+        settings,
       },
     ];
   });
@@ -977,31 +981,6 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
     }
   }
 
-  async function executeAssignmentOperation(
-    command: Extract<
-      ConfigurationCommandV1,
-      {
-        type:
-          | "bot/assign-capability"
-          | "bot/replace-capability"
-          | "bot/unassign-capability";
-      }
-    >,
-  ): Promise<void> {
-    const execute = ctx.transport.executeConfiguration;
-    if (!execute) throw new Error("Settings are unavailable");
-    const receipt = (await execute(command)) as OperationReceiptV1;
-    await web.value.loadBotSettings();
-    if (receipt.status === "rejected") {
-      const failure = receipt.failure ?? "Assignment operation was rejected";
-      web.value.settingsError = failure;
-      throw new Error(failure);
-    }
-    if (receipt.status === "pending") {
-      web.value.settingsError = "Assignment operation is retrying.";
-    }
-  }
-
   function updateSettingsLoadError(
     source: "bot" | "user" | "catalog" | "package-catalog",
     message?: string,
@@ -1011,63 +990,55 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
     web.value.settingsError = [...settingsLoadErrors.values()].at(-1);
   }
 
-  /**
-   * The Bot runs on its own model when it has one and on the User's default
-   * otherwise, so readiness and the composer label follow the effective model.
-   * A Bot following the default is ready as soon as the User's Connection is:
-   * the Bot's own Assignment for that Connection is claimed durably when the
-   * Turn is admitted.
-   */
+  /** Readiness and the composer label follow the generic effective model. */
   function updateModelLabel(): void {
     const bot = web.value.botSettings;
     const user = web.value.userSettings;
-    const model = bot?.model ?? user?.newBotModelTemplate;
-    web.value.modelSource = bot?.model ? "bot" : model ? "default" : "none";
-    const connection = (user?.connections ?? []).find(
-      (candidate) => candidate.connectionId === model?.connectionId,
-    );
-    const packageInstalled = (user?.packages ?? []).some(
-      (pkg) =>
-        pkg.packageId === connection?.packageId && pkg.state === "installed",
+    if (!bot || !user) {
+      web.value.modelSource = "none";
+      web.value.modelReady = false;
+      web.value.modelLabel = modelRuntimeLabel({ source: "none" });
+      return;
+    }
+    const effective = resolveEffectiveBotModelV1({
+      bot: toRaw(bot),
+      user: toRaw(user),
+      packages: toRaw(web.value.pluginCatalog).map((pkg) => ({
+        packageId: pkg.packageId,
+        version: pkg.version,
+        settings: pkg.settings ?? [],
+        capabilities: pkg.capabilities,
+        connectionTypes: pkg.connectionTypes,
+      })),
+    });
+    // `FrockBotWebData`'s source vocabulary is owned outside this lane. Until
+    // it adopts the core's four sources, both inherited choices are its
+    // existing `default` projection; the label still preserves the exact core
+    // source below.
+    web.value.modelSource =
+      effective.source === "bot"
+        ? "bot"
+        : effective.source === "none"
+          ? "none"
+          : "default";
+    web.value.modelReady = Boolean(
+      effective.binding && effective.binding.state !== "unavailable",
     );
+    const connection = effective.binding?.connection;
     const catalogPackage = web.value.pluginCatalog.find(
-      (pkg) => pkg.packageId === connection?.packageId,
-    );
-    const connectionType = catalogPackage?.connectionTypes.find(
-      (candidate) => candidate.id === connection?.connectionTypeId,
-    );
-    const modelCapabilities = new Set(
-      catalogPackage?.capabilities.flatMap((capability) =>
-        capability.kind === "model" &&
-        connectionType?.capabilities.includes(capability.id)
-          ? [capability.id]
-          : [],
-      ) ?? [],
-    );
-    const authorized =
-      web.value.modelSource === "bot"
-        ? Boolean(
-            bot?.assignments.some(
-              (assignment) =>
-                assignment.connectionId === model?.connectionId &&
-                assignment.packageId === connection?.packageId &&
-                assignment.state === "enabled" &&
-                modelCapabilities.has(assignment.capabilityId),
-            ),
-          )
-        : modelCapabilities.size > 0;
-    web.value.modelReady = Boolean(
-      model && connection?.state === "ready" && packageInstalled && authorized,
+      (pkg) => pkg.packageId === effective.binding?.packageId,
     );
     const catalogModel = connection?.modelCatalog?.models.find(
-      (candidate) => candidate.providerModelId === model?.providerModelId,
+      (candidate) =>
+        candidate.providerModelId === effective.model?.providerModelId,
     );
     web.value.modelLabel = modelRuntimeLabel({
+      source: effective.source,
       modelDisplayName: catalogModel?.displayName,
-      providerModelId: model?.providerModelId,
+      providerModelId: effective.model?.providerModelId,
       packageDisplayName: catalogPackage?.displayName,
       connectionDisplayName: connection?.displayName,
-      hasModel: Boolean(model),
+      failure: effective.binding?.failure,
     });
   }
 
@@ -1102,9 +1073,16 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
     await web.value.loadMcpServers();
   }
 
-  const web = ref<FrockBotWebData>({
+  type ShellWebData = FrockBotWebData & {
+    saveBotPackageSettings(
+      packageId: string,
+      values: Record<string, PackageSettingValueV1>,
+    ): Promise<void>;
+  };
+
+  const web: Ref<ShellWebData> = ref({
     connection: "ready",
-    modelLabel: "No default model",
+    modelLabel: "Model unavailable",
     modelReady: false,
     modelSource: "none",
     settingsAvailable: true,
@@ -1298,8 +1276,8 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
         )
           return;
         web.value.botSettings = settings;
-        // The effective model may be the User's default, so Bot readiness
-        // needs the User settings too. Loading them never fails this read:
+        // The effective model may come from account or platform state, so Bot
+        // readiness needs the User settings too. Loading them never fails this read:
         // `loadUserSettings` reports its own failure.
         if (!web.value.userSettings) await web.value.loadUserSettings();
         if (
@@ -1389,153 +1367,23 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
       });
       await web.value.loadBotSettings();
     },
-    async assignCapability(assignment): Promise<void> {
-      const current = web.value.botSettings;
-      const botId = web.value.activeBotId;
-      if (!current || !botId || !ctx.transport.executeConfiguration) {
-        throw new Error("Settings are unavailable");
-      }
-      await executeAssignmentOperation({
-        schemaVersion: 1,
-        type: "bot/assign-capability",
-        commandId: crypto.randomUUID(),
-        botId,
-        expectedRevision: current.revision,
-        assignment,
-      });
-    },
-    async replaceCapability(assignment): Promise<void> {
-      const current = web.value.botSettings;
-      const botId = web.value.activeBotId;
-      if (!current || !botId || !ctx.transport.executeConfiguration) {
-        throw new Error("Settings are unavailable");
-      }
-      await executeAssignmentOperation({
-        schemaVersion: 1,
-        type: "bot/replace-capability",
-        commandId: crypto.randomUUID(),
-        botId,
-        expectedRevision: current.revision,
-        assignment,
-      });
-    },
-    async unassignCapability(assignmentId): Promise<void> {
+    async saveBotPackageSettings(
+      packageId: string,
+      values: Record<string, PackageSettingValueV1>,
+    ): Promise<void> {
       const current = web.value.botSettings;
       const botId = web.value.activeBotId;
       if (!current || !botId || !ctx.transport.executeConfiguration) {
         throw new Error("Settings are unavailable");
       }
-      await executeAssignmentOperation({
-        schemaVersion: 1,
-        type: "bot/unassign-capability",
-        commandId: crypto.randomUUID(),
-        botId,
-        expectedRevision: current.revision,
-        assignmentId,
-      });
-    },
-    async saveBotModel(model: ModelAssignment): Promise<void> {
-      const current = web.value.botSettings;
-      const user = web.value.userSettings;
-      const botId = web.value.activeBotId;
-      if (!current || !user || !botId || !ctx.transport.executeConfiguration) {
-        throw new Error("Settings are unavailable");
-      }
-      const modelChanged =
-        current.model?.connectionId !== model.connectionId ||
-        current.model?.providerModelId !== model.providerModelId;
-      const connection = user.connections.find(
-        (candidate) => candidate.connectionId === model.connectionId,
-      );
-      if (!modelChanged && connection?.state !== "ready") return;
-      const pkg = web.value.pluginCatalog.find(
-        (candidate) => candidate.packageId === connection?.packageId,
-      );
-      const connectionType = pkg?.connectionTypes.find(
-        (candidate) => candidate.id === connection?.connectionTypeId,
-      );
-      const capability = pkg?.capabilities.find(
-        (candidate) =>
-          candidate.kind === "model" &&
-          connectionType?.capabilities.includes(candidate.id),
-      );
-      if (!connection || connection.state !== "ready" || !pkg || !capability) {
-        throw new Error("The selected Connection has no model capability");
-      }
-      const assigned = current.assignments.some(
-        (assignment) =>
-          assignment.state === "enabled" &&
-          assignment.packageId === pkg.packageId &&
-          assignment.capabilityId === capability.id &&
-          assignment.connectionId === connection.connectionId,
-      );
-      if (assigned && !modelChanged) return;
-      if (!assigned) {
-        // The binding commits inside the Assignment saga's commit phase, so
-        // the Connection claim and the Bot's model are one durable unit. An
-        // existing model Assignment on another Connection is replaced
-        // atomically rather than unassigned and assigned again.
-        const superseded = current.assignments.find(
-          (assignment) =>
-            assignment.packageId === pkg.packageId &&
-            assignment.capabilityId === capability.id,
-        );
-        await executeAssignmentOperation({
-          schemaVersion: 1,
-          type: superseded ? "bot/replace-capability" : "bot/assign-capability",
-          commandId: crypto.randomUUID(),
-          botId,
-          expectedRevision: current.revision,
-          assignment: {
-            assignmentId: superseded?.assignmentId ?? crypto.randomUUID(),
-            packageId: pkg.packageId,
-            capabilityId: capability.id,
-            connectionId: connection.connectionId,
-          },
-          model,
-        });
-        return;
-      }
-      const receipt = await ctx.transport.executeConfiguration({
-        schemaVersion: 1,
-        type: "bot/select-model",
-        commandId: crypto.randomUUID(),
-        botId,
-        expectedRevision: current.revision,
-        model,
-      });
-      await web.value.loadBotSettings();
-      if (receipt.status === "rejected") {
-        throw new Error(receipt.failure);
-      }
-    },
-    async clearBotModel(): Promise<void> {
-      const current = web.value.botSettings;
-      const botId = web.value.activeBotId;
-      if (!current?.model || !botId || !ctx.transport.executeConfiguration) {
-        throw new Error("Settings are unavailable");
-      }
-      const assignment = current.assignments.find((candidate) => {
-        const capability = web.value.pluginCatalog
-          .find((pkg) => pkg.packageId === candidate.packageId)
-          ?.capabilities.find(
-            (declared) => declared.id === candidate.capabilityId,
-          );
-        return (
-          (candidate.state === "enabled" ||
-            candidate.state === "unavailable") &&
-          candidate.connectionId === current.model?.connectionId &&
-          capability?.kind === "model"
-        );
-      });
-      if (!assignment) throw new Error("Bot model assignment is unavailable");
       const receipt = await ctx.transport.executeConfiguration({
         schemaVersion: 1,
-        type: "bot/unbind-model",
+        type: "bot/set-package-settings",
         commandId: crypto.randomUUID(),
         botId,
         expectedRevision: current.revision,
-        assignmentId: assignment.assignmentId,
+        packageId,
+        values,
       });
       await web.value.loadBotSettings();
       if (receipt.status === "rejected") throw new Error(receipt.failure);
@@ -1585,30 +1433,6 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
       });
       await web.value.loadUserSettings();
     },
-    async saveDefaultModel(model: ModelAssignment | undefined): Promise<void> {
-      const settings = web.value.userSettings;
-      if (!settings || !ctx.transport.executeConfiguration) {
-        throw new Error("Settings are unavailable");
-      }
-      const current = settings.newBotModelTemplate;
-      if (
-        current?.connectionId === model?.connectionId &&
-        current?.providerModelId === model?.providerModelId &&
-        settings.newBotModelTemplateSource === "user"
-      ) {
-        return;
-      }
-      const receipt = await ctx.transport.executeConfiguration({
-        schemaVersion: 1,
-        type: "user/set-new-bot-model",
-        commandId: crypto.randomUUID(),
-        expectedRevision: settings.revision,
-        ...(model ? { model } : {}),
-        source: "user",
-      });
-      await web.value.loadUserSettings();
-      if (receipt.status === "rejected") throw new Error(receipt.failure);
-    },
     async loadPluginCatalog(): Promise<void> {
       if (
         !ctx.transport.readApplicationManifest ||
@@ -1846,7 +1670,10 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
       // Enablement is projected onto the installation row the Plugins surface
       // renders, so the toggle reads back what the User authority recorded.
       await web.value.loadPluginCatalog();
-      if (receipt.status === "rejected") throw new Error(receipt.failure);
+      if (receipt.status === "rejected") {
+        web.value.settingsError = receipt.failure;
+        throw new Error(receipt.failure);
+      }
     },
     async savePackageSettings(
       packageId: string,
@@ -2187,7 +2014,7 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
           runId: pendingRunId,
           role: "assistant",
           text: aborted
-            ? "Request stopped locally; admission may still be durable."
+            ? "Request stopped locally; checking whether it started."
             : "Confirming whether this Turn was admitted.",
           at: optimisticAt,
           status: "interrupted",
@@ -2246,7 +2073,7 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
       web.value.activeRun = {
         runId,
         status: "running",
-        message: "Reconciliation requested; waiting for durable progress.",
+        message: "Reconciliation requested; checking progress.",
         canResume: false,
       };
       const botId = web.value.activeBotId;
@@ -2314,11 +2141,13 @@ export const shellClientPlugin: ClientPlugin = (ctx) => {
     async abort() {
       activeRequest?.abort();
     },
-  });
+  } satisfies Partial<ShellWebData>) as unknown as Ref<ShellWebData>;
 
   return [
     ctx.provide(clientSurfaceRegistryKey, surfaces),
-    ctx.provide(frockBotWebDataKey, web),
+    // The shared client projection is updated by the contracts lane. This cast
+    // is the seam between its retired methods and this lane's replacement.
+    ctx.provide(frockBotWebDataKey, web as unknown as Ref<FrockBotWebData>),
     ctx.slot({
       slot: "authenticated-root",
       order: 10_000,

package/src/client/model-presentation.test.ts

@@ -2,34 +2,47 @@ import { describe, expect, test } from "bun:test";
 import { modelRuntimeLabel } from "./model-presentation.js";
 
 describe("model runtime presentation", () => {
-  test("names the model and its provider Package", () => {
+  test("names platform models plainly", () => {
     expect(
       modelRuntimeLabel({
+        source: "platform",
         modelDisplayName: "Llama 3",
         providerModelId: "llama-3:cloud",
         packageDisplayName: "Ollama Cloud",
         connectionDisplayName: "Work",
-        hasModel: true,
       }),
     ).toBe("Llama 3 · Ollama Cloud");
     expect(
       modelRuntimeLabel({
+        source: "platform",
         providerModelId: "llama-3:cloud",
         connectionDisplayName: "Custom provider",
-        hasModel: true,
       }),
     ).toBe("llama-3:cloud · Custom provider");
   });
 
-  test("reads the same whether the model is the Bot's or the User default", () => {
+  test("distinguishes opt-in account and Bot choices", () => {
     const label = {
       modelDisplayName: "Llama 3",
+      providerModelId: "llama-3:cloud",
       packageDisplayName: "Ollama Cloud",
-      hasModel: true,
     };
-    expect(modelRuntimeLabel(label)).toBe("Llama 3 · Ollama Cloud");
-    expect(modelRuntimeLabel({ ...label, hasModel: false })).toBe(
-      "No default model",
+    expect(modelRuntimeLabel({ ...label, source: "account" })).toBe(
+      "Llama 3 · Ollama Cloud · Account model",
     );
+    expect(modelRuntimeLabel({ ...label, source: "bot" })).toBe(
+      "Llama 3 · Ollama Cloud · Bot override",
+    );
+  });
+
+  test("shows unavailable and backend failure states", () => {
+    expect(modelRuntimeLabel({ source: "none" })).toBe("Model unavailable");
+    expect(
+      modelRuntimeLabel({
+        source: "account",
+        providerModelId: "llama-3:cloud",
+        failure: 'Connection "work" is revoked; enable or reconnect it',
+      }),
+    ).toBe('Connection "work" is revoked; enable or reconnect it');
   });
 });

package/src/client/model-presentation.ts

@@ -1,19 +1,26 @@
 /**
- * The model line the shell shows above the composer. It names the model the
- * Bot actually runs on, whether that model is the Bot's own override or the
- * User's default: a Bot that "just works" does not advertise where its
- * settings came from.
+ * The model line the shell shows above the composer. Platform choices read as
+ * the model itself; opting into an account choice or Bot override makes that
+ * distinction visible. A resolver failure is already the backend's complete,
+ * repairable explanation, so the client presents it verbatim.
  */
 export function modelRuntimeLabel(input: {
+  source: "bot" | "account" | "platform" | "none";
   modelDisplayName?: string;
   providerModelId?: string;
   packageDisplayName?: string;
   connectionDisplayName?: string;
-  hasModel: boolean;
+  failure?: string;
 }): string {
-  if (!input.hasModel) return "No default model";
+  if (input.failure) return input.failure;
+  if (input.source === "none" || !input.providerModelId) {
+    return "Model unavailable";
+  }
   const model =
     input.modelDisplayName ?? input.providerModelId ?? "Connected model";
   const provider = input.packageDisplayName ?? input.connectionDisplayName;
-  return provider ? `${model} · ${provider}` : model;
+  const runtime = provider ? `${model} · ${provider}` : model;
+  if (input.source === "bot") return `${runtime} · Bot override`;
+  if (input.source === "account") return `${runtime} · Account model`;
+  return runtime;
 }

package/src/client/styles.css

@@ -175,27 +175,6 @@
   text-overflow: ellipsis;
 }
 
-.model-setup-link {
-  width: max-content;
-  max-width: 100%;
-  margin-top: 3px;
-  overflow: hidden;
-  border: 0;
-  padding: 0;
-  color: var(--frock-action-primary);
-  background: transparent;
-  font: inherit;
-  font-size: var(--frock-text-sm);
-  text-align: left;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer;
-}
-
-.model-setup-link:hover {
-  color: var(--frock-action-primary-hover);
-}
-
 /*
  * The panel collapse control is pinned to the window's trailing edge. Feature
  * actions live in the panel's own header.
@@ -570,12 +549,6 @@
     0 0 0 3px var(--frock-focus-ring);
 }
 
-.composer-model-setup {
-  min-width: 0;
-  flex: 1;
-  align-self: center;
-}
-
 .composer textarea {
   box-sizing: border-box;
   width: 100%;

package/src/settings-links.test.ts

@@ -23,11 +23,11 @@ describe("settings link scheme", () => {
   test("renders against an origin when one is supplied", () => {
     expect(
       settingsLinkV1({
-        anchor: "bot-model",
+        anchor: "bot-name",
         botId: "alpha",
         origin: "https://app.example/",
       }),
-    ).toBe("https://app.example/?bot=alpha&settings=bot-settings#bot-model");
+    ).toBe("https://app.example/?bot=alpha&settings=bot-settings#bot-name");
   });
 
   test("refuses an anchor this build does not ship", () => {
@@ -36,14 +36,6 @@ describe("settings link scheme", () => {
     );
   });
 
-  test("renders a Markdown citation a payload can carry verbatim", () => {
-    expect(
-      renderSettingsLinkV1({ anchor: "bot-capabilities", botId: "alpha" }),
-    ).toBe(
-      "[Capability Assignments](/?bot=alpha&settings=bot-settings#bot-capabilities)",
-    );
-  });
-
   test("decodes an absolute link back to its surface, anchor and Bot", () => {
     expect(
       decodeSettingsLinkV1(

package/src/settings-links.ts

@@ -108,18 +108,6 @@ export const SETTINGS_ANCHORS_V1: readonly SettingsAnchorV1[] = [
     label: "Waiting on you",
     scope: "bot",
   },
-  {
-    anchor: "bot-model",
-    surface: "bot-settings",
-    label: "Model",
-    scope: "bot",
-  },
-  {
-    anchor: "bot-capabilities",
-    surface: "bot-settings",
-    label: "Capability Assignments",
-    scope: "bot",
-  },
   {
     anchor: "bot-routines",
     surface: "bot-settings",
@@ -194,7 +182,7 @@ export const SETTINGS_ANCHORS_V1: readonly SettingsAnchorV1[] = [
   {
     anchor: "user-connections",
     surface: "connections",
-    label: "Connections",
+    label: "Connectors",
     scope: "user",
   },
   {