diff --git a/packages/core/src/tool/plugin/skill.ts b/packages/core/src/tool/plugin/skill.ts index 122ec1f83a3..f2c59c5f786 100644 --- a/packages/core/src/tool/plugin/skill.ts +++ b/packages/core/src/tool/plugin/skill.ts @@ -14,9 +14,8 @@ export const Input = Schema.Struct({ }) export const Output = Schema.Struct({ - name: Skill.Name, directory: Schema.String, - output: Schema.String, + content: Schema.String, }) export const description = [ "Load a specialized skill's instructions and resources into the current conversation when the task at hand matches its description.", @@ -55,15 +54,14 @@ export const Plugin = { ...Permission.invocation(context), }) const files = yield* skills.files(skill.id) - return { name: skill.name, ...(yield* Skill.prepare(fs, skill, files)) } + const { directory, output: content } = yield* Skill.prepare(fs, skill, files) + return { + output: { directory, content }, + content, + metadata: { name: skill.name, directory }, + } }).pipe(Effect.mapError((error) => unableToLoad(input.id, error))) - }).pipe( - Effect.map((output) => ({ - output, - content: output.output, - metadata: { name: output.name, directory: output.directory }, - })), - ), + }), }), ) .pipe(Effect.orDie) diff --git a/packages/core/test/tool-skill.test.ts b/packages/core/test/tool-skill.test.ts index 80170474cd6..5d83674c61d 100644 --- a/packages/core/test/tool-skill.test.ts +++ b/packages/core/test/tool-skill.test.ts @@ -139,7 +139,7 @@ describe("SkillTool", () => { }), ).toEqual({ status: "completed", - output: { name: "Effect", directory, output: Skill.toModelOutput(info, [reference]) }, + output: { directory, content: Skill.toModelOutput(info, [reference]) }, content: [{ type: "text", text: Skill.toModelOutput(info, [reference]) }], metadata: { name: "Effect", directory }, })