@frockbot/plugin-skills 0.3.9 → 0.3.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-skills",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "private": false,
   "type": "module",
   "exports": {
@@ -25,8 +25,8 @@
     "typecheck": "tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@frockbot/kernel-agent-loop": "0.3.9",
-    "@frockbot/kernel-contracts": "0.3.9",
+    "@frockbot/kernel-agent-loop": "0.3.11",
+    "@frockbot/kernel-contracts": "0.3.11",
     "cordis": "4.0.0-rc.8"
   },
   "devDependencies": {

package/src/agent.test.ts

@@ -131,6 +131,45 @@ describe("the skill_load tool", () => {
     expect(refused.content).not.toContain("Forbidden body.");
     await dispose();
   });
+
+  test("accepts the ref field the prompt used to ask for", async () => {
+    // The prompt said "call skill_load with a ref"; the schema named the field
+    // `path`. `{"ref": ...}` failed `validate` and came back as the loop's
+    // generic `Invalid input for tool: skill_load`, naming nothing.
+    const workspace = await FakeWorkspace.seeded([
+      {
+        root: OWN_ROOT,
+        path: "skills/kept/SKILL.md",
+        text: skillMarkdown("kept", "Use this when keeping.", "Recipe body."),
+        writer: BOT_WRITER,
+      },
+    ]);
+    const { session, dispose } = await openSession();
+    const catalog = new SkillCatalog(OWNER, workspace);
+    await catalog.refresh(4, session);
+    const tool = createSkillLoadTool(catalog);
+
+    const loaded = await tool.execute({ ref: "skills/kept/SKILL.md" }, CONTEXT);
+    expect(loaded.isError).toBe(false);
+    expect(loaded.content).toContain("Recipe body.");
+    await dispose();
+  });
+
+  test("says what a wrong input should have been, instead of refusing blankly", async () => {
+    const { session, dispose } = await openSession();
+    const catalog = new SkillCatalog(OWNER, new FakeWorkspace());
+    await catalog.refresh(4, session);
+    const tool = createSkillLoadTool(catalog);
+
+    // A shape the model can produce reaches `execute` and is explained there;
+    // `validate` no longer swallows it into a nameless refusal.
+    expect(tool.validate?.({ ref: "managed/applets" })).toBe(true);
+    const refused = await tool.execute({ skill: "managed/applets" }, CONTEXT);
+    expect(refused.isError).toBe(true);
+    expect(refused.content).toContain('"path"');
+    expect(refused.content).toContain('{"path":"managed/add-connector"}');
+    await dispose();
+  });
 });
 
 describe("the skill_write tool", () => {

package/src/agent.ts

@@ -273,7 +273,7 @@ const SKILL_LOAD_INPUT_SCHEMA = {
     path: {
       type: "string",
       description:
-        "The Skill's ref exactly as listed in <agent_skills> — bot/daily-standup, managed/add-connector, or plugin/<packageId>/<slug>. The path listed beside it is also accepted.",
+        'The Skill\'s ref exactly as listed in <agent_skills> — bot/daily-standup, managed/add-connector, or plugin/<packageId>/<slug>. The path listed beside it is also accepted. This field is named "path" whichever of the two you send.',
     },
   },
   required: ["path"],
@@ -424,6 +424,28 @@ function decodeSkillWriteInputV1(input: unknown): SkillWriteInputV1 {
   return decoded;
 }
 
+/**
+ * What `skill_load` was actually asked for, from either field name.
+ *
+ * The prompt said "call `skill_load` with a ref" while the schema named the
+ * field `path`, so the model reached for `ref` and got the loop's generic
+ * `Invalid input for tool: skill_load` — no field named, no shape offered. The
+ * prompt now names `path`, and `ref` is accepted as an alias so the older
+ * phrasing (and the model's own instinct) still lands.
+ */
+export function skillLoadNameV1(input: unknown): string | undefined {
+  if (!input || typeof input !== "object") return undefined;
+  const record = input as { path?: unknown; ref?: unknown };
+  const named = typeof record.path === "string" ? record.path : record.ref;
+  if (typeof named !== "string") return undefined;
+  const trimmed = named.trim();
+  return trimmed.length === 0 ? undefined : trimmed;
+}
+
+/** Why a `skill_load` input could not be used, and what to send instead. */
+export const SKILL_LOAD_INPUT_REFUSAL =
+  'skill_load input is invalid: "path" must be a non-empty string naming a Skill from <agent_skills> — its ref (bot/daily-standup, managed/add-connector, plugin/<packageId>/<slug>) or the path listed beside it. Expected {"path":"managed/add-connector"}.';
+
 export function createSkillLoadTool(catalog: SkillCatalog): ToolDefinition {
   return {
     name: "skill_load",
@@ -432,15 +454,22 @@ export function createSkillLoadTool(catalog: SkillCatalog): ToolDefinition {
     // video roles. See `@frockbot/plugin-subagents` `SUBAGENT_TOOL_REACH_V1`.
     admission: { subagentRoles: ["executor"] },
     description:
-      "Read one of your Skills in full. Pass the path listed in <agent_skills>. Only Skills listed there can be loaded.",
+      'Read one of your Skills in full. Pass the ref or the path listed in <agent_skills> as "path". Only Skills listed there can be loaded.',
     inputSchema: SKILL_LOAD_INPUT_SCHEMA as unknown as Record<string, unknown>,
     idempotent: true,
-    validate: (input: unknown) =>
-      !!input &&
-      typeof input === "object" &&
-      typeof (input as { path?: unknown }).path === "string",
+    // Deliberately permissive: a wrong shape reaches `execute`, which says
+    // what was wrong. A bare `false` here becomes the generic
+    // `Invalid input for tool: skill_load`, which cost a step every time the
+    // model reached for the field name the prompt used.
+    validate: (input: unknown) => !!input && typeof input === "object",
     execute: (input: unknown) => {
-      const named = String((input as { path: string }).path).trim();
+      const named = skillLoadNameV1(input);
+      if (named === undefined) {
+        return Promise.resolve({
+          content: SKILL_LOAD_INPUT_REFUSAL,
+          isError: true,
+        });
+      }
       const loaded = catalog.current().skills;
       // A ref first, then the path. Both are printed in `<agent_skills>`, and
       // a ref is the only form that names a managed or plugin Skill, since

package/src/catalog.ts

@@ -604,7 +604,7 @@ export function renderSkillCatalogPromptV1(catalog: SkillCatalogV1): string {
     ...entries,
     "</agent_skills>",
     "These are your Skills: recipes you wrote, or your User wrote, for you; the managed ones ship with FrockBot; the plugin ones came with a Package your User installed.",
-    "Only names, refs, paths and descriptions are listed above. Call skill_load with a ref to read a Skill's full instructions before you follow it.",
+    'Only names, refs, paths and descriptions are listed above. Call skill_load with the ref in its "path" field to read a Skill\'s full instructions before you follow it.',
     "Mentioning a Skill is not running it.",
   ].join("\n");
 }