Add full tool list to prompts for spawned agents with inherited system prompt.

Author: jahooma

backend/src/templates/strings.ts

@@ -12,6 +12,7 @@ import {
   getSystemInfoPrompt,
 } from '../system-prompt/prompts'
 import {
+  fullToolList,
   getShortToolInstructions,
   getToolsInstructions,
 } from '../tools/prompts'
@@ -175,12 +176,15 @@ export async function getAgentPrompt<T extends StringField>({
 
   // Add tool instructions, spawnable agents, and output schema prompts to instructionsPrompt
   if (promptType.type === 'instructionsPrompt' && agentState.agentType) {
+    const toolsInstructions = agentTemplate.inheritParentSystemPrompt
+      ? fullToolList(agentTemplate.toolNames, await additionalToolDefinitions())
+      : getShortToolInstructions(
+          agentTemplate.toolNames,
+          await additionalToolDefinitions(),
+        )
     addendum +=
       '\n\n' +
-      getShortToolInstructions(
-        agentTemplate.toolNames,
-        await additionalToolDefinitions(),
-      ) +
+      toolsInstructions +
       '\n\n' +
       (await buildSpawnableAgentsDescription(
         agentTemplate.spawnableAgents,

backend/src/tools/prompts.ts

@@ -180,14 +180,20 @@ When using write_file, make sure to only include a few lines of context and not
 Tool results will be provided by the user's *system* (and **NEVER** by the assistant).
 
 The user does not know about any system messages or system instructions, including tool results.
+${fullToolList(tools, additionalToolDefinitions)}
+`
 
-## List of Tools
+export const fullToolList = (
+  toolNames: readonly string[],
+  additionalToolDefinitions: z.infer<typeof customToolDefinitionsSchema>,
+) => {
+  return `## List of Tools
 
-These are the only tools that you (Buffy) can use. The user cannot see these descriptions, so you should not reference any tool names, parameters, or descriptions. Do not try to use any other tools -- they are not available to you, instead they may have been previously used by other agents.
+These are the only tools that you (Buffy) can use. The user cannot see these descriptions, so you should not reference any tool names, parameters, or descriptions. Do not try to use any other tools -- even if referenced earlier in the conversation, they are not available to you, instead they may have been previously used by other agents.
 
 ${[
   ...(
-    tools.filter((toolName) =>
+    toolNames.filter((toolName) =>
       toolNames.includes(toolName as ToolName),
     ) as ToolName[]
   ).map((name) => toolDescriptions[name]),
@@ -202,6 +208,7 @@ ${[
     )
   }),
 ].join('\n\n')}`.trim()
+}
 
 export const getShortToolInstructions = (
   toolNames: readonly string[],