@frockbot/plugin-shell 0.3.10 → 0.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-shell",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "private": false,
   "type": "module",
   "exports": {
@@ -27,6 +27,7 @@
     "./client/FrockBotApp.vue": "./src/client/FrockBotApp.vue",
     "./client/notify": "./src/client/notify.ts",
     "./client/styles.css": "./src/client/styles.css",
+    "./focus": "./src/focus.ts",
     "./frockbot.json": "./frockbot.json",
     "./host": "./src/host.ts",
     "./manifest": "./src/manifest.ts",
@@ -48,45 +49,46 @@
   },
   "dependencies": {
     "@cordisjs/plugin-webui": "0.8.2",
-    "@frockbot/agent-runtime": "0.3.10",
-    "@frockbot/application-foundation": "0.3.10",
-    "@frockbot/catalog-core": "0.3.10",
-    "@frockbot/client-core": "0.3.10",
-    "@frockbot/client-ui": "0.3.10",
-    "@frockbot/computer-core": "0.3.10",
-    "@frockbot/computer-host-protocol": "0.3.10",
-    "@frockbot/configuration-core": "0.3.10",
-    "@frockbot/connection-core": "0.3.10",
-    "@frockbot/kernel-agent-loop": "0.3.10",
-    "@frockbot/kernel-composition": "0.3.10",
-    "@frockbot/kernel-contracts": "0.3.10",
-    "@frockbot/kernel-do": "0.3.10",
-    "@frockbot/machine-protocol": "0.3.10",
-    "@frockbot/plugin-applets": "0.3.10",
-    "@frockbot/plugin-authoring": "0.3.10",
-    "@frockbot/plugin-bot-template": "0.3.10",
-    "@frockbot/plugin-computer": "0.3.10",
-    "@frockbot/plugin-flock": "0.3.10",
-    "@frockbot/plugin-image": "0.3.10",
-    "@frockbot/plugin-machine-messages": "0.3.10",
-    "@frockbot/plugin-mcp": "0.3.10",
-    "@frockbot/plugin-memory": "0.3.10",
-    "@frockbot/plugin-package-catalog": "0.3.10",
-    "@frockbot/plugin-routines": "0.3.10",
-    "@frockbot/plugin-skills": "0.3.10",
-    "@frockbot/plugin-subagents": "0.3.10",
-    "@frockbot/plugin-user-machine": "0.3.10",
-    "@frockbot/protocol": "0.3.10",
+    "@frockbot/agent-runtime": "0.3.12",
+    "@frockbot/application-foundation": "0.3.12",
+    "@frockbot/catalog-core": "0.3.12",
+    "@frockbot/client-core": "0.3.12",
+    "@frockbot/client-ui": "0.3.12",
+    "@frockbot/computer-core": "0.3.12",
+    "@frockbot/computer-host-protocol": "0.3.12",
+    "@frockbot/configuration-core": "0.3.12",
+    "@frockbot/connection-core": "0.3.12",
+    "@frockbot/kernel-agent-loop": "0.3.12",
+    "@frockbot/kernel-composition": "0.3.12",
+    "@frockbot/kernel-contracts": "0.3.12",
+    "@frockbot/kernel-do": "0.3.12",
+    "@frockbot/machine-protocol": "0.3.12",
+    "@frockbot/plugin-applets": "0.3.12",
+    "@frockbot/plugin-authoring": "0.3.12",
+    "@frockbot/plugin-bot-template": "0.3.12",
+    "@frockbot/plugin-computer": "0.3.12",
+    "@frockbot/plugin-flock": "0.3.12",
+    "@frockbot/plugin-image": "0.3.12",
+    "@frockbot/plugin-machine-messages": "0.3.12",
+    "@frockbot/plugin-mcp": "0.3.12",
+    "@frockbot/plugin-memory": "0.3.12",
+    "@frockbot/plugin-package-catalog": "0.3.12",
+    "@frockbot/plugin-routines": "0.3.12",
+    "@frockbot/plugin-skills": "0.3.12",
+    "@frockbot/plugin-subagents": "0.3.12",
+    "@frockbot/plugin-user-machine": "0.3.12",
+    "@frockbot/protocol": "0.3.12",
     "cordis": "4.0.0-rc.8",
     "vue": "3.5.41"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "latest",
-    "@frockbot/plugin-tools": "0.3.10",
+    "@frockbot/plugin-prompt": "0.3.12",
+    "@frockbot/plugin-tools": "0.3.12",
     "@types/bun": "1.3.6",
     "@types/node": "26.2.0",
     "@vitejs/plugin-vue": "6.0.8",
-    "typescript": "5.9.3",
+    "typescript": "npm:typescript-native-bridge@6.0.3-bridge.16.tsgo.7.0.2",
     "vite": "8.2.2",
     "vue-tsc": "3.3.10"
   },

