Add skill tool to base2, update tools definitions

Author: jahooma

agents/base2/base2.ts

@@ -62,6 +62,7 @@ export function createBase2(
       'propose_str_replace',
       'propose_write_file',
       !noAskUser && 'ask_user',
+      'skill',
       'set_output',
     ),
     spawnableAgents: buildArray(

agents/types/tools.ts

@@ -19,6 +19,7 @@ export type ToolName =
   | 'run_terminal_command'
   | 'set_messages'
   | 'set_output'
+  | 'skill'
   | 'spawn_agents'
   | 'str_replace'
   | 'suggest_followups'
@@ -49,6 +50,7 @@ export interface ToolParamsMap {
   run_terminal_command: RunTerminalCommandParams
   set_messages: SetMessagesParams
   set_output: SetOutputParams
+  skill: SkillParams
   spawn_agents: SpawnAgentsParams
   str_replace: StrReplaceParams
   suggest_followups: SuggestFollowupsParams
@@ -246,6 +248,14 @@ export interface SetMessagesParams {
  */
 export interface SetOutputParams {}
 
+/**
+ * Load a skill's full instructions when relevant to the current task. Skills are loaded on-demand - only load them when you need their specific guidance.
+ */
+export interface SkillParams {
+  /** The name of the skill to load */
+  name: string
+}
+
 /**
  * Spawn multiple agents and send a prompt and/or parameters to each of them. These agents will run in parallel. Note that that means they will run independently. If you need to run agents sequentially, use spawn_agents with one agent at a time instead.
  */

common/src/templates/initial-agents-dir/types/tools.ts

@@ -10,13 +10,16 @@ export type ToolName =
   | 'glob'
   | 'list_directory'
   | 'lookup_agent_info'
+  | 'propose_str_replace'
+  | 'propose_write_file'
   | 'read_docs'
   | 'read_files'
   | 'read_subtree'
   | 'run_file_change_hooks'
   | 'run_terminal_command'
   | 'set_messages'
   | 'set_output'
+  | 'skill'
   | 'spawn_agents'
   | 'str_replace'
   | 'suggest_followups'
@@ -38,13 +41,16 @@ export interface ToolParamsMap {
   glob: GlobParams
   list_directory: ListDirectoryParams
   lookup_agent_info: LookupAgentInfoParams
+  propose_str_replace: ProposeStrReplaceParams
+  propose_write_file: ProposeWriteFileParams
   read_docs: ReadDocsParams
   read_files: ReadFilesParams
   read_subtree: ReadSubtreeParams
   run_file_change_hooks: RunFileChangeHooksParams
   run_terminal_command: RunTerminalCommandParams
   set_messages: SetMessagesParams
   set_output: SetOutputParams
+  skill: SkillParams
   spawn_agents: SpawnAgentsParams
   str_replace: StrReplaceParams
   suggest_followups: SuggestFollowupsParams
@@ -149,6 +155,35 @@ export interface LookupAgentInfoParams {
   agentId: string
 }
 
+/**
+ * Propose string replacements in a file without actually applying them.
+ */
+export interface ProposeStrReplaceParams {
+  /** The path to the file to edit. */
+  path: string
+  /** Array of replacements to make. */
+  replacements: {
+    /** The string to replace. This must be an *exact match* of the string you want to replace, including whitespace and punctuation. */
+    old: string
+    /** The string to replace the corresponding old string with. Can be empty to delete. */
+    new: string
+    /** Whether to allow multiple replacements of old string. */
+    allowMultiple?: boolean
+  }[]
+}
+
+/**
+ * Propose creating or editing a file without actually applying the changes.
+ */
+export interface ProposeWriteFileParams {
+  /** Path to the file relative to the **project root** */
+  path: string
+  /** What the change is intended to do in only one sentence. */
+  instructions: string
+  /** Edit snippet to apply to the file. */
+  content: string
+}
+
 /**
  * Fetch up-to-date documentation for libraries and frameworks using Context7 API.
  */
@@ -213,6 +248,14 @@ export interface SetMessagesParams {
  */
 export interface SetOutputParams {}
 
+/**
+ * Load a skill's full instructions when relevant to the current task. Skills are loaded on-demand - only load them when you need their specific guidance.
+ */
+export interface SkillParams {
+  /** The name of the skill to load */
+  name: string
+}
+
 /**
  * Spawn multiple agents and send a prompt and/or parameters to each of them. These agents will run in parallel. Note that that means they will run independently. If you need to run agents sequentially, use spawn_agents with one agent at a time instead.
  */

packages/agent-runtime/src/run-agent-step.ts

@@ -627,7 +627,7 @@ export async function loopAgentSteps(
   const tools = useParentTools
     ? parentTools
     : await getToolSet({
-        toolNames: agentTemplate.toolNames,
+      toolNames: agentTemplate.toolNames,
         additionalToolDefinitions: async () => {
           if (!cachedAdditionalToolDefinitions) {
             cachedAdditionalToolDefinitions = await additionalToolDefinitions({
@@ -638,7 +638,7 @@ export async function loopAgentSteps(
           return cachedAdditionalToolDefinitions
         },
         agentTools,
-        skills: fileContext.skills,
+        skills: fileContext.skills ?? {},
       })
 
   const hasUserMessage = Boolean(

packages/agent-runtime/src/tools/prompts.ts

@@ -58,12 +58,12 @@ function paramsSection(params: { schema: z.ZodType; endsAgentStep: boolean }) {
   const safeSchema = ensureJsonSchemaCompatible(schema)
   const schemaWithEndsAgentStepParam = endsAgentStep
     ? safeSchema.and(
-        z.object({
-          [endsAgentStepParam]: z
-            .literal(endsAgentStep)
-            .describe('Easp flag must be set to true'),
-        }),
-      )
+      z.object({
+        [endsAgentStepParam]: z
+          .literal(endsAgentStep)
+          .describe('Easp flag must be set to true'),
+      }),
+    )
     : safeSchema
   const jsonSchema = toJsonSchemaSafe(schemaWithEndsAgentStepParam)
   delete jsonSchema.description
@@ -158,13 +158,13 @@ You (Buffy) have access to the following tools. Call them when needed.
 Tool calls use a specific XML and JSON-like format. Adhere *precisely* to this nested element structure:
 
 ${getToolCallString(
-  'tool_name',
-  {
-    parameter1: 'value1',
-    parameter2: 123,
-  },
-  false,
-)}
+    'tool_name',
+    {
+      parameter1: 'value1',
+      parameter2: 123,
+    },
+    false,
+  )}
 
 ### Commentary
 
@@ -178,20 +178,20 @@ User: can you update the console logs in example/file.ts?
 Assistant: Sure thing! Let's update that file!
 
 ${getToolCallString(
-  'example_editing_tool',
-  {
-    example_file_path: 'path/to/example/file.ts',
-    example_array: [
-      {
-        old_content_with_newlines:
-          "// some context\nconsole.log('Hello world!');\n",
-        new_content_with_newlines:
-          "// some context\nconsole.log('Hello from Buffy!');\n",
-      },
-    ],
-  },
-  false,
-)}
+    'example_editing_tool',
+    {
+      example_file_path: 'path/to/example/file.ts',
+      example_array: [
+        {
+          old_content_with_newlines:
+            "// some context\nconsole.log('Hello world!');\n",
+          new_content_with_newlines:
+            "// some context\nconsole.log('Hello from Buffy!');\n",
+        },
+      ],
+    },
+    false,
+  )}
 
 All done with the update!
 User: thanks it worked! :)
@@ -251,16 +251,16 @@ export const fullToolList = (
       }
       return desc
     }),
-  ...Object.keys(additionalToolDefinitions).map((toolName) => {
-    const toolDef = additionalToolDefinitions[toolName]
-    return buildToolDescription({
-      toolName,
-      schema: ensureZodSchema(toolDef.inputSchema),
-      description: toolDef.description,
-      endsAgentStep: toolDef.endsAgentStep ?? true,
-      exampleInputs: toolDef.exampleInputs,
-    })
-  }),  ]
+    ...Object.keys(additionalToolDefinitions).map((toolName) => {
+      const toolDef = additionalToolDefinitions[toolName]
+      return buildToolDescription({
+        toolName,
+        schema: ensureZodSchema(toolDef.inputSchema),
+        description: toolDef.description,
+        endsAgentStep: toolDef.endsAgentStep ?? true,
+        exampleInputs: toolDef.exampleInputs,
+      })
+    }),]
 
   return `## List of Tools
 
@@ -309,13 +309,13 @@ Use the tools below to complete the user request, if applicable.
 Tool calls use a specific XML and JSON-like format. Adhere *precisely* to this nested element structure:
 
 ${getToolCallString(
-  'tool_name',
-  {
-    parameter1: 'value1',
-    parameter2: 123,
-  },
-  false,
-)}
+    'tool_name',
+    {
+      parameter1: 'value1',
+      parameter2: 123,
+    },
+    false,
+  )}
 
 Important: You only have access to the tools below. Do not use any other tools -- they are not available to you, instead they may have been previously used by other agents.
 
@@ -327,13 +327,12 @@ export async function getToolSet(params: {
   toolNames: string[]
   additionalToolDefinitions: () => Promise<CustomToolDefinitions>
   agentTools: ToolSet
-  skills?: SkillsMap
+  skills: SkillsMap
 }): Promise<ToolSet> {
   const { toolNames, additionalToolDefinitions, agentTools, skills } = params
 
   // Generate available skills XML for the skill tool description
-  const availableSkillsXml = skills ? formatAvailableSkillsXml(skills) : ''
-
+  const availableSkillsXml = formatAvailableSkillsXml(skills)
   const toolSet: ToolSet = {}
   for (const toolName of toolNames) {
     if (toolName in toolParams) {