chore: fix code review

Author: omeraplak

.changeset/olive-tomatoes-juggle.md

@@ -6,5 +6,5 @@ Enable workspace skills prompt injection by default when an agent has a workspac
 
 - Agents now auto-compose a workspace skills prompt hook by default.
 - Added `workspaceSkillsPrompt` to `AgentOptions` to customize (`WorkspaceSkillsPromptOptions`), force (`true`), or disable (`false`) prompt injection.
-- To avoid duplicate injections for existing setups, default auto-injection is skipped when a custom `hooks.onPrepareMessages` is already provided.
+- When a custom `hooks.onPrepareMessages` is provided, it now composes with the default workspace skills prompt hook unless `workspaceSkillsPrompt` is explicitly set to `false`.
 - Updated workspace skills docs and the `examples/with-workspace` sample to document and use the new behavior.

packages/core/src/agent/agent.spec.ts

@@ -215,7 +215,32 @@ Use pandas and summarize findings.`.split("\n"),
       expect(systemTexts.some((text) => text.includes("Data Analyst (/skills/data)"))).toBe(true);
     });
 
-    it("skips auto-injection when custom onPrepareMessages exists", async () => {
+    it("composes auto-injection with custom onPrepareMessages by default", async () => {
+      const workspace = createWorkspaceWithSkill();
+      const onPrepareMessages = vi.fn(({ messages }) => ({
+        messages: (messages || []).filter((message) => message.role !== "system"),
+      }));
+
+      const agent = new Agent({
+        name: "TestAgent",
+        instructions: "Use skills when relevant.",
+        model: mockModel as any,
+        workspace,
+        hooks: { onPrepareMessages },
+      });
+
+      vi.mocked(ai.generateText).mockResolvedValue(createMockGenerateTextResponse() as any);
+
+      await agent.generateText("Analyze my data");
+
+      const callArgs = vi.mocked(ai.generateText).mock.calls[0]?.[0];
+      const systemTexts = getSystemTexts(callArgs?.messages);
+
+      expect(onPrepareMessages).toHaveBeenCalledTimes(1);
+      expect(systemTexts.some((text) => text.includes("<workspace_skills>"))).toBe(true);
+    });
+
+    it("disables auto-injection when workspaceSkillsPrompt is false", async () => {
       const workspace = createWorkspaceWithSkill();
       const onPrepareMessages = vi.fn(({ messages }) => ({ messages }));
 
@@ -225,6 +250,7 @@ Use pandas and summarize findings.`.split("\n"),
         model: mockModel as any,
         workspace,
         hooks: { onPrepareMessages },
+        workspaceSkillsPrompt: false,
       });
 
       vi.mocked(ai.generateText).mockResolvedValue(createMockGenerateTextResponse() as any);
@@ -248,6 +274,7 @@ Use pandas and summarize findings.`.split("\n"),
         model: mockModel as any,
         workspace,
         hooks: { onPrepareMessages },
+        workspaceToolkits: { skills: false },
         workspaceSkillsPrompt: true,
       });
 

packages/core/src/agent/agent.ts

@@ -379,27 +379,26 @@ const resolveWorkspaceSkillsPromptHook = (
   workspace: Workspace | undefined,
   options: AgentOptions,
 ): AgentHooks["onPrepareMessages"] | undefined => {
+  const existingHook = options.hooks?.onPrepareMessages;
   if (!workspace?.skills) {
-    return undefined;
+    return existingHook;
   }
 
   const promptConfig = options.workspaceSkillsPrompt;
   if (promptConfig === false) {
-    return undefined;
+    return existingHook;
   }
 
   const hasExplicitPromptConfig = promptConfig !== undefined;
-  if (!hasExplicitPromptConfig && options.hooks?.onPrepareMessages) {
-    return undefined;
-  }
   if (!hasExplicitPromptConfig && !isWorkspaceSkillsToolkitEnabled(options.workspaceToolkits)) {
-    return undefined;
+    return existingHook;
   }
 
   const promptOptions =
     typeof promptConfig === "object" && promptConfig !== null ? promptConfig : {};
 
-  return workspace.createSkillsPromptHook(promptOptions).onPrepareMessages;
+  const skillsPromptHook = workspace.createSkillsPromptHook(promptOptions).onPrepareMessages;
+  return composePrepareMessagesHooks([existingHook, skillsPromptHook]);
 };
 
 const searchToolsParameters = z.object({
@@ -822,11 +821,7 @@ export class Agent {
     const globalWorkspace = AgentRegistry.getInstance().getGlobalWorkspace();
     const workspaceOption = options.workspace === undefined ? globalWorkspace : options.workspace;
     this.workspace = resolveWorkspace(workspaceOption);
-    const workspaceSkillsPromptHook = resolveWorkspaceSkillsPromptHook(this.workspace, options);
-    const onPrepareMessages = composePrepareMessagesHooks([
-      workspaceSkillsPromptHook,
-      options.hooks?.onPrepareMessages,
-    ]);
+    const onPrepareMessages = resolveWorkspaceSkillsPromptHook(this.workspace, options);
     this.hooks = onPrepareMessages
       ? { ...(options.hooks || {}), onPrepareMessages }
       : options.hooks || {};