Strengthen allowed tools prompt

Author: jahooma

packages/agent-runtime/src/templates/strings.ts

@@ -174,13 +174,14 @@ export async function getAgentPrompt<T extends StringField>(
     useParentTools,
   } = params
 
-  let promptValue = agentTemplate[promptType.type]
+  const { toolNames, spawnableAgents, outputSchema } = agentTemplate
+  const promptValue = agentTemplate[promptType.type]
 
   let prompt = await formatPrompt({
     ...params,
     prompt: promptValue,
-    tools: agentTemplate.toolNames,
-    spawnableAgents: agentTemplate.spawnableAgents,
+    tools: toolNames,
+    spawnableAgents,
   })
 
   let addendum = ''
@@ -194,38 +195,34 @@ export async function getAgentPrompt<T extends StringField>(
   if (promptType.type === 'instructionsPrompt' && agentState.agentType) {
     // Add subagent tools message when using parent's tools for prompt caching
     if (useParentTools) {
-      if (agentTemplate.toolNames.length > 0) {
-        addendum += `\n\nYou are a subagent that only has access to the following tools: ${agentTemplate.toolNames.join(', ')}. Do not attempt to use any other tools.`
-      } else {
-        addendum += `\n\nYou are a subagent and do not have access to any tools specified earlier in the conversation.`
-      }
+      addendum += `\n\nYou are a subagent that only has access to the following tools: ${toolNames.length > 0 ? toolNames.join(', ') : 'none'}. Previously referenced tools in the conversation may have only been available to the parent agent. Do not attempt to use any other tools besides these listed here. You will only get tool errors if you do.`
 
       // For subagents with inheritSystemPrompt, include full spawnable agents spec
       // since the parent's system prompt may not have these agents listed
-      if (agentTemplate.spawnableAgents.length > 0) {
+      if (spawnableAgents.length > 0) {
         addendum +=
           '\n\n' +
           (await buildFullSpawnableAgentsSpec({
             ...params,
-            spawnableAgents: agentTemplate.spawnableAgents,
+            spawnableAgents,
             agentTemplates,
           }))
       }
-    } else if (agentTemplate.spawnableAgents.length > 0) {
+    } else if (spawnableAgents.length > 0) {
       // For non-inherited tools, agents are already defined as tools with full schemas,
       // so we just list the available agent IDs here
-      addendum += `\n\nYou can spawn the following agents: ${agentTemplate.spawnableAgents.join(', ')}.`
+      addendum += `\n\nYou can spawn the following agents: ${spawnableAgents.join(', ')}.`
     }
 
     // Add output schema information if defined
-    if (agentTemplate.outputSchema) {
+    if (outputSchema) {
       addendum += '\n\n## Output Schema\n\n'
       addendum +=
         'When using the set_output tool, your output must conform to this schema:\n\n'
       addendum += '```json\n'
       try {
         // Convert Zod schema to JSON schema for display
-        const jsonSchema = z.toJSONSchema(agentTemplate.outputSchema, {
+        const jsonSchema = z.toJSONSchema(outputSchema, {
           io: 'input',
         })
         delete jsonSchema['$schema'] // Remove the $schema field for cleaner display