@cap-js/agents 0.9.6 → 0.9.8

package/srv/handlers/subagent-tools.js

@@ -78,9 +78,9 @@ function formatToolResult({ text, files }) {
 /**
  * Wrap an A2A client as a LangChain tool the agent can call.
  */
-function createA2ATool(client, agentCard) {
+function createA2ATool(client, agentCard, serviceName) {
   const subagent = agentCard.name
-  return tool(
+  const t = tool(
     async ({ message }) => {
       try {
         const messageId = cds.utils.uuid()
@@ -116,6 +116,8 @@ function createA2ATool(client, agentCard) {
       }),
     },
   )
+  t.metadata = { ...t.metadata, kind: "agent", agentName: agentCard.name, serviceName }
+  return t
 }
 
 export async function buildSubAgentToolLocally(serviceName) {
@@ -130,7 +132,7 @@ export async function buildSubAgentToolLocally(serviceName) {
 
   const { RequestContext, DefaultExecutionEventBus } = await import("@a2a-js/sdk/server")
 
-  return tool(
+  const localTool = tool(
     async ({ message }) => {
       const taskId = cds.utils.uuid()
       const contextId = cds.utils.uuid()
@@ -221,6 +223,13 @@ export async function buildSubAgentToolLocally(serviceName) {
       }),
     },
   )
+  localTool.metadata = {
+    ...localTool.metadata,
+    kind: "agent",
+    agentName: agentCard.name,
+    serviceName,
+  }
+  return localTool
 }
 
 export async function buildSubAgentToolFromConnection(serviceName) {
@@ -334,7 +343,7 @@ export async function buildSubAgentToolFromConnection(serviceName) {
   )
   const client = await factory.createFromAgentCard(agentCard)
 
-  return createA2ATool(client, agentCard)
+  return createA2ATool(client, agentCard, serviceName)
 }
 
 export function buildSubAgentTool(serviceName) {

package/srv/handlers/system-prompt.js

@@ -1,25 +1,35 @@
 import cds from "@sap/cds"
 import { getDescription } from "../../lib/utils/utils.js"
+const LOG = cds.log("agents")
 
 export function buildSystemPrompt(srv) {
-  const serviceDesc = getDescription(srv.definition) || `Service ${srv.name}`
-
-  return [
-    `You are an AI assistant for the "${srv.name}" service.`,
-    serviceDesc,
-    "",
-    "Always use the provided tools to answer questions - do not make up data.",
-    "Use the `describe` tool to get information about the service's entities and actions if needed.",
-    "Use the `query` tool to read data from entities.",
-    cds.env.agents?.per_action_tool !== false
-      ? "Call action and function tools directly by name."
-      : "Use the `call` tool to invoke actions and functions.",
-    ...(cds.env.agents?.fileIO?.enabled
-      ? [
-          "When the user's message contains '[Uploaded files: ...]', use the `read_file` tool to read each listed file before answering.",
-          "Use `emit_file_part` to return files in your response.",
-        ]
-      : []),
-    "Be concise and helpful.",
-  ].join("\n")
+
+  let text = `
+
+    You are an AI assistant for the local CAP service \`${srv.name}\`.
+    ${ getDescription(srv.definition) || '' }
+    Use the provided tools to answer questions:
+
+    - the \`describe\` tool to learn about the service's entities and actions.
+    - the \`query\` tool to read data from entities.
+    - the \`call\` tool to invoke actions, or individual action tools.
+
+    IMPORTANT: Don't guess element names when \`query\`ing entities.
+    Use the \`describe\` tool instead to find correct element names.
+
+    ${ cds.env.agents?.fileIO?.enabled ? `## File I/O
+    When the incomming request message contains '[Uploaded files: ...]',
+    use the \`read_file\` tool to read each listed file before answering.
+    Use the \`emit_file_part\` tool to return files in your response.` : ''}
+
+    ${ cds.env.agents?.masking ? `## How to handle pseudonymized values
+    Never comment on pseudonymization and that you had to work with pseudonymized values
+    but use the pseudonymized values in responses like it would be regular values!
+    The user sees the actual values and thus should not be made aware of any
+    pseudonymization that has taken place internally.` : ''}
+
+  `.replace(/ {4,}/g,'').trim()
+
+  if (LOG._debug) LOG.debug (srv.name, '-', "using system prompt:", '\n\n'+ text +'\n')
+  return text
 }

package/srv/handlers/tools.js

@@ -183,31 +183,32 @@ class CallActionTool extends DynamicStructuredTool {
  * @param {object} srv - CDS ApplicationService
  */
 export function generateTools(srv) {
-  const entities = getFilteredEntities(srv)
-  const actions = getFilteredActions(srv)
+  const entities = getFilteredEntities(srv), has_entities = Object.keys(entities).length > 0
+  const actions = getFilteredActions(srv), has_actions = Object.keys(actions).length > 0
 
   const tools = []
 
-  // Query tool — one tool for reading all entities
-  const entityNames = Object.keys(entities)
-  if (entityNames.length > 0) {
-    tools.push(new GenericReadTool(srv, entities))
-  }
-
   // Describe tool — introspect service model
-  const actionNames = Object.keys(actions)
-  if (entityNames.length > 0 || actionNames.length > 0) {
+  if (has_entities || has_actions) {
+    LOG.debug(srv.name, '–', `adding generic 'describe' tool`)
     tools.push(new DescribeTool(srv, entities, actions))
   }
 
+  // Query tool — one tool for reading all entities
+  if (has_entities) {
+    LOG.debug(srv.name, '–', `adding generic 'query' entity tool`)
+    tools.push(new GenericReadTool(srv, entities))
+  }
+
   // Action/function tools — per-action (default) or combined call action
-  const usePerActionTools = cds.env.agents?.per_action_tool !== false
-  if (actionNames.length > 0) {
-    if (usePerActionTools) {
+  if (has_actions) {
+    if (cds.env.mcp?.per_action_tool) {
       for (const [name, action] of Object.entries(actions)) {
+        LOG.debug(srv.name, '–', `adding specific tool to call action '${name}'`)
         tools.push(new PerActionTool(srv, name, action))
       }
     } else {
+      LOG.debug(srv.name, '–', `adding generic 'call' action tool`)
       tools.push(new CallActionTool(srv, actions))
     }
   }