@frockbot/plugin-shell 0.3.2 → 0.3.3

package/package.json

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

package/src/agent.test.ts

@@ -86,8 +86,16 @@ describe("the Shell's tool admission", () => {
       expect(chat).toContain(SEND_TO_USER_TOOL_V1);
       expect(chat).toContain(SEND_MESSAGE_ALIAS_V1);
       expect(chat).not.toContain(WAKE_PARENT_TOOL_V1);
-      expect(automation).toEqual([WAKE_PARENT_TOOL_V1]);
-      expect(subagent).toEqual([WAKE_PARENT_TOOL_V1]);
+      expect(automation).toEqual([
+        WAKE_PARENT_TOOL_V1,
+        "get_dynamic_tools",
+        "call_dynamic_tool",
+      ]);
+      expect(subagent).toEqual([
+        WAKE_PARENT_TOOL_V1,
+        "get_dynamic_tools",
+        "call_dynamic_tool",
+      ]);
     } finally {
       await mounted.dispose();
     }
@@ -111,7 +119,11 @@ describe("the Shell's tool admission", () => {
         // thing any subagent role is offered here.
         expect(names).not.toContain(SEND_TO_USER_TOOL_V1);
         expect(names).not.toContain(SEND_MESSAGE_ALIAS_V1);
-        expect(names).toEqual([WAKE_PARENT_TOOL_V1]);
+        expect(names).toEqual([
+          WAKE_PARENT_TOOL_V1,
+          "get_dynamic_tools",
+          "call_dynamic_tool",
+        ]);
       }
     } finally {
       await mounted.dispose();

package/src/backend-authoring.ts

@@ -278,12 +278,25 @@ export function createPackageAuthoringHost(
    * Re-authoring may keep or rename tools owned by that same Package, so its
    * currently stored declarations are subtracted from the mounted catalog;
    * every first-party tool and every other authored Package remains reserved.
+   *
+   * The comparison is on bare names. Since ADR 0023 the mounted catalog
+   * reports a progressively disclosed tool as `namespace/name`, while a Package
+   * declares bare names, so comparing the two directly matches nothing and the
+   * guard silently stops refusing anything. Stripping the namespace keeps the
+   * rule this guard has always enforced — a Bot-authored tool name may not
+   * shadow one already registered — rather than quietly relaxing it as a side
+   * effect of a disclosure change.
    */
   async function collidingToolName(
     packageId: string,
     declaredNames: readonly string[],
   ): Promise<string | undefined> {
-    const registered = new Set(options.currentToolNames?.() ?? []);
+    const registered = new Set(
+      (options.currentToolNames?.() ?? []).map((name) => {
+        const separator = name.indexOf("/");
+        return separator < 0 ? name : name.slice(separator + 1);
+      }),
+    );
     const mounted =
       options.mountedGeneration?.() ??
       (await options.composition.lastKnownGood());

package/src/backend-completion.ts

@@ -23,7 +23,7 @@ export function completeStoredRun(
   previous: readonly SessionEvent[],
   result: BotTurnCompletion,
   packageRecords?: TerminalPackageRecords<BotSettingsViewV1>,
-): Promise<"completed" | "cancelled"> {
+): Promise<"completed" | "cancelled" | "superseded"> {
   return completeKernelStoredRun(
     storedRunCodecV1,
     storage,
@@ -42,7 +42,9 @@ export function failStoredRun(
   previous: readonly SessionEvent[],
   events: readonly SessionEvent[],
   failure: string,
-): Promise<"failed" | "cancelled" | "preserved-completion" | "missing"> {
+): Promise<
+  "failed" | "cancelled" | "superseded" | "preserved-completion" | "missing"
+> {
   return failKernelStoredRun(
     storedRunCodecV1,
     storage,

package/src/backend-recovery.ts

@@ -22,24 +22,32 @@ export {
   type ModelRequestJournalState,
 } from "@frockbot/kernel-do";
 
-/** How a stopped run's unresolved effects settle. */
-export type StoppedRunRecoveryPlan =
+/** How an interrupted run's unresolved effects settle. */
+export type InterruptedRunRecoveryPlanV1 =
   { kind: "cancel"; events: SessionEvent[] } | { kind: "reconcile" };
 
 /**
- * Classifies the unresolved effects of a stopped run from their durable
- * admission records. With no compatibility data, a missing admission is the
- * same definitive no-start outcome as `fenced`; only explicit `admitted`
- * remains uncertain.
+ * Classifies the unresolved effects of a run that has been fenced — by a
+ * durable Stop, or by a later user message that superseded it — from their
+ * durable admission records. With no compatibility data, a missing admission
+ * is the same definitive no-start outcome as `fenced`; only explicit
+ * `admitted` remains uncertain.
+ *
+ * The two intents share this function because they share the whole question:
+ * an effect that may already have run is never assumed not to have, whichever
+ * intent stopped the Turn.
  */
-export function planStoppedRunRecovery(
+export function planInterruptedRunRecoveryV1(
   run: StoredRun,
   latest: readonly SessionEvent[],
-): StoppedRunRecoveryPlan {
+): InterruptedRunRecoveryPlanV1 {
   requireStoredRunV1(run);
-  if (!run.stopRequestedAt) {
-    throw new Error(`run "${run.runId}" has no durable stop intent`);
+  if (!run.stopRequestedAt && !run.supersededAt) {
+    throw new Error(
+      `run "${run.runId}" has no durable stop or supersede intent`,
+    );
   }
+  const fenceReason = run.stopRequestedAt ? "Durable Stop" : "A supersede";
   const admissionFor = (kind: "model" | "tool", effectId: string) => {
     const admission = run.effectAdmissions.find(
       (candidate) => candidate.effectId === effectId,
@@ -75,7 +83,7 @@ export function planStoppedRunRecovery(
       turn: model.request.turn,
       step: model.request.step,
       requestId: model.request.request.requestId,
-      reason: "Durable Stop fenced provider execution before admission",
+      reason: `${fenceReason} fenced provider execution before admission`,
     });
   }
   for (const entry of openTools) {
@@ -86,7 +94,7 @@ export function planStoppedRunRecovery(
       step: intent.step,
       occurrenceId: intent.occurrenceId,
       name: intent.name,
-      content: "Durable Stop fenced tool execution before admission.",
+      content: `${fenceReason} fenced tool execution before admission.`,
       isError: true,
       status: "interrupted",
     });

package/src/backend-runner-iframe.test.ts

@@ -12,8 +12,14 @@ describe("Package iframe direct tool Turn", () => {
     await root.plugin(ToolRegistry);
     const session = root.sessions.create("user:bot");
     let calls = 0;
+    root.tools.registerNamespace({
+      name: "weather-page",
+      external: true,
+      status: "ready",
+    });
     root.tools.register({
       name: "weather_lookup",
+      namespace: "weather-page",
       description: "Weather",
       inputSchema: {},
       idempotent: true,
@@ -69,6 +75,9 @@ describe("Package iframe direct tool Turn", () => {
     );
     expect(
       result.events.find((event) => event.type === "tool/result"),
-    ).toMatchObject({ name: "weather_lookup", content: '{"temperature":21}' });
+    ).toMatchObject({
+      name: "call_dynamic_tool",
+      content: '{"temperature":21}',
+    });
   });
 });

package/src/backend-runner.ts

@@ -177,8 +177,15 @@ export async function executeDirectToolTurn(
   const session = composition.runtime.agent.agent.session;
   const call = {
     id: command.runId,
-    name: command.directTool.name,
-    input: command.directTool.input,
+    name: "call_dynamic_tool",
+    input: {
+      namespace: command.directTool.packageId,
+      toolName: command.directTool.name,
+      arguments: command.directTool.input,
+      mcpDetails: {
+        description: `The User invoked ${command.directTool.name} from the Package UI.`,
+      },
+    },
   };
   try {
     let turnStart = [...session.events].findLast(

package/src/backend-stop.test.ts

@@ -12,7 +12,7 @@ import {
   botTurnCommandFingerprintV1,
   type StoredRun,
 } from "./backend-contracts.js";
-import { planStoppedRunRecovery } from "./backend-recovery.js";
+import { planInterruptedRunRecoveryV1 } from "./backend-recovery.js";
 
 class MemoryStorage {
   readonly values = new Map<string, unknown>();
@@ -298,7 +298,7 @@ describe("stopped run recovery", () => {
       ],
     });
 
-    const plan = planStoppedRunRecovery(run, run.events);
+    const plan = planInterruptedRunRecoveryV1(run, run.events);
 
     expect(plan.kind).toBe("cancel");
     if (plan.kind !== "cancel") throw new Error("expected cancellation");
@@ -323,7 +323,7 @@ describe("stopped run recovery", () => {
       ],
     });
 
-    const plan = planStoppedRunRecovery(run, run.events);
+    const plan = planInterruptedRunRecoveryV1(run, run.events);
 
     expect(plan.kind).toBe("cancel");
     if (plan.kind !== "cancel") throw new Error("expected cancellation");
@@ -341,7 +341,7 @@ describe("stopped run recovery", () => {
       ],
     });
 
-    expect(planStoppedRunRecovery(run, run.events)).toEqual({
+    expect(planInterruptedRunRecoveryV1(run, run.events)).toEqual({
       kind: "reconcile",
     });
   });
@@ -349,8 +349,8 @@ describe("stopped run recovery", () => {
   test("refuses to plan recovery for a run carrying no durable Stop intent", () => {
     const run = storedRun({ events: modelIntentEvents() });
 
-    expect(() => planStoppedRunRecovery(run, run.events)).toThrow(
-      `run "${turn.runId}" has no durable stop intent`,
+    expect(() => planInterruptedRunRecoveryV1(run, run.events)).toThrow(
+      `run "${turn.runId}" has no durable stop or supersede intent`,
     );
   });
 });