@cap-js/agents 0.9.6 → 0.9.8

package/lib/utils/toml.js

@@ -0,0 +1,67 @@
+/**
+ * Minimal TOML parser supporting:
+ *   - bare keys and quoted keys
+ *   - string values (single- and double-quoted)
+ *   - boolean values
+ *   - standard tables ([section]) and dotted tables ([a.b])
+ *   - comments (#)
+ */
+
+export const toml = {
+  parse(src) {
+    const lines = src.split(/\r?\n/)
+    const root = {}
+    let current = root
+
+    for (let raw of lines) {
+      const line = raw.replace(/#.*$/, "").trim()
+      if (!line) continue
+
+      // table header
+      const tableMatch = line.match(/^\[([^\]]+)\]$/)
+      if (tableMatch) {
+        current = tableMatch[1]
+          .trim()
+          .split(".")
+          .reduce((obj, key) => {
+            key = key.trim()
+            if (!obj[key] || typeof obj[key] !== "object") obj[key] = {}
+            return obj[key]
+          }, root)
+        continue
+      }
+
+      // key = value
+      const kvMatch = line.match(/^([A-Za-z0-9_\-."']+)\s*=\s*(.+)$/)
+      if (!kvMatch) continue
+      const key = kvMatch[1].replace(/^['"]|['"]$/g, "")
+      const raw_val = kvMatch[2].trim()
+
+      let value
+      if (/^'''[\s\S]*'''$/.test(raw_val) || /^"""[\s\S]*"""$/.test(raw_val)) {
+        value = raw_val.slice(3, -3)
+      } else if (/^'[^']*'$/.test(raw_val)) {
+        value = raw_val.slice(1, -1)
+      } else if (/^"[^"]*"$/.test(raw_val)) {
+        value = raw_val
+          .slice(1, -1)
+          .replace(/\\n/g, "\n")
+          .replace(/\\t/g, "\t")
+          .replace(/\\"/g, '"')
+          .replace(/\\\\/g, "\\")
+      } else if (raw_val === "true") {
+        value = true
+      } else if (raw_val === "false") {
+        value = false
+      } else if (!isNaN(Number(raw_val))) {
+        value = Number(raw_val)
+      } else {
+        value = raw_val
+      }
+
+      current[key] = value
+    }
+
+    return root
+  },
+}

package/lib/utils/usage.js

@@ -0,0 +1,34 @@
+import cds from "@sap/cds"
+const NORMALIZED = Symbol.for("@cap-js/agents:additive-cache-usage-normalized")
+
+export function isAdditiveCacheUsageModel(model) {
+  const name = String(model || "")
+  return /anthropic|claude/i.test(name) || /^amazon--/i.test(name)
+}
+
+export function normalizeAdditiveCacheUsage(result) {
+  for (const message of result?.generations?.map((g) => g.message) ?? []) {
+    normalizeAdditiveCacheUsageMetadata(message?.usage_metadata)
+  }
+  return result
+}
+
+export function normalizeAdditiveCacheUsageChunk(chunk) {
+  // Avoid adjusting usage in chunks when streaming is disabled, because normalizeAdditiveCacheUsage runs as well
+  if (!cds.env.agents.streaming) return chunk
+  normalizeAdditiveCacheUsageMetadata(chunk?.message?.usage_metadata)
+  return chunk
+}
+
+function normalizeAdditiveCacheUsageMetadata(usage) {
+  if (!usage || usage[NORMALIZED]) return
+  const cache =
+    (usage.input_token_details?.cache_read ?? 0) + (usage.input_token_details?.cache_creation ?? 0)
+  if (!cache) return
+
+  usage.input_tokens += cache
+  if (usage.total_tokens != null && usage.output_tokens != null) {
+    usage.total_tokens = usage.input_tokens + usage.output_tokens
+  }
+  Object.defineProperty(usage, NORMALIZED, { value: true })
+}

package/lib/utils/utils.js

@@ -15,6 +15,38 @@ export const slugified = (name) =>
     .replace(/([a-z0-9])([A-Z])/g, (_m, c, C) => c + "-" + C)
     .toLowerCase()
 
+export function effectiveDefinition(srv) {
+  return cds.context?.model?.definitions?.[srv.name] || srv?.definition
+}
+
+/**
+ * Resolve an explicitly declared label for a CDS service (i18n label /
+ * @Common.Label / @title) — NOT the description or doc comment. Returns undefined
+ * when no label is declared, so callers can choose their own fallback.
+ */
+export function declaredServiceLabel(serviceName, locale) {
+  if (!serviceName) return undefined
+  locale = locale || cds.context?.locale || "en"
+  const model = cds.context?.model ?? cds.model
+  const def = model?.definitions?.[serviceName]
+  if (!def) return undefined
+  return (
+    cds.i18n?.labels?.at(def, locale) ||
+    resolveI18n(def["@Common.Label"], locale) ||
+    resolveI18n(def["@title"], locale) ||
+    undefined
+  )
+}
+
+/**
+ * Resolve a display label for a CDS service. Uses the declared label when
+ * available, otherwise returns the real (fully-qualified) service name unchanged.
+ */
+export function serviceLabel(serviceName, locale) {
+  if (!serviceName) return undefined
+  return declaredServiceLabel(serviceName, locale) || serviceName
+}
+
 export function getDescription(obj, locale) {
   locale = locale || cds.context?.locale || "en"
 
@@ -40,6 +72,16 @@ export function getDescription(obj, locale) {
   return result || undefined
 }
 
+/**
+ * Classify an (unprefixed) MCP tool name into a status-update kind:
+ * "query" (read), "describe" (model introspection), or "action" (everything else).
+ */
+export function mcpToolKind(rawName) {
+  if (rawName === "query" || rawName.endsWith("_query")) return "query"
+  if (rawName === "describe" || rawName.endsWith("_describe")) return "describe"
+  return "call"
+}
+
 /**
  * Sanitize an agent name into a valid LangChain/LLM tool name.
  */
@@ -67,7 +109,7 @@ export function short(id) {
  * Never blocks execution. Logs warning on failure.
  */
 export function audit(event, data) {
-  if (!cds.requires["audit-log"]) return
+  if (!cds.env.requires["audit-log"]) return
   cds.connect
     .to("audit-log")
     .then((a) =>

package/package.json

@@ -1,14 +1,34 @@
 {
   "name": "@cap-js/agents",
-  "version": "0.9.6",
+  "version": "0.9.8",
   "description": "CDS plugin for building agents",
-  "author": "SAP SE (https://www.sap.com)",
-  "license": "Apache-2.0",
   "homepage": "https://cap.cloud.sap/",
+  "license": "Apache-2.0",
+  "author": "SAP SE (https://www.sap.com)",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cap-js/agents.git"
   },
+  "workspaces": [
+    "tests/projects/bookshop/",
+    "tests/projects/deep-agent/",
+    "tests/projects/mtx/mtx/sidecar/",
+    "tests/projects/telemetry-debug/",
+    "tests/projects/telemetry-v1/",
+    "tests/projects/travel/travel-agent/",
+    "tests/projects/travel/xflights/",
+    "tests/projects/travel/leisure-services/",
+    "tests/sidecar-projects/java-bookshop/agent/sidecar",
+    "tests/sidecar-projects/java-bookshop",
+    "tests/sidecar-projects/node-bookshop/agent/sidecar",
+    "tests/sidecar-projects/node-bookshop"
+  ],
+  "files": [
+    "cds-plugin.js",
+    "lib",
+    "srv",
+    "_i18n"
+  ],
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
@@ -30,15 +50,9 @@
     "watch:deep-agent": "cds w tests/projects/deep-agent --profile hybrid",
     "docs:audit": "node .scripts/generate-audit-docs.js",
     "docs:audit:check": "node .scripts/generate-audit-docs.js --check",
-    "prettier": "npx -y prettier@3 --write .",
-    "prettier:check": "npx -y prettier@3 --check ."
+    "format": "npx -y oxfmt@0.70.0",
+    "format:check": "npx -y oxfmt@0.70.0 --check"
   },
-  "files": [
-    "cds-plugin.js",
-    "lib",
-    "srv",
-    "_i18n"
-  ],
   "dependencies": {
     "@a2a-js/sdk": "^0.3.12",
     "@cap-js/attachments": ">=3",
@@ -47,9 +61,11 @@
     "@langchain/core": "^1",
     "@langchain/langgraph": "^1",
     "@langchain/mcp-adapters": "^1.1.3",
+    "@langchain/openai": "^1.5.13",
     "@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",
@@ -60,6 +76,7 @@
     "@cap-js/sqlite": "^3",
     "@sap/cds-mtxs": "^4",
     "@toon-format/toon": ">=2.3",
+    "@vitest/coverage-v8": "^5.0.1",
     "acorn": "^8.18.0",
     "deepagents": "^1.10.2",
     "openevals": "^0.2.0"
@@ -91,6 +108,7 @@
       "mlflow": false,
       "connect": "auto",
       "retention": "30d",
+      "masking": false,
       "[development]": {
         "pushNotifications": {
           "allowedDomains": [
@@ -184,6 +202,9 @@
         "anthropic": {
           "impl": "@cap-js/agents/lib/models/anthropic"
         },
+        "openai": {
+          "impl": "@cap-js/agents/lib/models/openai"
+        },
         "llm-mock": {
           "impl": "@cap-js/agents/lib/models/mock"
         }
@@ -220,19 +241,5 @@
     "folders": {
       "srvs": "srv/*"
     }
-  },
-  "workspaces": [
-    "tests/projects/bookshop/",
-    "tests/projects/deep-agent/",
-    "tests/projects/mtx/mtx/sidecar/",
-    "tests/projects/telemetry-debug/",
-    "tests/projects/telemetry-v1/",
-    "tests/projects/travel/travel-agent/",
-    "tests/projects/travel/xflights/",
-    "tests/projects/travel/leisure-services/",
-    "tests/sidecar-projects/java-bookshop/agent/sidecar",
-    "tests/sidecar-projects/java-bookshop",
-    "tests/sidecar-projects/node-bookshop/agent/sidecar",
-    "tests/sidecar-projects/node-bookshop"
-  ]
+  }
 }

package/srv/handlers/graph-executor/crash-handler.js

@@ -0,0 +1,47 @@
+import cds from "@sap/cds"
+
+const LOG = cds.log("agents")
+
+// REVISIT: Check if in the future tasks can be picked up again after restart
+async function markActiveTasksFailed() {
+  const tasksByTenant = new Map()
+
+  for (const executor of registerShutdownHook.executors) {
+    for (const taskId of executor._abortControllers.keys()) {
+      const tenant = executor._taskTenants.get(taskId)
+      const taskIds = tasksByTenant.get(tenant) || []
+      taskIds.push(taskId)
+      tasksByTenant.set(tenant, taskIds)
+    }
+  }
+
+  await Promise.all(
+    [...tasksByTenant].map(async ([tenant, taskIds]) => {
+      const update = () =>
+        UPDATE("cap.agent.Tasks")
+          .where({
+            taskId: { in: [...new Set(taskIds)] },
+            state: { in: ["submitted", "working", "input-required"] },
+          })
+          .set({ state: "failed" })
+
+      if (tenant) return cds.spawn({ tenant, user: cds.User.privileged }, update)
+      return update()
+    }),
+  )
+}
+
+export function registerShutdownHook(executor) {
+  registerShutdownHook.executors.add(executor)
+  if (registerShutdownHook.executors.size > 1) return
+
+  cds.on("shutdown", async () => {
+    try {
+      await markActiveTasksFailed()
+    } catch (err) {
+      LOG.error("Failed to mark active tasks as failed during shutdown", { error: err.message })
+    }
+  })
+}
+
+registerShutdownHook.executors = new Set()

package/srv/handlers/graph-executor/hitl.js

@@ -156,6 +156,10 @@ export function composeHitlDecisionNote(actionRequests, resume) {
       lines.push("- User edited " + action(matched) + " to " + action(decision.editedAction) + ".")
       continue
     }
+    if (decision?.type === "reject") {
+      lines.push("- User explicitly rejected " + action(original) + ".")
+      continue
+    }
   }
   if (!lines.length) {
     return undefined
@@ -163,6 +167,28 @@ export function composeHitlDecisionNote(actionRequests, resume) {
   return ["User HITL decisions (not tool failures):", ...lines].join("\n")
 }
 
+// The generic combined "call" tool carries its target action in args.action. HITL
+// gates it per-call via a `when` predicate, so the interrupt only fires for a gated
+// action. An edit must therefore not repoint args.action at a *different* action —
+// that would run an un-gated action under the approval granted for the gated one.
+// Editing the parameters is fine; the action itself is fixed.
+const GENERIC_CALL_TOOL = "call"
+
+export function guardHitlEdits(resume, actions = []) {
+  if (!Array.isArray(resume?.decisions)) return resume
+  resume.decisions.forEach((decision, index) => {
+    if (decision?.type !== "edit") return
+    const original = actions[index]
+    if (original?.name !== GENERIC_CALL_TOOL) return
+    const from = original.args?.action
+    const to = decision.editedAction?.args?.action
+    if (to !== undefined && from !== undefined && to !== from) {
+      throw new Error(`HITL edit must not change the gated action (expected "${from}", got "${to}").`)
+    }
+  })
+  return resume
+}
+
 async function getPreInterruptToolCalls(graph, config) {
   try {
     if (typeof graph.getState !== "function") return []
@@ -339,6 +365,7 @@ export async function resumeHitl({ requestContext, graph, config, eventBus, stre
   const originalActions = actionRequests.length
     ? actionRequests
     : await getPreInterruptToolCalls(graph, config)
+  guardHitlEdits(resume, originalActions)
   const decisionNote = composeHitlDecisionNote(originalActions, resume)
   const commandArgs = { resume }
   if (decisionNote) commandArgs.update = { _hitlDecisionNote: decisionNote }

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"
@@ -17,6 +19,7 @@ import {
   resumeHitl,
   resumeTimeoutHitl,
 } from "./graph-executor/hitl.js"
+import { registerShutdownHook } from "./graph-executor/crash-handler.js"
 
 const LOG = cds.log("agents")
 
@@ -143,6 +146,9 @@ class GraphExecutor {
     this._recursionLimit = options.recursionLimit ?? null
     /** @type {Map<string, AbortController>} per-task abort controllers */
     this._abortControllers = new Map()
+    /** @type {Map<string, string | undefined>} task tenant by task ID */
+    this._taskTenants = new Map()
+    registerShutdownHook(this)
   }
 
   /**
@@ -197,6 +203,10 @@ class GraphExecutor {
     // final visual (collapse to the last turn's bubble at task completion).
     let currentMsgId = null
     let thinkingCount = 0
+    let thinkingMsgId = null
+    // 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 +248,26 @@ 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
+
+          if (thinkingMsgId !== null && currentMsgId !== thinkingMsgId) thinkingCount++
+          thinkingMsgId = currentMsgId
+
+          // 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
@@ -255,7 +283,6 @@ class GraphExecutor {
               parts: [{ kind: "text", text }],
             },
           })
-          if (lastChunk) thinkingCount++
           tokenCount++
         } else if (mode === "updates") {
           // The updates stream yields per-node deltas — { <node>: { messages: [oneNewMessage] } },
@@ -354,16 +381,16 @@ 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"),
+      }),
+    )
   }
 
   async execute(requestContext, eventBus) {
@@ -375,6 +402,7 @@ class GraphExecutor {
     // Cooperative cancellation: per-task AbortController
     const controller = new AbortController()
     this._abortControllers.set(taskId, controller)
+    this._taskTenants.set(taskId, cds.context?.tenant)
 
     // A2A context for tracing
     if (!cds.context) {
@@ -384,6 +412,18 @@ class GraphExecutor {
     cds.context["agent.context.id"] = contextId
     cds.context["agent.service"] = serviceName
     cds.context["agent.eventBus"] = eventBus
+    cds.context["agent.request.metadata"] = requestContext.userMessage?.metadata ?? {}
+
+    // 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)
 
@@ -533,8 +573,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 +649,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 +658,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 +670,9 @@ class GraphExecutor {
           setSpanAttrs(
             rootSpan,
             mlflowAttrs("CHAIN", {
-              outputs: { choices: [{ message: { role: "assistant", content: output } }] },
+              outputs: {
+                choices: [{ message: { role: "assistant", content: output } }],
+              },
             }),
           )
         }
@@ -875,16 +917,19 @@ class GraphExecutor {
           eventBus._graphResult = { messages: result.messages || [] }
         }
 
+        const usageMeta =
+          usageData?.total_tokens > 0 ? { "sap.cds.agents.token-usage": usageData } : undefined
         eventBus.publish({
           kind: "status-update",
           taskId,
           contextId,
           status: {
             state: "completed",
-            message: agentMessage(output),
+            message: agentMessage(output, undefined, usageMeta),
             timestamp: new Date().toISOString(),
           },
           final: true,
+          metadata: usageMeta,
         })
       } catch (err) {
         // Aborted (client disconnect or tasks/cancel) — publish canceled, not failed
@@ -1014,6 +1059,7 @@ class GraphExecutor {
         setSpanAttrs(rootSpan, linkTraceToPrompt())
 
         this._abortControllers.delete(taskId)
+        this._taskTenants.delete(taskId)
         metrics.concurrentExecutions.add(-1, mAttrs)
 
         // Update task record with usage data (non-blocking, best effort)
@@ -1111,13 +1157,16 @@ function aggregateUsageData(messages) {
     cache_creation_input_tokens: 0,
     cache_read_input_tokens: 0,
     reasoning_tokens: 0,
+    context_tokens: 0,
   }
   for (let i = 0; i < messages.length; i++) {
     if (!messages[i].usage_metadata) continue
     const innerRes = convertUsageData(messages[i].usage_metadata)
     Object.keys(innerRes).forEach((k) => {
-      if (innerRes[k] != null) result[k] += innerRes[k]
+      if (k in result && innerRes[k] != null) result[k] += innerRes[k]
     })
+    if (innerRes.input_tokens != null)
+      result.context_tokens = innerRes.input_tokens + (innerRes.output_tokens || 0)
   }
   return result
 }

package/srv/handlers/index.js

@@ -5,6 +5,7 @@ import buildMiddleware from "../../lib/agents/middleware/index.js"
 import { partsToText } from "../../lib/utils/message-handling.js"
 import { cleanupExpiredTasks } from "../../lib/protocol/persistence/cleanup.js"
 import { registerChat } from "./chat.js"
+import { effectiveDefinition } from "../../lib/utils/utils.js"
 
 const LOG = cds.log("agents")
 
@@ -91,12 +92,16 @@ export default function registerDefaultAgentHandlers(srv) {
 
   // Default buildModel: cds.connect.to('llm'), configurable via @agent.llm
   srv.on("buildModel", async (req) => {
-    const name = srv?.options?.agent?.llm || srv?.definition?.["@agent.llm"] || "llm"
+    const def = effectiveDefinition(srv)
+    const name = def?.["@agent.llm"] || srv?.options?.agent?.llm || "llm"
     const options = cds.requires[name] ?? {}
     let { kind, impl } = options
     if (!impl) impl = cds.requires.kinds[kind]?.impl
     if (!impl) throw new Error("No service implementation found for " + name)
     const { default: LLMProvider } = await import(impl)
+    const { credentials, ...o } = options
+    if (credentials) o.credentials = '{ *** }'
+    LOG.debug (`Creating LLMProvider instance for cds.requires.${name} with options:`, o)
     return new LLMProvider(name, { ...options, ...req.data })
   })
 

package/srv/handlers/mcp-tools.js

@@ -1,6 +1,6 @@
 import cds from "@sap/cds"
 import { generateTools } from "./tools.js"
-import { toolName } from "../../lib/utils/utils.js"
+import { toolName, mcpToolKind } from "../../lib/utils/utils.js"
 
 const LOG = cds.log("agents:mcp")
 
@@ -45,7 +45,16 @@ export async function buildMcpToolsLocally(serviceName) {
   const srv = cds.services[serviceName]
   const tools = generateTools(srv)
   const prefix = toolName(`${serviceName}_`)
-  for (const tool of tools) tool.name = `${prefix}${tool.name}`
+  for (const tool of tools) {
+    // Keep PerActionTool's actionName so status-update can resolve the action's label.
+    tool.metadata = {
+      ...tool.metadata,
+      serviceName,
+      kind: mcpToolKind(tool.name),
+      ...(tool.actionName && { actionName: tool.actionName }),
+    }
+    tool.name = `${prefix}${tool.name}`
+  }
 
   LOG.debug(
     `Got ${tools.length} MCP tools from ${serviceName}: ${tools.map((t) => t.name).join(", ")}`,