@cap-js/agents 0.9.5 → 0.9.7

package/lib/telemetry/tool-tracing.js

@@ -50,9 +50,6 @@ export function _patchToolsProto(proto) {
         span.setAttribute("gen_ai.operation.name", "execute_tool")
         span.setAttribute("gen_ai.provider.name", "langchain")
         span.setAttribute("gen_ai.tool.call.id", toolName)
-        const inputs = args?.args ?? args
-        setSpanAttrs(span, mlflowAttrs("TOOL", { inputs, functionName: toolName }))
-        if (LOG._debug) span.setAttribute("gen_ai.tool.call.arguments", JSON.stringify(inputs))
       }
       const taskId = config?.configurable?._taskId || cds.context?.["agent.task.id"]
       let outcome
@@ -64,9 +61,12 @@ export function _patchToolsProto(proto) {
 
         const semanticError = result?.artifact?.isError === true
         outcome = semanticError ? "error" : "success"
-        const outputs = result?.content ?? result
+        let outputs = result?.content ?? result
 
         if (span) {
+          const inputs = args?.args ?? args
+          setSpanAttrs(span, mlflowAttrs("TOOL", { inputs, functionName: toolName }))
+          if (LOG._debug) span.setAttribute("gen_ai.tool.call.arguments", JSON.stringify(inputs))
           span.setAttribute("gen_ai.tool.call.outcome", outcome)
           if (semanticError) {
             const msg = typeof outputs === "string" ? outputs : "tool returned isError"

package/lib/utils/markdown.js

@@ -7,9 +7,9 @@ const LOG = cds.log("agents")
  * Absolute filesystem directory of the `.cds` source file that defines `srv`.
  */
 export function serviceSourceDir(srv) {
-  const file = srv?.definition?.$location?.file
+  const file = srv?.definition?.["@source"] || srv?.definition?.$location?.file
   if (!file) return undefined
-  // $location.file is relative to cds.root
+  // Both @source and $location.file are relative to cds.root
   return path.dirname(path.join(cds.root, file))
 }
 

package/lib/utils/utils.js

@@ -1,14 +1,8 @@
 import cds from "@sap/cds"
 import { domainToASCII } from "node:url"
 
-function resolveI18n(value, locale) {
-  if (!value) return undefined
-  const match = /{i18n>([^}]+)}/.exec(value)
-  if (match) {
-    return cds.i18n?.labels?.texts4?.(locale)?.[match[1]] || value
-  }
-  return value
-}
+import { resolveI18n, getFilteredEntities } from "@cap-js/mcp/lib/utils/tools-shared.js"
+export { resolveI18n, getFilteredEntities }
 
 /**
  * Mirrors CAP's internal slug rules used for service path generation.
@@ -46,32 +40,6 @@ export function getDescription(obj, locale) {
   return result || undefined
 }
 
-export function getFilteredEntities(srv) {
-  return Object.fromEntries(
-    Object.entries(srv.entities || {})
-      .filter(
-        ([name, entity]) =>
-          !entity["@cds.autoexposed"] &&
-          !entity["@cds.api.ignore"] &&
-          !name.endsWith("DraftAdministrativeData") &&
-          !name.endsWith(".drafts") &&
-          !name.endsWith(".texts"),
-      )
-      .sort(([a], [b]) => a.localeCompare(b)),
-  )
-}
-
-export function getFilteredActions(srv) {
-  const actions = {}
-  for (const op of srv.actions || []) {
-    if ((op.kind === "action" || op.kind === "function") && !op["@cds.api.ignore"]) {
-      const localName = op.name.split(".").pop()
-      actions[localName] = op
-    }
-  }
-  return actions
-}
-
 /**
  * Sanitize an agent name into a valid LangChain/LLM tool name.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/agents",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "CDS plugin for building agents",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -42,7 +42,7 @@
   "dependencies": {
     "@a2a-js/sdk": "^0.3.12",
     "@cap-js/attachments": ">=3",
-    "@cap-js/mcp": "^1.4",
+    "@cap-js/mcp": "^1.5",
     "@langchain/anthropic": "^1.5.1",
     "@langchain/core": "^1",
     "@langchain/langgraph": "^1",
@@ -50,6 +50,7 @@
     "@sap-ai-sdk/langchain": "^2.13.0",
     "@sap-ai-sdk/orchestration": "^2.11.0",
     "@sap-cloud-sdk/connectivity": "^4.7.0",
+    "@sap-cloud-sdk/http-client": "^4.9.1",
     "deepagents": "^1.10.0",
     "langchain": "^1.5.0",
     "marked": "^18",
@@ -91,6 +92,7 @@
       "mlflow": false,
       "connect": "auto",
       "retention": "30d",
+      "masking": false,
       "[development]": {
         "pushNotifications": {
           "allowedDomains": [

package/srv/handlers/graph-executor.js

@@ -6,6 +6,8 @@ import { mlflowAttrs, mlflowTraceAttrs, setSpanAttrs } from "../../lib/telemetry
 import { CdsFileStore } from "../../lib/protocol/persistence/file-store.js"
 import { formatFileSize, sanitizeFilename } from "./tools.js"
 import { convertUsageData } from "../../lib/telemetry/chat-tracing.js"
+import { resolvePseudonyms } from "../../lib/masking/index.js"
+import { pseudonymizeUserMessage } from "../../lib/masking/unstructured/index.js"
 import { triggerCleanup } from "../../lib/protocol/persistence/cleanup.js"
 import { COLLECT_RESULT } from "./chat.js"
 import { linkTraceToPrompt } from "../../lib/telemetry/mlflow/tracing.js"
@@ -197,6 +199,9 @@ class GraphExecutor {
     // final visual (collapse to the last turn's bubble at task completion).
     let currentMsgId = null
     let thinkingCount = 0
+    // Holds a trailing fragment of the previous chunk that is a prefix of a known
+    // pseudonym hash. Prepended to the next chunk so split hashes are resolved correctly.
+    let pendingPrefix = ""
 
     try {
       if (typeof graph.stream !== "function" || cds.env.agents?.streaming === false) {
@@ -238,8 +243,23 @@ class GraphExecutor {
           const lastChunk =
             !!msgChunk.additional_kwargs?.intermediate_results?.llm?.choices[0].finish_reason
 
-          const text = messageText(msgChunk?.content)
-          if (!text) continue
+          const raw = pendingPrefix + (messageText(msgChunk?.content) ?? "")
+          pendingPrefix = ""
+          if (!raw) continue
+
+          // Hashes look like name-8hexchars and never contain spaces.
+          // On non-last chunks, slice last token and append to next chunk
+          // to avoid unresolved boundaries
+          let toEmit = raw
+          if (!lastChunk) {
+            const lastSpace = raw.lastIndexOf(" ")
+            if (lastSpace !== -1 && lastSpace < raw.length - 1) {
+              pendingPrefix = raw.slice(lastSpace + 1)
+              toEmit = raw.slice(0, lastSpace + 1)
+            }
+          }
+
+          const text = resolvePseudonyms(toEmit)
           // A2A TaskArtifactUpdateEvent: `append` and `lastChunk` are event-level
           // fields (siblings of `artifact`), NOT properties of `artifact`. The SDK's
           // ResultManager reads event.append; nesting them leaves it undefined and
@@ -354,16 +374,18 @@ class GraphExecutor {
    */
   async _summarizePartialWork(taskId, contextId, serviceName, reason) {
     const { summarizePartialWork } = await import("../../lib/agents/summarize-on-timeout.js")
-    return summarizePartialWork({
-      taskId,
-      contextId,
-      serviceName,
-      reason,
-      checkpointer: this._graph?.checkpointer,
-      getModel: () => this._srv.send("buildModel"),
-      // Summary runs after graph abort, so no execution-time grace is needed.
-      timeout: 10_000,
-    })
+    return resolvePseudonyms(
+      await summarizePartialWork({
+        taskId,
+        contextId,
+        serviceName,
+        reason,
+        checkpointer: this._graph?.checkpointer,
+        getModel: () => this._srv.send("buildModel"),
+        // Summary runs after graph abort, so no execution-time grace is needed.
+        timeout: 10_000,
+      }),
+    )
   }
 
   async execute(requestContext, eventBus) {
@@ -385,6 +407,17 @@ class GraphExecutor {
     cds.context["agent.service"] = serviceName
     cds.context["agent.eventBus"] = eventBus
 
+    // REVISIT: Resolve graph early for pseudonymizeUserMessage. Mid-term move into beforeAgent together with Audit & Telemetry which rely on it
+    const graph = await this._resolveGraph()
+    if (cds.env.agents.masking) {
+      await pseudonymizeUserMessage(
+        this._srv,
+        requestContext,
+        graph.checkpointer,
+        `${serviceName}:${contextId}`,
+      )
+    }
+
     metrics.concurrentExecutions.add(1, mAttrs)
 
     if (!isResume) {
@@ -533,8 +566,6 @@ class GraphExecutor {
       let usageData
       let result
       try {
-        const graph = await this._resolveGraph()
-
         const extraConfig = this._configMapper ? await this._configMapper(requestContext) : {}
         if (extraConfig !== null && extraConfig !== undefined && typeof extraConfig !== "object") {
           throw new TypeError(`configMapper must return a plain object, got ${typeof extraConfig}`)
@@ -611,7 +642,7 @@ class GraphExecutor {
         }
 
         const outputMapper = this._outputMapper || defaultOutputMapper
-        const output = outputMapper(result) || "I could not generate a response."
+        const output = resolvePseudonyms(outputMapper(result)) || "I could not generate a response."
 
         LOG.info(serviceName, "completed", { conversation: short(contextId), duration })
 
@@ -620,7 +651,9 @@ class GraphExecutor {
           setSpanAttrs(
             wfSpan,
             mlflowAttrs("AGENT", {
-              outputs: { choices: [{ message: { role: "assistant", content: output } }] },
+              outputs: {
+                choices: [{ message: { role: "assistant", content: output } }],
+              },
               functionName: serviceName,
             }),
           )
@@ -630,7 +663,9 @@ class GraphExecutor {
           setSpanAttrs(
             rootSpan,
             mlflowAttrs("CHAIN", {
-              outputs: { choices: [{ message: { role: "assistant", content: output } }] },
+              outputs: {
+                choices: [{ message: { role: "assistant", content: output } }],
+              },
             }),
           )
         }

package/srv/handlers/system-prompt.js

@@ -21,5 +21,12 @@ export function buildSystemPrompt(srv) {
         ]
       : []),
     "Be concise and helpful.",
+    ...(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.`,
+        ]
+      : []),
   ].join("\n")
 }

package/srv/handlers/tools.js

@@ -11,7 +11,8 @@ import {
   executeCallActionTool,
   executePerActionTool,
 } from "@cap-js/mcp/lib/tools.js"
-import { getFilteredEntities, getFilteredActions } from "../../lib/utils/utils.js"
+
+import { getFilteredEntities, getFilteredActions } from "@cap-js/mcp/lib/utils/tools-shared.js"
 import { isTextMime } from "../../lib/agents/markdown/backends/mime-utils.js"
 import { checkAuthorization } from "@cap-js/mcp/lib/auth.js"
 
@@ -78,8 +79,8 @@ class DescribeTool extends DynamicStructuredTool {
       description: def.description,
       schema: def.inputSchema,
       responseFormat: "content_and_artifact",
-      func: async (args) => {
-        return unwrap(await executeDescribe(srv, entities, actions, args))
+      func: (args) => {
+        return unwrap(executeDescribe(srv, entities, actions, args))
       },
     })
     this.srv = srv