@cap-js/agents 0.9.3 → 0.9.5

package/lib/preview/chat.html

@@ -126,6 +126,15 @@
         letter-spacing: 0.03em;
         text-transform: uppercase;
       }
+      .msg.approval pre {
+        margin: 8px 0 0;
+        padding: 8px;
+        overflow-x: auto;
+        border-radius: 6px;
+        background: #e7f4ff;
+        font-size: 1.1em;
+        white-space: pre;
+      }
 
       .msg.agent p {
         margin: 0 0 6px;
@@ -371,6 +380,9 @@
         .msg.approval::before {
           color: #91adc5;
         }
+        .msg.approval pre {
+          background: #0f2d45;
+        }
         .btn-approve {
           background: #537492;
         }
@@ -616,7 +628,7 @@
       function flushPendingThinkingUpdate() {
         const pending = pendingThinkingUpdate
         clearPendingThinkingUpdate()
-        if (pending) renderThinkingStep(pending.artifactId, pending.text, pending.lastChunk)
+        if (pending) renderThinkingStep(pending)
       }
 
       function prefersReducedMotion() {
@@ -642,10 +654,17 @@
         else expandThinkingSummary(el)
       }
 
-      function renderThinkingStep(artifactId, text, lastChunk) {
+      function renderThinkingStep(update) {
+        const { artifactId, text, lastChunk, append } = update
         const panel = ensureThinkingSummary()
-        const isNewStep = artifactId !== currentThinkingArtifactId || currentThinkingClosed
-        if (isNewStep) {
+        const idx = thinkingStepEls.findIndex((step) => step._artifactId === artifactId)
+        if (append && idx >= 0) {
+          thinkingTexts[idx] += text
+          thinkingStepEls[idx].innerHTML = md(thinkingTexts[idx])
+        } else if (artifactId === currentThinkingArtifactId && !currentThinkingClosed) {
+          thinkingTexts[idx] += "\n" + text
+          thinkingStepEls[idx].innerHTML = md(thinkingTexts[idx])
+        } else {
           const step = document.createElement("div")
           step.className = "thinking-step"
           step._artifactId = artifactId
@@ -657,17 +676,12 @@
           updateThinkingSummaryLabel()
           currentThinkingArtifactId = artifactId
           currentThinkingClosed = false
-        } else {
-          // Append to current open step for this artifactId
-          const idx = thinkingStepEls.length - 1
-          thinkingTexts[idx] += text
-          thinkingStepEls[idx].innerHTML = md(thinkingTexts[idx])
         }
         if (lastChunk) currentThinkingClosed = true
         messages.scrollTop = messages.scrollHeight
       }
 
-      function addThinkingStep(artifactId, text, lastChunk) {
+      function addThinkingStep(artifactId, text, lastChunk, append) {
         if (
           pendingThinkingUpdate &&
           pendingThinkingUpdate.artifactId === artifactId &&
@@ -677,7 +691,7 @@
           pendingThinkingUpdate.lastChunk = lastChunk
         } else {
           flushPendingThinkingUpdate()
-          pendingThinkingUpdate = { artifactId, text, lastChunk }
+          pendingThinkingUpdate = { artifactId, text, lastChunk, append }
         }
 
         if (pendingThinkingTimer) clearTimeout(pendingThinkingTimer)
@@ -808,31 +822,41 @@
         setTimeout(finish, THINKING_SUMMARY_ANIMATION_MS + 80)
       }
 
-      function addApprovalPrompt(description) {
+      function addApprovalPrompt(description, options, actionRequest) {
         const el = document.createElement("div")
         el.className = "msg approval"
-        el.innerHTML = md(description || "The agent requires your approval to continue.")
+        const content = document.createElement("div")
+        content.textContent = actionRequest?.name
+          ? `Tool execution requires approval\n\nTool: ${actionRequest.name}`
+          : description || "The agent requires your approval to continue."
+        el.appendChild(content)
+        content.innerHTML = md(content.textContent)
+        if (actionRequest?.args !== undefined) {
+          const json = document.createElement("pre")
+          json.textContent = JSON.stringify(actionRequest.args, null, 2)
+          el.appendChild(json)
+        }
         const actions = document.createElement("div")
         actions.className = "approval-actions"
 
-        const approveBtn = document.createElement("button")
-        approveBtn.className = "btn-approve"
-        approveBtn.textContent = "Approve"
-        approveBtn.addEventListener("click", () => {
-          removeApprovalPrompt(el)
-          resume("approve")
-        })
-
-        const rejectBtn = document.createElement("button")
-        rejectBtn.className = "btn-reject"
-        rejectBtn.textContent = "Reject"
-        rejectBtn.addEventListener("click", () => {
-          removeApprovalPrompt(el)
-          resume("reject")
-        })
-
-        actions.appendChild(approveBtn)
-        actions.appendChild(rejectBtn)
+        const choices =
+          Array.isArray(options) && options.length
+            ? options
+            : [
+                { value: "approve", label: "Approve" },
+                { value: "reject", label: "Reject" },
+              ]
+        for (const option of choices) {
+          if (typeof option?.value !== "string" || typeof option?.label !== "string") continue
+          const button = document.createElement("button")
+          button.className = option.value === "reject" ? "btn-reject" : "btn-approve"
+          button.textContent = option.label
+          button.addEventListener("click", () => {
+            removeApprovalPrompt(el)
+            resume(option.value)
+          })
+          actions.appendChild(button)
+        }
         el.appendChild(actions)
         messages.insertBefore(el, typing.parentElement === messages ? typing : statusText)
         messages.scrollTop = messages.scrollHeight
@@ -924,8 +948,12 @@
           pendingTaskId = taskId
           const msgParts = result?.status?.message?.parts ?? []
           const description = partsToText(msgParts)
+          const options =
+            result?.status?.message?.metadata?.["sap.cds.agents.input-required"]?.options
+          const actionRequest = msgParts.find((part) => part.kind === "data")?.data
+            ?.actionRequests?.[0]
           flushPendingThinkingUpdate()
-          addApprovalPrompt(description)
+          addApprovalPrompt(description, options, actionRequest)
           return
         }
 
@@ -1100,7 +1128,8 @@
 
           if (event.artifact?.artifactId?.startsWith("thinking")) {
             const lastChunk = event.lastChunk ?? false
-            if (text) addThinkingStep(event.artifact.artifactId, text, lastChunk)
+            if (text)
+              addThinkingStep(event.artifact.artifactId, text, lastChunk, event.append ?? false)
             return null
           }
 

package/lib/telemetry/chat-tracing.js

@@ -62,7 +62,7 @@ export function _patchChatModelProto(proto) {
     const provider = _resolveProvider()
     const node = opts?.runName || "agent"
     const messages = Array.isArray(input) ? input : undefined
-    const cacheControl = _detectCacheControl(messages)
+    const cacheControl = _detectCacheRequest({ messages, opts, modelOptions: this.options })
     const streaming = this.streaming || this.orchestrationConfig?.streaming || false
     const mAttrs = _metricAttrs(model, node)
 
@@ -162,8 +162,18 @@ function _metricAttrs(model, node) {
   }
 }
 
-/** Detect cache_control presence in messages (set by injectCacheControl in aicore). */
-function _detectCacheControl(messages) {
+function _detectCacheRequest({ messages, opts, modelOptions }) {
+  const params = modelOptions?.params
+  return Boolean(
+    _messagesHaveCacheControl(messages) ||
+    opts?.cache_control ||
+    modelOptions?.promptCaching ||
+    params?.prompt_cache_retention ||
+    params?.prompt_cache_options,
+  )
+}
+
+function _messagesHaveCacheControl(messages) {
   if (!Array.isArray(messages)) return false
   return messages.some((m) => {
     if (!Array.isArray(m.content)) return false

package/lib/telemetry/metrics.js

@@ -53,6 +53,12 @@ export const llmInvocations = meter.createCounter("agent.llm.invocations", {
 export const toolInvocations = meter.createCounter("agent.tool.invocations", {
   description: "Tool invocation count",
 })
+export const hitlGates = meter.createCounter("agent.hitl.gates", {
+  description: "HITL action gates requested",
+})
+export const hitlDecisions = meter.createCounter("agent.hitl.decisions", {
+  description: "HITL decisions by action",
+})
 
 /** Common attributes for all agent metrics */
 export function attrs(srv) {

package/lib/telemetry/mlflow/exporter/DatabricksExporter.js

@@ -11,7 +11,7 @@ export class DatabricksExporter extends MlflowExporter {
   ) {
     const { uc, warehouseId } = this._creds
     const ucPrefix = `${uc.catalog}.${uc.schema}.${uc.tablePrefix}`
-    let url = `/api/4.0/mlflow/traces/${encodeURIComponent(ucPrefix)}/tr-${traceId}/assessments`
+    let url = `/api/4.0/mlflow/traces/${encodeURIComponent(ucPrefix)}/${traceId}/assessments`
     if (warehouseId) url += `?sql_warehouse_id=${encodeURIComponent(warehouseId)}`
     await this._fetch(url, {
       trace_id: traceId,

package/lib/telemetry/mlflow/prompts.js

@@ -71,9 +71,9 @@ export function syncSystemPrompt(messages) {
 export function resolvePromptName(srv) {
   if (!srv?.name) return ""
   const agentDir = resolveAgentDir(srv)
-  if (!agentDir) return srv.name
+  if (!agentDir) return _mlflowName(srv.name)
   const root = cds.root ?? process.cwd()
-  return relative(root, join(agentDir, "AGENTS.md")).replace(/\\/g, "/")
+  return _mlflowName(relative(root, join(agentDir, "AGENTS.md")).replace(/\\/g, "/"))
 }
 
 export function hashPrompt(text) {
@@ -88,6 +88,10 @@ function _description(name) {
   return `System prompt for CAP agent service "${name.split("/")[0]}"`
 }
 
+function _mlflowName(name) {
+  return String(name).replace(/[\\/.:]/g, "_")
+}
+
 function _registrationTags() {
   return [{ key: "mlflow.prompt.is_prompt", value: "true" }]
 }

package/lib/utils/caching.js

@@ -0,0 +1,132 @@
+import cds from "@sap/cds"
+
+export const PROMPT_CACHE_MODEL_PARAMS = Symbol("promptCacheModelParams")
+
+const CACHE_CONTROL_EPHEMERAL = { type: "ephemeral" }
+
+export function isPromptCachingModel(model) {
+  return promptCachingMode(model) !== undefined
+}
+
+export function withPromptCachingParams(model, params) {
+  if (params !== undefined && (typeof params !== "object" || Array.isArray(params))) return params
+  const mode = promptCachingMode(model)
+  const base = params || {}
+  if (mode === "gpt-implicit") {
+    return {
+      ...base,
+      ...(base.prompt_cache_options === undefined
+        ? { prompt_cache_options: { mode: "implicit", ttl: "30m" } }
+        : {}),
+    }
+  }
+  if (mode === "gpt-retention") {
+    return {
+      ...base,
+      ...(base.prompt_cache_retention === undefined ? { prompt_cache_retention: "24h" } : {}),
+    }
+  }
+  return params
+}
+
+export function withPromptCachingMessages(model, messages, opts) {
+  if (promptCachingMode(model) !== "claude") return { messages, opts }
+
+  const cachedMessages = [...messages]
+  addCacheControlToLast(cachedMessages, "system")
+  addCacheControlToLast(cachedMessages, "ai")
+  addCacheControlToLast(cachedMessages, "human")
+
+  if (!opts?.tools?.length) return { messages: cachedMessages, opts }
+  const tools = [...opts.tools]
+  tools[tools.length - 1] = { ...tools[tools.length - 1], cache_control: CACHE_CONTROL_EPHEMERAL }
+  return { messages: cachedMessages, opts: { ...opts, tools } }
+}
+
+export function withPromptCachingOptions(model, opts) {
+  const mode = promptCachingMode(model)
+  if (mode === "nova" && !opts?.cache_control) {
+    return { ...opts, cache_control: CACHE_CONTROL_EPHEMERAL }
+  }
+  if (!isGptCachingMode(mode)) return opts
+
+  const params = opts?.[PROMPT_CACHE_MODEL_PARAMS] || {}
+  if (params.prompt_cache_key !== undefined) return opts
+  return {
+    ...opts,
+    [PROMPT_CACHE_MODEL_PARAMS]: {
+      ...params,
+      prompt_cache_key: opts?.prompt_cache_key ?? buildPromptCacheKey(),
+    },
+  }
+}
+
+function buildPromptCacheKey() {
+  return cds.context?.tenant || ""
+}
+
+function promptCachingMode(model) {
+  const name = String(model || "")
+  if (/anthropic|claude/i.test(name)) return "claude"
+  if (/(?:^|[-_])nova(?:[-_]|$)/i.test(name) || /amazon.*nova/i.test(name)) return "nova"
+
+  const version = gptVersion(name)
+  if (!version) return undefined
+  if (version.major > 5 || (version.major === 5 && version.minor >= 6)) return "gpt-implicit"
+  if ((version.major === 5 && version.minor < 6) || (version.major === 4 && version.minor === 1)) {
+    return "gpt-retention"
+  }
+}
+
+function isGptCachingMode(mode) {
+  return mode === "gpt-implicit" || mode === "gpt-retention"
+}
+
+function gptVersion(model) {
+  const match = model.match(/(?:^|[^a-z0-9])gpt[-_]?([0-9]+)(?:[._-]([0-9]+))?/i)
+  return match && { major: Number(match[1]), minor: Number(match[2] || 0) }
+}
+
+function addCacheControlToLast(messages, type) {
+  for (let index = messages.length - 1; index >= 0; index--) {
+    if (messageType(messages[index]) === type && hasTextContent(messages[index])) {
+      messages[index] = withCacheControl(messages[index])
+      return
+    }
+  }
+}
+
+function messageType(message) {
+  return message._getType?.() || message.type
+}
+
+function hasTextContent(message) {
+  return (
+    (typeof message.content === "string" && message.content.length > 0) ||
+    (Array.isArray(message.content) &&
+      message.content.some((block) => block?.type === "text" && block.text?.length > 0))
+  )
+}
+
+function withCacheControl(message) {
+  const content = message.content
+  if (typeof content === "string") {
+    return cloneMessage(message, [
+      { type: "text", text: content, cache_control: CACHE_CONTROL_EPHEMERAL },
+    ])
+  }
+  if (!Array.isArray(content)) return message
+
+  for (let index = content.length - 1; index >= 0; index--) {
+    if (content[index]?.type === "text") {
+      const nextContent = [...content]
+      nextContent[index] = { ...nextContent[index], cache_control: CACHE_CONTROL_EPHEMERAL }
+      return cloneMessage(message, nextContent)
+    }
+  }
+  return message
+}
+
+function cloneMessage(message, content) {
+  return Object.assign(Object.create(Object.getPrototypeOf(message)), message, { content })
+}

package/lib/utils/message-handling.js

@@ -1,3 +1,17 @@
+import { randomUUID } from "node:crypto"
+
+export function agentMessage(text, data, metadata) {
+  const parts = [{ kind: "text", text }]
+  if (data && typeof data === "object") parts.push({ kind: "data", data })
+  return {
+    kind: "message",
+    messageId: randomUUID(),
+    role: "agent",
+    parts,
+    ...(metadata && { metadata }),
+  }
+}
+
 /**
  * A2A message part utilities — handle both wire formats:
  *

package/lib/utils/utils.js

@@ -10,12 +10,6 @@ function resolveI18n(value, locale) {
   return value
 }
 
-export function getAgentLogger(srv) {
-  const slug = slugified(srv.name)
-  const agentSlug = slug.endsWith("-agent") ? slug : `${slug}-agent`
-  return cds.log("agents:" + srv.name, { label: agentSlug })
-}
-
 /**
  * Mirrors CAP's internal slug rules used for service path generation.
  */
@@ -57,10 +51,11 @@ export function getFilteredEntities(srv) {
     Object.entries(srv.entities || {})
       .filter(
         ([name, entity]) =>
-          !(entity["@cds.autoexposed"] && !entity["@cds.autoexpose"]) &&
+          !entity["@cds.autoexposed"] &&
+          !entity["@cds.api.ignore"] &&
           !name.endsWith("DraftAdministrativeData") &&
-          !name.endsWith(".texts") &&
-          !entity["@cds.api.ignore"],
+          !name.endsWith(".drafts") &&
+          !name.endsWith(".texts"),
       )
       .sort(([a], [b]) => a.localeCompare(b)),
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/agents",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "CDS plugin for building agents",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -41,7 +41,7 @@
   ],
   "dependencies": {
     "@a2a-js/sdk": "^0.3.12",
-    "@cap-js/attachments": "^4",
+    "@cap-js/attachments": ">=3",
     "@cap-js/mcp": "^1.4",
     "@langchain/anthropic": "^1.5.1",
     "@langchain/core": "^1",
@@ -147,7 +147,7 @@
           "image/jpeg"
         ]
       },
-      "pool": {
+      "quotas": {
         "maxConcurrentTasks": 10,
         "maxConcurrentTasksPerUser": 4,
         "maxTasksPerHour": 100,
@@ -159,7 +159,6 @@
         "maxLLMTokensPerTask": 200000,
         "maxLLMCallTimeout": "120s",
         "maxExecutionTimePerTask": "5min",
-        "timeoutGrace": "15s",
         "maxIncomingMessageLength": 5000
       }
     },
@@ -190,7 +189,7 @@
         }
       },
       "[development]": {
-        "llm": "mock"
+        "llm": "auto"
       },
       "[with-claude]": {
         "llm": "anthropic"
@@ -217,6 +216,9 @@
           "_javaHcqlCompat": true
         }
       }
+    },
+    "folders": {
+      "srvs": "srv/*"
     }
   },
   "workspaces": [

package/srv/handlers/chat.js

@@ -73,7 +73,7 @@ function toolCallsFromMessages(messages) {
   for (const msg of messages) {
     if (msg.tool_call_id && msg.type === "tool") {
       const content = typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content)
-      resultById.set(msg.tool_call_id, content)
+      resultById.set(msg.tool_call_id, { content, ...msg })
     }
   }
 
@@ -84,14 +84,14 @@ function toolCallsFromMessages(messages) {
       const raw = resultById.get(tc.id)
       let toolResult
       try {
-        toolResult = raw !== undefined ? JSON.parse(raw) : undefined
+        toolResult = raw?.content !== undefined ? JSON.parse(raw.content) : undefined
       } catch {
-        toolResult = raw
+        toolResult = raw?.content
       }
       const entry = {
         tool: tc.name,
         args: tc.args ?? {},
-        outcome: "success",
+        outcome: raw.status,
         ...(toolResult !== undefined && { result: toolResult }),
       }
       attachCqn(entry)