@frockbot/plugin-flock 0.1.3 → 0.1.4

package/package.json

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

package/src/agent.test.ts

@@ -94,14 +94,6 @@ function harness(initial?: Partial<BotSettingsViewV1>): Harness {
   const storage = memoryStorage();
   const flock = createFlockUserBackendContribution({
     storage,
-    readUserSettings: () =>
-      Promise.resolve({
-        schemaVersion: 1,
-        revision: 0,
-        profile: { name: "User" },
-        packages: [],
-        connections: [],
-      }),
     now: () => new Date("2026-08-31T10:00:00.000Z"),
     random: () => 0,
     commandBotLifecycle: () => {
@@ -339,10 +331,9 @@ describe("bot_create", () => {
     expect(created.botId).toBe(
       await createdBotIdV1(OWNER, CONTEXT.effectId, "Budget"),
     );
-    // The new Bot receives no authority beyond what `bot/create` grants: no
-    // model of its own and no Assignment.
-    expect(created.initialModel).toBeUndefined();
-    expect(created.initialModelBinding).toBeUndefined();
+    // Model and Capability authority resolve account-wide on the new Bot's
+    // next admitted Turn; neither is copied into its registration.
+    expect(Object.hasOwn(created, "initialModel")).toBe(false);
     expect(result.content).toContain(created.botId);
   });
 

package/src/client/FlockOverlay.vue

@@ -73,7 +73,7 @@ onBeforeUnmount(() => restoreFocus?.focus());
         <h1 id="flock-title">Archive this Bot?</h1>
         <p>
           Archiving stops new work and hides the Bot from your active flock.
-          History, settings, and Assignments are preserved for restoration.
+          History and settings are preserved for restoration.
         </p>
         <p
           v-if="flock.error"
@@ -185,8 +185,8 @@ onBeforeUnmount(() => restoreFocus?.focus());
             </div>
           </fieldset>
           <div class="flock-note">
-            This identity is durable. Refreshing or switching devices won’t
-            re-roll it.
+            This identity stays with your Bot. Refreshing or switching devices
+            won’t re-roll it.
           </div>
           <p
             v-if="flock.error"

package/src/shared.test.ts

@@ -69,10 +69,9 @@ describe("Flock v1 contracts", () => {
     ).toThrow("unknown or missing field");
   });
 
-  test("round-trips configuration-valid provider model text", () => {
+  test("rejects retired model seed fields", () => {
     const sheep = randomSheepRecipeV1(() => 0);
-    const providerModelId = "m".repeat(256);
-    expect(
+    expect(() =>
       decodeDirectoryViewV1({
         schemaVersion: 1,
         revision: 1,
@@ -84,23 +83,13 @@ describe("Flock v1 contracts", () => {
             initialName: "Alpha",
             initialModel: {
               connectionId: "connection-1",
-              providerModelId,
-            },
-            initialModelBinding: {
-              assignment: {
-                assignmentId: "create-alpha",
-                packageId: "provider-ollama-cloud",
-                capabilityId: "ollama-cloud-models",
-                connectionId: "connection-1",
-                state: "enabled",
-              },
-              generation: "create-alpha",
+              providerModelId: "model-1",
             },
             sheep,
           },
         ],
-      }).bots[0]?.initialModel?.providerModelId,
-    ).toBe(providerModelId);
+      }),
+    ).toThrow("unknown or missing field");
     expect(() =>
       decodeCreateBotCommandV1({
         schemaVersion: 1,

package/src/shared.ts

@@ -1,13 +1,10 @@
 // Shared configuration types remain provider-neutral at this package seam.
 import {
-  decodeCapabilityAssignmentV1,
   decodeBotIdV1,
   decodeBotSelfWriterV1,
   isPublicIdentifier,
   type BotNameProvenanceV1,
   type BotSelfWriterV1,
-  type CapabilityAssignmentView,
-  type ModelAssignment,
 } from "@frockbot/configuration-core";
 export type { BotSelfWriterV1 } from "@frockbot/configuration-core";
 import assetManifest from "../assets/manifest.json" with { type: "json" };
@@ -26,10 +23,6 @@ export interface SheepRecipeV1 {
   middle: string;
   lower: string;
 }
-export interface InitialModelBindingV1 {
-  assignment: CapabilityAssignmentView;
-  generation: string;
-}
 export interface BotRegistrationV1 {
   schemaVersion: 1;
   botId: string;
@@ -42,13 +35,6 @@ export interface BotRegistrationV1 {
    * Durable Object, which no other Bot may write.
    */
   initialDescription?: string;
-  initialModel?: ModelAssignment;
-  initialModelBinding?: InitialModelBindingV1;
-  /**
-   * Connection-less Capability authority snapshotted from the User's installed
-   * Packages when this Bot was admitted.
-   */
-  initialAssignments?: CapabilityAssignmentView[];
   /**
    * The Bot and Turn that created this Bot, when a Bot created it. Absent for
    * a User-created Bot and for every registration written before this existed.
@@ -264,63 +250,6 @@ function revision(value: unknown): number {
     throw new FlockDecodeError("revision is invalid");
   return value as number;
 }
-function modelAssignment(value: unknown): ModelAssignment {
-  const model = record(value, "initialModel");
-  exact(model, ["connectionId", "providerModelId"]);
-  return {
-    connectionId: identifier(model.connectionId, "initialModel.connectionId"),
-    providerModelId: boundedText(
-      model.providerModelId,
-      "initialModel.providerModelId",
-      256,
-    ),
-  };
-}
-
-function initialModelBinding(value: unknown): InitialModelBindingV1 {
-  const binding = record(value, "initialModelBinding");
-  exact(binding, ["assignment", "generation"]);
-  const assignment = record(
-    binding.assignment,
-    "initialModelBinding.assignment",
-  );
-  exact(assignment, [
-    "assignmentId",
-    "packageId",
-    "capabilityId",
-    "connectionId",
-    "state",
-  ]);
-  if (assignment.state !== "enabled") {
-    throw new FlockDecodeError("initial model assignment is invalid");
-  }
-  return {
-    assignment: {
-      assignmentId: identifier(
-        assignment.assignmentId,
-        "initialModelBinding.assignment.assignmentId",
-      ),
-      packageId: identifier(
-        assignment.packageId,
-        "initialModelBinding.assignment.packageId",
-      ),
-      capabilityId: identifier(
-        assignment.capabilityId,
-        "initialModelBinding.assignment.capabilityId",
-      ),
-      connectionId: identifier(
-        assignment.connectionId,
-        "initialModelBinding.assignment.connectionId",
-      ),
-      state: "enabled",
-    },
-    generation: identifier(
-      binding.generation,
-      "initialModelBinding.generation",
-    ),
-  };
-}
-
 export function decodeSheepRecipeV1(input: unknown): SheepRecipeV1 {
   const value = record(input, "sheep recipe");
   exact(value, ["schemaVersion", "background", "upper", "middle", "lower"]);
@@ -405,51 +334,10 @@ export function decodeBotRegistrationV1(input: unknown): BotRegistrationV1 {
   exact(
     bot,
     ["schemaVersion", "botId", "registeredAt", "initialName", "sheep"],
-    [
-      "initialDescription",
-      "initialModel",
-      "initialModelBinding",
-      "initialAssignments",
-      "createdBy",
-    ],
+    ["initialDescription", "createdBy"],
   );
   if (bot.schemaVersion !== 1)
     throw new FlockDecodeError("unsupported Bot registration");
-  const initialModel =
-    bot.initialModel === undefined
-      ? undefined
-      : modelAssignment(bot.initialModel);
-  const binding =
-    bot.initialModelBinding === undefined
-      ? undefined
-      : initialModelBinding(bot.initialModelBinding);
-  if (
-    bot.initialAssignments !== undefined &&
-    !Array.isArray(bot.initialAssignments)
-  )
-    throw new FlockDecodeError("initial Assignments are invalid");
-  const initialAssignments =
-    bot.initialAssignments === undefined
-      ? undefined
-      : bot.initialAssignments.map(decodeCapabilityAssignmentV1);
-  if (
-    new Set(
-      (initialAssignments ?? []).map((assignment) => assignment.assignmentId),
-    ).size !== (initialAssignments ?? []).length ||
-    (initialAssignments ?? []).some(
-      (assignment) =>
-        assignment.connectionId !== undefined || assignment.state !== "enabled",
-    )
-  ) {
-    throw new FlockDecodeError("initial Assignments are invalid");
-  }
-  if (
-    binding &&
-    (!initialModel ||
-      binding.assignment.connectionId !== initialModel.connectionId)
-  ) {
-    throw new FlockDecodeError("initial model binding is invalid");
-  }
   const botId = botIdentifier(bot.botId);
   const createdBy = botWriter(bot.createdBy, "createdBy");
   if (createdBy && createdBy.botId === botId)
@@ -468,9 +356,6 @@ export function decodeBotRegistrationV1(input: unknown): BotRegistrationV1 {
             10_000,
           ),
         }),
-    initialModel,
-    initialModelBinding: binding,
-    ...(initialAssignments ? { initialAssignments } : {}),
     ...(createdBy ? { createdBy } : {}),
     sheep: decodeSheepRecipeV1(bot.sheep),
   };

package/src/user.test.ts

@@ -41,22 +41,6 @@ class MemoryStorage {
     return Promise.resolve();
   }
 }
-const settings = {
-  schemaVersion: 1 as const,
-  revision: 4,
-  profile: { name: "User" },
-  packages: [
-    { packageId: "web", version: "0.0.1", state: "installed" as const },
-    {
-      packageId: "provider-ollama-cloud",
-      version: "0.0.1",
-      state: "installed" as const,
-    },
-  ],
-  connections: [],
-  newBotModelTemplate: { connectionId: "provider", providerModelId: "model" },
-  newBotModelTemplateSource: "auto" as const,
-};
 function command(commandId = "create-1", expectedRevision = 0) {
   return {
     schemaVersion: 1 as const,
@@ -70,46 +54,10 @@ function command(commandId = "create-1", expectedRevision = 0) {
 }
 
 describe("Flock User contribution", () => {
-  test("atomically admits, snapshots defaults, and replays duplicate delivery", async () => {
+  test("atomically admits a model-free Bot and replays duplicate delivery", async () => {
     const storage = new MemoryStorage();
     const contribution = createFlockUserBackendContribution({
       storage,
-      availablePackages: [
-        {
-          packageId: "web",
-          version: "0.0.1",
-          capabilities: [
-            { id: "web-fetch", kind: "tool", connectionTypes: [] },
-          ],
-          connectionTypes: [],
-        },
-        {
-          packageId: "provider-ollama-cloud",
-          version: "0.0.1",
-          capabilities: [
-            {
-              id: "ollama-cloud-models",
-              kind: "model",
-              connectionTypes: ["ollama-cloud-account"],
-            },
-          ],
-          connectionTypes: [
-            {
-              id: "ollama-cloud-account",
-              capabilities: ["ollama-cloud-models"],
-            },
-          ],
-        },
-      ],
-      readUserSettings: () => Promise.resolve(settings),
-      claimInitialModelBinding: (_storage, input) =>
-        Promise.resolve({
-          assignmentId: input.generation,
-          packageId: "provider-ollama-cloud",
-          capabilityId: "ollama-cloud-models",
-          connectionId: input.model.connectionId,
-          state: "enabled",
-        }),
       now: () => new Date("2026-08-29T00:00:00.000Z"),
       commandBotLifecycle: () => Promise.reject(new Error("not used")),
       readBotLifecycle: () => Promise.reject(new Error("not used")),
@@ -122,20 +70,9 @@ describe("Flock User contribution", () => {
       initialName: "Alpha",
       registeredAt: "2026-08-29T00:00:00.000Z",
     });
-    // A new Bot follows the User's default model instead of copying it, so
-    // the registration seed carries no model and no claimed binding.
-    expect(await contribution.registration("alpha")).toMatchObject({
-      initialModel: undefined,
-      initialModelBinding: undefined,
-      initialAssignments: [
-        {
-          assignmentId: "default-0-0",
-          packageId: "web",
-          capabilityId: "web-fetch",
-          state: "enabled",
-        },
-      ],
-    });
+    const registration = await contribution.registration("alpha");
+    expect(Object.hasOwn(registration, "initialModel")).toBe(false);
+    expect(Object.hasOwn(registration, "initialCapabilities")).toBe(false);
     await expect(
       contribution.createBot("user-1", { ...command(), name: "Different" }),
     ).rejects.toThrow("command ID collision");
@@ -147,16 +84,10 @@ describe("Flock User contribution", () => {
     ).rejects.toBeInstanceOf(FlockConflictError);
   });
 
-  test("admits a Bot while the User default model is unclaimable", async () => {
+  test("admits a Bot without consulting User model state", async () => {
     const storage = new MemoryStorage();
-    let claims = 0;
     const contribution = createFlockUserBackendContribution({
       storage,
-      readUserSettings: () => Promise.resolve(settings),
-      claimInitialModelBinding: () => {
-        claims += 1;
-        return Promise.resolve(undefined);
-      },
       commandBotLifecycle: () => Promise.reject(new Error("not used")),
       readBotLifecycle: () => Promise.reject(new Error("not used")),
     });
@@ -164,9 +95,8 @@ describe("Flock User contribution", () => {
     await expect(
       contribution.createBot("user-1", command()),
     ).resolves.toMatchObject({ status: "applied" });
-    expect(claims).toBe(0);
     expect((await contribution.listBots()).bots).toMatchObject([
-      { botId: "alpha", initialModel: undefined },
+      { botId: "alpha" },
     ]);
   });
 
@@ -174,10 +104,8 @@ describe("Flock User contribution", () => {
     const storage = new MemoryStorage();
     const contribution = createFlockUserBackendContribution({
       storage,
-      readUserSettings: () => Promise.resolve(settings),
       commandBotLifecycle: () => Promise.reject(new Error("not used")),
       readBotLifecycle: () => Promise.reject(new Error("not used")),
-      claimInitialModelBinding: () => Promise.resolve(undefined),
     });
     await storage.put("flock:directory:v1", {
       schemaVersion: 1,
@@ -204,15 +132,6 @@ describe("Flock User contribution", () => {
     let calls = 0;
     const contribution = createFlockUserBackendContribution({
       storage,
-      readUserSettings: () => Promise.resolve(settings),
-      claimInitialModelBinding: (_storage, input) =>
-        Promise.resolve({
-          assignmentId: input.generation,
-          packageId: "provider-ollama-cloud",
-          capabilityId: "ollama-cloud-models",
-          connectionId: input.model.connectionId,
-          state: "enabled" as const,
-        }),
       commandBotLifecycle: (_userId, lifecycleCommand) => {
         calls += 1;
         botStatus =
@@ -273,15 +192,6 @@ describe("Flock User contribution", () => {
     let recovered = false;
     const contribution = createFlockUserBackendContribution({
       storage,
-      readUserSettings: () => Promise.resolve(settings),
-      claimInitialModelBinding: (_storage, input) =>
-        Promise.resolve({
-          assignmentId: input.generation,
-          packageId: "provider-ollama-cloud",
-          capabilityId: "ollama-cloud-models",
-          connectionId: input.model.connectionId,
-          state: "enabled" as const,
-        }),
       commandBotLifecycle: () => Promise.reject(new Error("response lost")),
       readBotLifecycle: (_userId, botId) =>
         recovered
@@ -315,15 +225,6 @@ describe("Flock User contribution", () => {
     recovered = true;
     const reconstructed = createFlockUserBackendContribution({
       storage,
-      readUserSettings: () => Promise.resolve(settings),
-      claimInitialModelBinding: (_storage, input) =>
-        Promise.resolve({
-          assignmentId: input.generation,
-          packageId: "provider-ollama-cloud",
-          capabilityId: "ollama-cloud-models",
-          connectionId: input.model.connectionId,
-          state: "enabled" as const,
-        }),
       commandBotLifecycle: () => Promise.reject(new Error("response lost")),
       readBotLifecycle: (_userId, botId) =>
         Promise.resolve({
@@ -356,15 +257,6 @@ describe("Flock User contribution", () => {
       const create = () =>
         createFlockUserBackendContribution({
           storage,
-          readUserSettings: () => Promise.resolve(settings),
-          claimInitialModelBinding: (_storage, input) =>
-            Promise.resolve({
-              assignmentId: input.generation,
-              packageId: "provider-ollama-cloud",
-              capabilityId: "ollama-cloud-models",
-              connectionId: input.model.connectionId,
-              state: "enabled" as const,
-            }),
           commandBotLifecycle: () =>
             Promise.resolve({
               schemaVersion: 1,
@@ -411,17 +303,8 @@ describe("Flock User contribution", () => {
     const storage = new MemoryStorage();
     const contribution = createFlockUserBackendContribution({
       storage,
-      readUserSettings: () => Promise.resolve(settings),
       commandBotLifecycle: () => Promise.reject(new Error("not used")),
       readBotLifecycle: () => Promise.reject(new Error("not used")),
-      claimInitialModelBinding: (_storage, input) =>
-        Promise.resolve({
-          assignmentId: input.generation,
-          packageId: "provider-ollama-cloud",
-          capabilityId: "ollama-cloud-models",
-          connectionId: input.model.connectionId,
-          state: "enabled",
-        }),
     });
     await contribution.createBot("user-1", command());
     expect(

package/src/user.ts

@@ -1,9 +1,3 @@
-import type {
-  CapabilityAssignmentView,
-  ExecutionPackageDefinition,
-  ModelAssignment,
-  UserSettingsViewV1,
-} from "@frockbot/configuration-core";
 import type { Plugin } from "cordis";
 import {
   BotNotFoundError,
@@ -51,28 +45,6 @@ interface Storage extends FlockUserTransaction {
 }
 export interface FlockUserBackendHost {
   storage: Storage;
-  /**
-   * Retained for hosts that materialize a Bot from User state. A new Bot no
-   * longer copies the User default model, so neither seam is called here.
-   */
-  readUserSettings(
-    storage: FlockUserTransaction,
-    userId: string,
-  ): Promise<UserSettingsViewV1>;
-  /**
-   * Immutable Package definitions from the application manifest. Omitted only
-   * by narrow test adapters that intentionally expose no Package authority.
-   */
-  availablePackages?: readonly ExecutionPackageDefinition[];
-  claimInitialModelBinding?(
-    storage: FlockUserTransaction,
-    input: {
-      userId: string;
-      botId: string;
-      generation: string;
-      model: ModelAssignment;
-    },
-  ): Promise<CapabilityAssignmentView | undefined>;
   now?: () => Date;
   random?: () => number;
   commandBotLifecycle(
@@ -187,34 +159,9 @@ export class FlockUserBackendContribution {
           failure: "Bot directory limit reached",
         };
       } else {
-        const user = await this.host.readUserSettings(storage, userId);
-        const installedVersions = new Map(
-          user.packages.flatMap((pkg) =>
-            pkg.state === "installed" ? [[pkg.packageId, pkg.version]] : [],
-          ),
-        );
-        const initialAssignments = (this.host.availablePackages ?? []).flatMap(
-          (pkg, packageIndex) =>
-            installedVersions.get(pkg.packageId) === pkg.version
-              ? pkg.capabilities.flatMap((capability, capabilityIndex) =>
-                  capability.connectionTypes.length === 0 &&
-                  capability.kind !== "model"
-                    ? [
-                        {
-                          assignmentId: `default-${packageIndex}-${capabilityIndex}`,
-                          packageId: pkg.packageId,
-                          capabilityId: capability.id,
-                          state: "enabled" as const,
-                        },
-                      ]
-                    : [],
-                )
-              : [],
-        );
-        // A new Bot carries no model of its own: it follows the User's
-        // default model dynamically, and claims the Connection's model
-        // Capability the first time it resolves its execution context. Only a
-        // Bot that overrides the default owns a durable `model`.
+        // A new Bot carries neither a model nor a grant. Both resolve from the
+        // User's enabled Packages and Connections at its next admitted Turn
+        // (AGENTS.md Configuration shape; ADR 0019).
         const registration: BotRegistrationV1 = {
           schemaVersion: 1,
           botId: command.botId,
@@ -223,9 +170,6 @@ export class FlockUserBackendContribution {
           ...(command.description === undefined
             ? {}
             : { initialDescription: command.description }),
-          initialModel: undefined,
-          initialModelBinding: undefined,
-          initialAssignments,
           // The creator is durable history: a Bot the Flock made on another
           // Bot's behalf says so in the registration seed itself.
           ...(command.createdBy