package/src/agent.test.ts

@@ -8,9 +8,12 @@ import {
   type ToolExecutionContext,
   type TurnTypeV1,
 } from "@frockbot/kernel-contracts";
+import { SystemPromptRegistry } from "@frockbot/plugin-prompt";
 import { ToolRegistry } from "@frockbot/plugin-tools";
 import { Context } from "cordis";
 import {
+  CONVERSATION_PROMPT_SECTION_V1,
+  CONVERSATION_PROMPT_TEXT_V1,
   shellAdmissionCeilingV1,
   shellAgentPlugin,
   PARENT_HANDOFF_CAPABILITY_V1,
@@ -31,6 +34,7 @@ interface Mounted {
 async function mount(): Promise<Mounted> {
   const root = new Context();
   await root.plugin(SessionStore);
+  await root.plugin(SystemPromptRegistry);
   await root.plugin(ToolRegistry);
   const session = root.sessions.create(SESSION_ID);
   session.appendBatch([
@@ -382,3 +386,65 @@ describe("wake_parent", () => {
     }
   });
 });
+
+// The conversational contract is a prompt section and a tool description, and
+// the two have to say the same thing: a model that read one and not the other
+// would have half the rule.
+describe("the conversation prompt section", () => {
+  test("is assembled into the system prompt the model reads", async () => {
+    const mounted = await mount();
+    try {
+      const assembled = await mounted.root.systemPrompt.assemble({
+        sessionId: SESSION_ID,
+        provider: "test",
+        model: "test-model",
+        turnType: "chat",
+      });
+
+      const section = assembled.sections.find(
+        (candidate) => candidate.id === CONVERSATION_PROMPT_SECTION_V1,
+      );
+      expect(section?.text).toBe(CONVERSATION_PROMPT_TEXT_V1);
+      expect(assembled.text).toContain(CONVERSATION_PROMPT_TEXT_V1);
+    } finally {
+      await mounted.dispose();
+    }
+  });
+
+  test("says acknowledge first, then beats, and never the steps between", () => {
+    expect(CONVERSATION_PROMPT_TEXT_V1).toContain("On it.");
+    expect(CONVERSATION_PROMPT_TEXT_V1).toContain(
+      "send only on a real beat: the result, a decision only the user can make, or a blocker",
+    );
+    expect(CONVERSATION_PROMPT_TEXT_V1).toContain(
+      "Never narrate what you are doing",
+    );
+    expect(CONVERSATION_PROMPT_TEXT_V1).toContain(
+      "Never leave a question or a request hanging",
+    );
+    // Short enough to be read as guidance rather than skimmed as a document.
+    expect(CONVERSATION_PROMPT_TEXT_V1.split("\n").length).toBeLessThanOrEqual(
+      12,
+    );
+  });
+
+  test("matches what the send tool's own description tells the model", async () => {
+    const mounted = await mount();
+    try {
+      const schema = mounted.root.tools
+        .schemas({ turnType: "chat" })
+        .find((tool) => tool.name === SEND_TO_USER_TOOL_V1);
+      const description = schema?.description ?? "";
+
+      expect(description).toContain("only way to say anything the user sees");
+      // When to call it, not only what it does.
+      expect(description).toContain("Call it once, immediately");
+      expect(description).toContain("Call it again only on a real");
+      expect(description).toContain("narrate a step or a tool");
+      expect(description).toContain("never end your Turn leaving the");
+      expect(description).toContain("keep it short");
+    } finally {
+      await mounted.dispose();
+    }
+  });
+});

package/src/agent.ts

@@ -3,6 +3,10 @@
 //
 // Two tools, and no authority of its own:
 //
+//  0. One prompt section, `conversation`: when to speak and when not to. It
+//     is contributed beside the tool so the section and the tool description
+//     cannot drift into telling the model two different things.
+//
 //  1. `send_to_user` (legacy alias `send_message`) — parity register row 57b.
 //     One tool carrying the typed payload union, admitted on chat turns only,
 //     recording each send as `send/to-user` on the durable log. Row 57c: a
@@ -35,7 +39,15 @@ import {
 } from "@frockbot/kernel-contracts";
 // Merges the Agent loop's event declarations into the cordis Context type.
 import type {} from "@frockbot/kernel-agent-loop/agent";
-import { automationParentPointerV1, turnScopedMessagesV1 } from "./history.js";
+import {
+  automationParentPointerV1,
+  chatWindowV1,
+  CHAT_HISTORY_BUDGET_CHARS_V1,
+  turnScopedMessagesV1,
+  turnTypesByTurnV1,
+} from "./history.js";
+import { runCompactionV1 } from "./compaction.js";
+import { compactionWorkV1 } from "./compaction-scheduler.js";
 import type { Plugin } from "cordis";
 import manifest from "../frockbot.json" with { type: "json" };
 
@@ -81,6 +93,11 @@ function refusal(reason: string): ToolExecutionResult {
   return { content: reason, isError: true };
 }
 
+/** Adapts a cordis fiber to the plain disposer this Package's list holds. */
+function disposeFiber(fiber: { dispose(): unknown }): () => void {
+  return () => void fiber.dispose();
+}
+
 /**
  * The open step a Shell event belongs to. The session log is the
  * reconstruction surface, so a send without its turn and step would not
@@ -127,8 +144,38 @@ function sendAcknowledgement(payload: SendToUserPayloadV1): string {
   }
 }
 
+/**
+ * The Bot's conversational contract, in the words the model reads.
+ *
+ * It lives here rather than in a prompt Package because it is the same rule
+ * the send tool's own description states: one place to write it, so the
+ * section and the tool cannot drift into telling the model two things. The
+ * Shell already owns the voice; it owns how the voice is used.
+ */
+export const CONVERSATION_PROMPT_SECTION_V1 = "conversation";
+/** Ordered after identity (0), before anything a Package contributes. */
+export const CONVERSATION_PROMPT_ORDER_V1 = 1;
+
+export const CONVERSATION_PROMPT_TEXT_V1 = [
+  "## Talking to the user",
+  "",
+  "Everything the user sees is a `send_to_user` call; nothing else reaches them.",
+  'When a request will take more than a moment, send one short line first — "On it." or "Looking into that." — then go quiet and work.',
+  "After that, send only on a real beat: the result, a decision only the user can make, or a blocker you cannot get past.",
+  "Never narrate what you are doing, what you are about to do, or which tool you are using.",
+  "Never leave a question or a request hanging: before you stop, the user must have the answer, the result, or the reason there isn't one.",
+  "When the work is finished, send the result itself, not an account of how you got it.",
+  "Keep every message short — a line or two, no preamble and no sign-off.",
+  "Don't say the same thing twice.",
+].join("\n");
+
 const SEND_TO_USER_DESCRIPTION = [
   "Speak to the user. This is the only way to say anything the user sees.",
+  "Call it once, immediately, with one short line when the request will take",
+  "more than a moment, then work in silence. Call it again only on a real",
+  "beat: the result, a decision only the user can make, or a blocker. Do not",
+  "call it to narrate a step or a tool, and never end your Turn leaving the",
+  "user's question unanswered. Each call is one message; keep it short.",
   "The payload is one of:",
   '{"type":"text","text":"…"}',
   '{"type":"attachment","url":"https://…","name":"…","mediaType":"…"}',
@@ -295,6 +342,13 @@ export const shellAgentPlugin: Plugin.Function = (ctx) => {
   const userVoice = shellAdmissionCeilingV1(USER_VOICE_CAPABILITY_V1);
   const parentHandoff = shellAdmissionCeilingV1(PARENT_HANDOFF_CAPABILITY_V1);
   const disposers = [
+    // The voice and the rules for using it are contributed together, so a
+    // Composition that admits the send tool always carries the contract.
+    ctx.systemPrompt.register({
+      id: CONVERSATION_PROMPT_SECTION_V1,
+      order: CONVERSATION_PROMPT_ORDER_V1,
+      render: () => CONVERSATION_PROMPT_TEXT_V1,
+    }),
     ctx.tools.register(
       createSendToUserTool(SEND_TO_USER_TOOL_V1, ctx.sessions),
       userVoice ? { admissionCeiling: userVoice } : undefined,
@@ -307,6 +361,57 @@ export const shellAgentPlugin: Plugin.Function = (ctx) => {
       createWakeParentTool(ctx.sessions),
       parentHandoff ? { admissionCeiling: parentHandoff } : undefined,
     ),
+    // ADR 0030. `ctx.inject` rather than a declared dependency: a host that
+    // mounts the Shell without a model still gets its tools and its transcript
+    // seam, and simply never compacts. The hook is evaluated after `turn/end`
+    // is on the log and flushed — but `agent/turn-stopping` is a hook the loop
+    // *awaits* inside its `finally`, so running the summariser here is exactly
+    // the latency ADR 0030 says a compaction never costs. It is handed to the
+    // detached scheduler instead and this returns at once: the Turn ends, the
+    // run settles, the response goes out, and the summariser carries on behind
+    // it. Nothing here may throw, and nothing here may wait.
+    disposeFiber(
+      ctx.inject(["llm"], (scoped) => {
+        scoped.on("agent/turn-stopping", async (agent, turn) => {
+          const session = agent.session;
+          const types = turnTypesByTurnV1(session.events);
+          if ((types.get(turn) ?? "chat") !== "chat") return;
+          compactionWorkV1(session.id).start(async (signal) => {
+            if (signal.aborted) return;
+            await runCompactionV1({
+              session,
+              window: chatWindowV1(session.events, session.deriveMessages()),
+              budget: CHAT_HISTORY_BUDGET_CHARS_V1,
+              currentTurn: turn,
+              newEffectId: () => `compaction-${crypto.randomUUID()}`,
+              summarise: async (request) => {
+                let text = "";
+                // Two deadlines, one call: the compaction's own, and the abort
+                // a newly admitted Turn raises when it takes the log back.
+                const cancelled = AbortSignal.any([request.signal, signal]);
+                for await (const event of scoped.llm.stream(
+                  {
+                    requestId: `compaction-${crypto.randomUUID()}`,
+                    provider: request.provider,
+                    model: request.model,
+                    system: request.system,
+                    messages: request.messages,
+                    tools: [],
+                    ...(request.modelBinding
+                      ? { modelBinding: request.modelBinding }
+                      : {}),
+                  },
+                  cancelled,
+                )) {
+                  if (event.type === "text-delta") text += event.text;
+                }
+                return text;
+              },
+            });
+          });
+        });
+      }),
+    ),
     // Applied after the rest of the chain, so this Package has the last word on
     // what history a request carries — the one rule the visible transcript
     // rests on.
@@ -327,6 +432,6 @@ export const shellAgentPlugin: Plugin.Function = (ctx) => {
     for (const dispose of disposers.toReversed()) dispose();
   };
 };
-shellAgentPlugin.inject = ["tools", "sessions"];
+shellAgentPlugin.inject = ["tools", "sessions", "systemPrompt"];
 
 export default shellAgentPlugin;

package/src/backend-configuration.test.ts

@@ -8,6 +8,7 @@ import type {
 import type { PackageSettingDefinition } from "@frockbot/kernel-composition";
 import { createShellBotBackendContribution } from "./backend.js";
 import { createIsolateCapabilityHost } from "./backend-isolate.js";
+import { notificationIdV1 } from "./notification-id.js";
 
 class MemoryStorage {
   readonly values = new Map<string, unknown>();
@@ -149,7 +150,7 @@ function configuredUser(): UserSettingsViewV1 {
         connectionId: "flock-ai-ambient",
         packageId: "provider-flock-ai",
         connectionTypeId: "flock-ai-account",
-        displayName: "Flock AI",
+        displayName: "Frock AI",
         state: "ready",
         providerType: "flock-ai",
         generation: "foundation-generation-1",
@@ -159,7 +160,7 @@ function configuredUser(): UserSettingsViewV1 {
           state: "fresh",
           models: [
             {
-              providerModelId: "@flock/auto",
+              providerModelId: "@frock/auto",
               displayName: "Platform",
               capabilities: {
                 tools: true,
@@ -173,7 +174,7 @@ function configuredUser(): UserSettingsViewV1 {
         safeMetadata: {},
       },
     ],
-    platformModel: model("flock-ai-ambient", "@flock/auto"),
+    platformModel: model("flock-ai-ambient", "@frock/auto"),
   };
 }
 
@@ -193,7 +194,7 @@ function host(storage: MemoryStorage, readUser: () => UserSettingsViewV1) {
       },
       MEMORY_FILES: {},
       MEMORY_INDEX: {},
-      FLOCK_AI: {
+      FROCK_AI: {
         autoRoute: "flock-auto",
         runChatCompletion: () =>
           Promise.resolve(
@@ -526,7 +527,7 @@ describe("generic per-Turn model resolution", () => {
       connectionId: "flock-ai-ambient",
       packageId: "provider-flock-ai",
       provider: "flock-ai",
-      providerModelId: "@flock/auto",
+      providerModelId: "@frock/auto",
       connectionGeneration: "foundation-generation-1",
       catalogGeneration: "catalog-1",
     });
@@ -601,9 +602,14 @@ describe("generic per-Turn model resolution", () => {
     await expect(contribution.listNotifications()).resolves.toEqual([
       expect.objectContaining({
         // Colons would fail the acknowledge decoder, so the mint replaces
-        // them; a notification nobody can acknowledge 400s forever.
-        notificationId:
-          "package-connection-unavailable-run-1-bot-authored-flock-ai-ambient",
+        // them and folds in a digest of the raw parts; a notification nobody
+        // can acknowledge 400s forever.
+        notificationId: notificationIdV1(
+          "package-connection-unavailable",
+          "run-1",
+          "bot-authored",
+          "flock-ai-ambient",
+        ),
         title: "Connection unavailable",
       }),
     ]);
@@ -645,7 +651,7 @@ describe("generic per-Turn model resolution", () => {
       ),
     };
     expect(await contribution.resolveConfiguration(identity)).toMatchObject({
-      model: model("flock-ai-ambient", "@flock/auto"),
+      model: model("flock-ai-ambient", "@frock/auto"),
     });
     expect(await contribution.getSettings(identity)).toMatchObject({
       packageValues: {

package/src/backend-package-catalog.ts

@@ -520,12 +520,9 @@ export function createPackageCatalogHost(
           index,
           catalogId: provenance.catalogId,
         });
-        // A first-party member pins no bundle, so "the entry still offers
-        // what the target generation recorded" is the two hashes agreeing,
-        // both present or both absent.
         if (
-          !targetEntry ||
-          targetEntry.bundle?.contentHash !== provenance.contentHash
+          !targetEntry?.bundle ||
+          targetEntry.bundle.contentHash !== provenance.contentHash
         ) {
           return undoRefused(
             request,
@@ -541,9 +538,7 @@ export function createPackageCatalogHost(
           version: targetCatalogMember.version,
           catalogId: provenance.catalogId,
           catalogGeneration: provenance.catalogGeneration,
-          ...(provenance.contentHash === undefined
-            ? {}
-            : { contentHash: provenance.contentHash }),
+          contentHash: provenance.contentHash,
         };
       }
       const receipt = await options.user.execute(command);
@@ -596,6 +591,13 @@ export function createPackageCatalogHost(
       let user: UserSettingsViewV1;
       let base: CompositionGenerationV1;
       let intent: PackageCatalogChangeIntentV1;
+      /**
+       * The entry names a compiled-in Package that is already required core in
+       * this Bot's Composition, so installing it is a User settings change and
+       * nothing else. Set on the install path and re-derived on a resumed
+       * intent, which carries no bundle hash precisely when this is true.
+       */
+      let firstParty = false;
       try {
         user = await options.user.read();
         base = await options.composition.lastKnownGood();
@@ -616,6 +618,12 @@ export function createPackageCatalogHost(
             );
           entry = resumed;
           intent = existingIntent;
+          firstParty =
+            existingIntent.action !== "remove" &&
+            !resumed.bundle &&
+            base.members.find(
+              (candidate) => candidate.packageId === resumed.packageId,
+            )?.provenance.kind === "first-party";
         } else if (action === "remove") {
           const packageId = request.change.input.packageId;
           const member = base.members.find(
@@ -697,7 +705,27 @@ export function createPackageCatalogHost(
           const member = base.members.find(
             (candidate) => candidate.packageId === entry.packageId,
           );
-          if (action === "install" && member) {
+          // Installing a first-party entry changes the *User's* settings, not
+          // the Composition: the compiled-in Package is already required core
+          // in the bootstrap generation (every one of them is), and
+          // `assertRequiredCoreSet` refuses any proposal that restates a
+          // first-party member with catalog provenance. So "already a member"
+          // is the normal state here, not a conflict — the guard below is
+          // about a *bundle-backed* entry, whose code really would be added
+          // twice.
+          firstParty =
+            !entry.bundle && member?.provenance.kind === "first-party";
+          if (firstParty) {
+            // The one integrity check left for a member nothing re-hashes at
+            // mount: the entry must name the manifest the application actually
+            // compiled in, or the Catalog has drifted from this deployment.
+            if (member!.manifestHash !== entry.manifestHash) {
+              throw new Error(
+                `Catalog entry "${entry.catalogId}" names manifest "${entry.manifestHash}", but this deployment ships "${member!.manifestHash}"`,
+              );
+            }
+          }
+          if (action === "install" && member && !firstParty) {
             throw new Error(
               `Package "${entry.packageId}" is already in this Bot's Composition`,
             );
@@ -757,9 +785,12 @@ export function createPackageCatalogHost(
         const bundle = entry.bundle;
         await options.storage.put({
           [packageCatalogChangeIntentKey(request.effectId)]: intent,
-          // A bundle-less entry has no manifest document to store; the mount
-          // resolves it from the compiled-in application instead, still
-          // against the `manifestHash` the generation records.
+          // A bundle-less entry stores no manifest document, because it adds
+          // no Composition member to mount one for: the compiled-in Package is
+          // already required core, running the manifest this deployment
+          // shipped. The entry's `manifestHash` was checked against that
+          // member's above, so a Catalog that has drifted from this deployment
+          // is refused rather than silently recorded.
           ...(bundle
             ? {
                 [authorshipManifestKey(intent.manifestHash)]: {
@@ -805,11 +836,35 @@ export function createPackageCatalogHost(
 
       const parent =
         (await options.composition.read(intent.baseGenerationId)) ?? base;
+      // A first-party entry contributes no member: it is already required core
+      // in the bootstrap generation, and restating it with catalog provenance
+      // is exactly what `assertRequiredCoreSet` refuses. The install is the
+      // User settings command above, which is all the Plugins page does too,
+      // so the Composition is left on the generation it was already running.
+      if (firstParty) {
+        const outcome: PackageCatalogChangeOutcomeRecordV1 = {
+          schemaVersion: 1,
+          status: "recorded",
+          effectId: request.effectId,
+          action,
+          packageId: intent.packageId,
+          displayName: intent.displayName,
+          version: intent.version,
+          generationId: parent.generationId,
+          missingConnectionTypes: intent.missingConnectionTypes,
+          recordedAt: intent.recordedAt,
+        };
+        await options.storage.put({
+          [packageCatalogChangeOutcomeKey(request.effectId)]: outcome,
+        });
+        return recordedOutcome(outcome);
+      }
+
       const members = parent.members.filter(
         (member) => member.packageId !== intent.packageId,
       );
       if (action !== "remove") {
-        const bundle = entry.bundle;
+        const bundle = entry.bundle!;
         const member: CompositionMemberV1 = {
           packageId: entry.packageId,
           specifier: `catalog:${entry.catalogId}`,
@@ -821,20 +876,14 @@ export function createPackageCatalogHost(
             version: entry.version,
             catalogId: entry.catalogId,
             catalogGeneration: intent.catalogGeneration,
-            ...(bundle ? { contentHash: bundle.contentHash } : {}),
+            contentHash: bundle.contentHash,
+          },
+          artifact: {
+            contentHash: bundle.contentHash,
+            size: bundle.size,
+            mediaType: bundle.mediaType,
+            bundlerVersion: bundle.bundlerVersion,
           },
-          // No artifact ⇒ the member mounts in the kernel isolate from the
-          // compiled-in Package, exactly as the UI install records it.
-          ...(bundle
-            ? {
-                artifact: {
-                  contentHash: bundle.contentHash,
-                  size: bundle.size,
-                  mediaType: bundle.mediaType,
-                  bundlerVersion: bundle.bundlerVersion,
-                },
-              }
-            : {}),
         };
         members.push(member);
       }

package/src/backend-runner.ts

@@ -17,6 +17,10 @@ import {
   BotTurnRecoveryRequiredError,
 } from "@frockbot/kernel-do";
 import type { BotTurnCommand, BotTurnCompletion } from "./backend-contracts.js";
+import {
+  compactionInFlightV1,
+  whenCompactionSettledV1,
+} from "./compaction-scheduler.js";
 
 export {
   BotTurnExecutionError,
@@ -370,11 +374,24 @@ export async function executeBotTurn(
     await runtime.agent.agent.whenIdle();
     return settleBotTurn(runtime.agent, command, previousEvents);
   } catch (error) {
-    turnExecutionError(error, previousEvents, [
+    return turnExecutionError(error, previousEvents, [
       ...runtime.agent.agent.session.events,
     ]);
   } finally {
-    await composition.dispose();
+    // ADR 0030: a compaction outlives the Turn that triggered it, and it runs
+    // on this Composition's model binding — so the Composition outlives the
+    // Turn too, and only by as long as the compaction does. Awaiting the
+    // disposal here would put the summariser back in the latency path, which
+    // is the whole defect. The next admission aborts anything still running,
+    // so this can never stack up.
+    if (compactionInFlightV1(command.sessionId)) {
+      void whenCompactionSettledV1(command.sessionId).then(
+        () => composition.dispose(),
+        () => composition.dispose(),
+      );
+    } else {
+      await composition.dispose();
+    }
   }
 }