oh-langfuse 0.1.41 → 0.1.43

package/scripts/opencode-langfuse-setup.mjs

@@ -170,13 +170,14 @@ function getPatchedLangfuseDistIndexJs() {
     '    span.setAttribute("ai.telemetry.metadata.userId", userId);',
     '    span.setAttribute("oh.langfuse.source", "opencode");',
     '    span.setAttribute("oh.langfuse.user_id", userId);',
-    '    span.setAttribute("oh.langfuse.metrics_schema_version", "1.0");',
+    '    span.setAttribute("oh.langfuse.metrics_schema_version", "1.1");',
     '    span.setAttribute("langfuse.trace.metadata.langfuse_user_id", userId);',
     '    span.setAttribute("langfuse.observation.metadata.langfuse_user_id", userId);',
     '    span.setAttribute("langfuse.metadata.langfuse_user_id", userId);',
     '    span.setAttribute("langfuse.observation.metadata.source", "opencode");',
+    '    span.setAttribute("langfuse.observation.metadata.agent", "opencode");',
     '    span.setAttribute("langfuse.observation.metadata.user_id", userId);',
-    '    span.setAttribute("langfuse.observation.metadata.metrics_schema_version", "1.0");',
+    '    span.setAttribute("langfuse.observation.metadata.metrics_schema_version", "1.1");',
     "  },",
     "  onEnd: (span) => {",
     '    if (typeof span.setAttribute !== "function") return;',
@@ -185,13 +186,14 @@ function getPatchedLangfuseDistIndexJs() {
     '    span.setAttribute("ai.telemetry.metadata.userId", userId);',
     '    span.setAttribute("oh.langfuse.source", "opencode");',
     '    span.setAttribute("oh.langfuse.user_id", userId);',
-    '    span.setAttribute("oh.langfuse.metrics_schema_version", "1.0");',
+    '    span.setAttribute("oh.langfuse.metrics_schema_version", "1.1");',
     '    span.setAttribute("langfuse.trace.metadata.langfuse_user_id", userId);',
     '    span.setAttribute("langfuse.observation.metadata.langfuse_user_id", userId);',
     '    span.setAttribute("langfuse.metadata.langfuse_user_id", userId);',
     '    span.setAttribute("langfuse.observation.metadata.source", "opencode");',
+    '    span.setAttribute("langfuse.observation.metadata.agent", "opencode");',
     '    span.setAttribute("langfuse.observation.metadata.user_id", userId);',
-    '    span.setAttribute("langfuse.observation.metadata.metrics_schema_version", "1.0");',
+    '    span.setAttribute("langfuse.observation.metadata.metrics_schema_version", "1.1");',
     "  },",
     "  forceFlush: async () => {},",
     "  shutdown: async () => {},",
@@ -227,10 +229,11 @@ function getPatchedLangfuseDistIndexJs() {
     "const writeOpencodeMetricAttributes = (span, userId) => {",
     "  const attrs = span.attributes ?? {};",
     '  writeSpanAttribute(span, "oh.langfuse.source", "opencode");',
-    '  writeSpanAttribute(span, "oh.langfuse.metrics_schema_version", "1.0");',
+    '  writeSpanAttribute(span, "oh.langfuse.metrics_schema_version", "1.1");',
     '  if (userId) writeSpanAttribute(span, "oh.langfuse.user_id", userId);',
     '  writeMetric(span, "source", "opencode");',
-    '  writeMetric(span, "metrics_schema_version", "1.0");',
+    '  writeMetric(span, "agent", "opencode");',
+    '  writeMetric(span, "metrics_schema_version", "1.1");',
     '  if (userId) writeMetric(span, "user_id", userId);',
     '  const hasModel = attrs["ai.model.id"] || attrs["ai.model.provider"] || attrs["gen_ai.request.model"];',
     '  const isTool = attrs["ai.toolCall.name"] || attrs["ai.toolCall.id"];',
@@ -305,7 +308,9 @@ function getPatchedLangfuseDistIndexJs() {
     "  }",
     "  return out;",
     "};",
-    "const MAX_SKILL_USE_SPANS_PER_INTERACTION = 20;",
+    "const skillNamespace = (name) => String(name || '').includes(':') ? String(name).split(':', 1)[0] : '';",
+    "const skillEventType = (detectedBy) => detectedBy === 'tool_call' || detectedBy === 'plugin_event' ? 'invoked' : 'detected';",
+    "const skillIdSegment = (name) => String(name || 'unknown').trim().replace(/[^A-Za-z0-9_.:-]+/g, '-').replace(/^-+|-+$/g, '').slice(0, 96) || 'unknown';",
     "",
     "const escapeRegExp = (value) => String(value).replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&');",
     "",
@@ -329,17 +334,69 @@ function getPatchedLangfuseDistIndexJs() {
     "  return out;",
     "};",
     "",
-    "const detectOpencodeSkillNames = (source, knownSkills = []) => {",
+    "const collectExplicitSkillUsages = (value, out = []) => {",
+    "  if (value == null) return out;",
+    "  if (Array.isArray(value)) {",
+    "    for (const item of value) collectExplicitSkillUsages(item, out);",
+    "    return out;",
+    "  }",
+    "  if (typeof value !== 'object') return out;",
+    "  const toolName = pickEventString(value.tool, value.toolName, value.name).toLowerCase();",
+    "  const input = value.input ?? value.state?.input ?? value.properties?.input;",
+    "  if (toolName === 'skill' && input && typeof input === 'object' && !Array.isArray(input)) {",
+    "    const skill = pickEventString(input.skill_name, input.skill, input.name);",
+    "    const callId = pickEventString(value.callID, value.callId, value.id, value.toolCallID, value.toolCallId);",
+    "    if (skill) out.push({ name: skill, skill_namespace: skillNamespace(skill), detected_by: 'tool_call', skill_call_id: callId });",
+    "  }",
+    "  for (const item of Object.values(value)) collectExplicitSkillUsages(item, out);",
+    "  return out;",
+    "};",
+    "",
+    "const detectOpencodeSkillUsages = (source, knownSkills = []) => {",
     "  const skills = normalizeSkillNames(knownSkills);",
     "  if (skills.length === 0) return [];",
-    "  const haystack = collectStrings(source).join('\\n');",
     "  const found = [];",
-    "  for (const skillName of skills) {",
-    "    const pattern = new RegExp(`(^|[^A-Za-z0-9_-])${escapeRegExp(skillName)}([^A-Za-z0-9_-]|$)`, 'i');",
-    "    if (pattern.test(haystack)) found.push(skillName);",
+    "  const explicitSeen = new Set();",
+    "  const explicit = [];",
+    "  for (const usage of collectExplicitSkillUsages(source).filter((item) => skills.includes(item.name))) {",
+    "    if (usage.skill_call_id) {",
+    "      const key = `call:${usage.skill_call_id}`;",
+    "      if (explicitSeen.has(key)) continue;",
+    "      explicitSeen.add(key);",
+    "    }",
+    "    explicit.push(usage);",
+    "  }",
+    "  found.push(...explicit);",
+    "  const haystack = collectStrings(source).join('\\n');",
+    "  const pathSeen = new Set();",
+    "  for (const match of haystack.matchAll(/(?:^|[\"'\\s])(?:[A-Za-z]:)?[^\"'\\n\\r]*[\\\\/]+([^\\\\/\"'\\n\\r]+)[\\\\/]+SKILL\\.md(?=$|[\"'\\s])/gi)) {",
+    "    const skillName = match[1];",
+    "    if (!skills.includes(skillName) || explicit.some((usage) => usage.name === skillName) || pathSeen.has(skillName)) continue;",
+    "    pathSeen.add(skillName);",
+    "    found.push({ name: skillName, skill_namespace: skillNamespace(skillName), detected_by: 'skill_file_path', skill_call_id: '' });",
     "  }",
     "  return found;",
     "};",
+    "const uniqueSkillNames = (usages) => normalizeSkillNames((usages || []).map((usage) => usage.name));",
+    "const buildSkillUseEvents = (interactionId, skillUsages) => {",
+    "  const total = skillUsages.length;",
+    "  return skillUsages.map((usage, index) => {",
+    "    const skillName = String(usage.name || '').trim();",
+    "    const detectedBy = String(usage.detected_by || 'metadata');",
+    "    return {",
+    "      skill_use_id: `${interactionId}:skill:${index + 1}:${skillIdSegment(skillName)}`,",
+    "      skill_use_index: index + 1,",
+    "      skill_use_count_in_interaction: total,",
+    "      skill_event_type: skillEventType(detectedBy),",
+    "      skill_trigger: 'unknown',",
+    "      skill_name: skillName,",
+    "      skill_use_count: 1,",
+    "      skill_namespace: usage.skill_namespace || skillNamespace(skillName),",
+    "      detected_by: detectedBy,",
+    "      ...(usage.skill_call_id ? { skill_call_id: usage.skill_call_id } : {}),",
+    "    };",
+    "  }).filter((event) => event.skill_name);",
+    "};",
     "",
     "const collectKnownSkillNames = async () => {",
     "  const dirs = [",
@@ -399,7 +456,7 @@ function getPatchedLangfuseDistIndexJs() {
     "  const metricsTracer = trace.getTracer('oh-langfuse-opencode-metrics');",
     "  const knownSkillNames = await collectKnownSkillNames();",
     "  const messageTextById = new Map();",
-    "  const skillNamesByMessageId = new Map();",
+    "  const skillUsagesByMessageId = new Map();",
     "  const toolCallIdsByMessageId = new Map();",
     "  const toolCallIdsBySessionId = new Map();",
     "  const toolResultIdsByMessageId = new Map();",
@@ -438,14 +495,20 @@ function getPatchedLangfuseDistIndexJs() {
     "    void shutdown('process.exit').finally(() => originalExit(code));",
     "  });",
     "",
-    "  const rememberSkillNames = (messageId, names) => {",
-    "    if (!messageId || !names.length) return;",
-    "    let set = skillNamesByMessageId.get(messageId);",
-    "    if (!set) {",
-    "      set = new Set();",
-    "      skillNamesByMessageId.set(messageId, set);",
+    "  const rememberSkillUsages = (messageId, usages) => {",
+    "    if (!messageId || !usages.length) return;",
+    "    let list = skillUsagesByMessageId.get(messageId);",
+    "    if (!list) {",
+    "      list = [];",
+    "      skillUsagesByMessageId.set(messageId, list);",
+    "    }",
+    "    const seen = new Set(list.map((usage) => usage.skill_call_id ? `call:${usage.skill_call_id}` : `${usage.name}:${usage.detected_by}`));",
+    "    for (const usage of usages) {",
+    "      const key = usage.skill_call_id ? `call:${usage.skill_call_id}` : `${usage.name}:${usage.detected_by}`;",
+    "      if (seen.has(key)) continue;",
+    "      seen.add(key);",
+    "      list.push(usage);",
     "    }",
-    "    for (const name of names) set.add(name);",
     "  };",
     "  const rememberToolActivity = (map, key, activity, kind) => {",
     "    if (!key || !activity?.[kind]) return;",
@@ -456,33 +519,15 @@ function getPatchedLangfuseDistIndexJs() {
     "    }",
     "    set.add(activity.toolCallId || `${kind}:${set.size + 1}`);",
     "  };",
-    "  const emitSkillUseSpans = ({ skillNames, sessionId, messageId, interactionId }) => {",
-    "    for (const skillName of skillNames.slice(0, MAX_SKILL_USE_SPANS_PER_INTERACTION)) {",
-    "      const span = metricsTracer.startSpan('Skill Use');",
-    '      span.setAttribute("oh.langfuse.source", "opencode");',
-    '      span.setAttribute("oh.langfuse.user_id", userId || "");',
-    '      span.setAttribute("oh.langfuse.metrics_schema_version", "1.0");',
-    '      span.setAttribute("langfuse.observation.metadata.source", "opencode");',
-    '      span.setAttribute("langfuse.observation.metadata.user_id", userId || "");',
-    '      span.setAttribute("langfuse.observation.metadata.session_id", sessionId || "unknown");',
-    '      span.setAttribute("langfuse.observation.metadata.message_id", messageId || "unknown");',
-    '      span.setAttribute("langfuse.observation.metadata.interaction_id", interactionId);',
-    '      span.setAttribute("langfuse.observation.metadata.metrics_schema_version", "1.0");',
-    '      span.setAttribute("langfuse.observation.metadata.skill_name", skillName);',
-    '      span.setAttribute("langfuse.observation.metadata.skill_use_count", 1);',
-    "      span.end();",
-    "    }",
-    "  };",
-    "",
     "  const recordInteractionMetric = (event) => {",
     "    const payload = eventPayload(event);",
     "    const part = eventPart(event);",
     "    const partType = part?.type ?? '';",
     "    const sessionId = pickEventString(part?.sessionID, part?.sessionId, payload?.sessionID, payload?.sessionId, payload?.session?.id);",
     "    const messageId = pickEventString(part?.messageID, part?.messageId, payload?.messageID, payload?.messageId, payload?.message?.id);",
-    "    const skillDetectionSources = [part?.state?.input, part?.input, payload?.input, part?.state?.metadata, payload?.metadata, part?.state?.file, part?.file];",
-    "    const eventSkillNames = detectOpencodeSkillNames(skillDetectionSources, knownSkillNames);",
-    "    rememberSkillNames(messageId, eventSkillNames);",
+    "    const skillDetectionSources = [part, payload, part?.state?.input, part?.input, payload?.input, part?.state?.metadata, payload?.metadata, part?.state?.file, part?.file];",
+    "    const eventSkillUsages = detectOpencodeSkillUsages(skillDetectionSources, knownSkillNames);",
+    "    rememberSkillUsages(messageId, eventSkillUsages);",
     "    const toolActivity = countOpencodeToolActivity(event);",
     "    rememberToolActivity(toolCallIdsByMessageId, messageId, toolActivity, 'toolCallCount');",
     "    rememberToolActivity(toolCallIdsBySessionId, sessionId, toolActivity, 'toolCallCount');",
@@ -490,7 +535,7 @@ function getPatchedLangfuseDistIndexJs() {
     "    rememberToolActivity(toolResultIdsBySessionId, sessionId, toolActivity, 'toolResultCount');",
     "    if (partType === 'text' && messageId && typeof part.text === 'string') {",
     "      messageTextById.set(messageId, part.text);",
-    "      rememberSkillNames(messageId, detectOpencodeSkillNames(part.text, knownSkillNames));",
+    "      rememberSkillUsages(messageId, detectOpencodeSkillUsages(part.text, knownSkillNames));",
     "      return;",
     "    }",
     "    if (partType !== 'step-finish' || !messageId || emittedMessageIds.has(messageId)) return;",
@@ -498,30 +543,36 @@ function getPatchedLangfuseDistIndexJs() {
     "    const tokenMetrics = tokenMetricsFromPart(part);",
     "    const total = tokenMetrics.total ?? (tokenMetrics.input !== undefined && tokenMetrics.output !== undefined ? tokenMetrics.input + tokenMetrics.output : undefined);",
     "    const tokenAvailable = [tokenMetrics.input, tokenMetrics.output, total, tokenMetrics.cacheRead, tokenMetrics.reasoning].some((value) => value !== undefined);",
-    "    const span = metricsTracer.startSpan('AI Interaction');",
+    "    const span = metricsTracer.startSpan('Agent Turn');",
     "    const text = messageTextById.get(messageId) || '';",
-    "    const skillNames = [...(skillNamesByMessageId.get(messageId) ?? [])];",
-    "    const toolCallCount = Math.max(new Set([...(toolCallIdsByMessageId.get(messageId) ?? []), ...(toolCallIdsBySessionId.get(sessionId) ?? [])]).size, skillNames.length);",
-    "    const toolResultCount = Math.max(new Set([...(toolResultIdsByMessageId.get(messageId) ?? []), ...(toolResultIdsBySessionId.get(sessionId) ?? [])]).size, skillNames.length);",
+    "    const skillUsages = [...(skillUsagesByMessageId.get(messageId) ?? [])];",
+    "    const interactionId = `opencode:${userId || \"unknown\"}:${sessionId || \"unknown\"}:${messageId}`;",
+    "    const skillUseEvents = buildSkillUseEvents(interactionId, skillUsages);",
+    "    const skillNames = uniqueSkillNames(skillUsages);",
+    "    const skillNamesAll = skillUseEvents.map((event) => event.skill_name);",
+    "    const toolCallCount = Math.max(new Set([...(toolCallIdsByMessageId.get(messageId) ?? []), ...(toolCallIdsBySessionId.get(sessionId) ?? [])]).size, skillUseEvents.length);",
+    "    const toolResultCount = Math.max(new Set([...(toolResultIdsByMessageId.get(messageId) ?? []), ...(toolResultIdsBySessionId.get(sessionId) ?? [])]).size, skillUseEvents.length);",
     '    span.setAttribute("oh.langfuse.source", "opencode");',
     '    span.setAttribute("oh.langfuse.user_id", userId || "");',
-    '    span.setAttribute("oh.langfuse.metrics_schema_version", "1.0");',
+    '    span.setAttribute("oh.langfuse.metrics_schema_version", "1.1");',
     '    span.setAttribute("langfuse.observation.metadata.source", "opencode");',
+    '    span.setAttribute("langfuse.observation.metadata.agent", "opencode");',
     '    span.setAttribute("langfuse.observation.metadata.user_id", userId || "");',
     '    span.setAttribute("langfuse.observation.metadata.session_id", sessionId || "unknown");',
-    '    const interactionId = `opencode:${userId || "unknown"}:${sessionId || "unknown"}:${messageId}`;',
     '    span.setAttribute("langfuse.observation.metadata.interaction_id", interactionId);',
-    '    span.setAttribute("langfuse.observation.metadata.metrics_schema_version", "1.0");',
+    '    span.setAttribute("langfuse.observation.metadata.metrics_schema_version", "1.1");',
     '    span.setAttribute("langfuse.observation.metadata.interaction_count", 1);',
     '    span.setAttribute("langfuse.observation.metadata.user_message_count", 1);',
     '    span.setAttribute("langfuse.observation.metadata.assistant_message_count", 1);',
     '    span.setAttribute("langfuse.observation.metadata.token_metrics_available", tokenAvailable);',
     '    span.setAttribute("langfuse.observation.metadata.tool_call_count", toolCallCount);',
     '    span.setAttribute("langfuse.observation.metadata.tool_result_count", toolResultCount);',
-    '    span.setAttribute("langfuse.observation.metadata.skill_use_count", skillNames.length);',
+    '    span.setAttribute("langfuse.observation.metadata.skill_use_count", skillUseEvents.length);',
+    '    span.setAttribute("langfuse.observation.metadata.unique_skill_count", skillNames.length);',
+    '    span.setAttribute("langfuse.observation.metadata.repeated_skill_count", Math.max(0, skillUseEvents.length - skillNames.length));',
     '    if (skillNames.length) span.setAttribute("langfuse.observation.metadata.skill_names", skillNames);',
-    '    if (skillNames.length) span.setAttribute("langfuse.observation.metadata.skill_names_json", JSON.stringify(skillNames));',
     '    if (skillNames.length) span.setAttribute("langfuse.observation.metadata.skill_names_csv", skillNames.join(","));',
+    '    if (skillNamesAll.length) span.setAttribute("langfuse.observation.metadata.skill_names_all", skillNamesAll);',
     '    if (tokenMetrics.input !== undefined) span.setAttribute("langfuse.observation.metadata.input_tokens", tokenMetrics.input);',
     '    if (tokenMetrics.output !== undefined) span.setAttribute("langfuse.observation.metadata.output_tokens", tokenMetrics.output);',
     '    if (total !== undefined) span.setAttribute("langfuse.observation.metadata.total_tokens", total);',
@@ -529,9 +580,8 @@ function getPatchedLangfuseDistIndexJs() {
     '    if (tokenMetrics.reasoning !== undefined) span.setAttribute("langfuse.observation.metadata.reasoning_tokens", tokenMetrics.reasoning);',
     '    if (text) span.setAttribute("langfuse.observation.metadata.output_text_preview", text.slice(0, 512));',
     "    span.end();",
-    "    emitSkillUseSpans({ skillNames, sessionId, messageId, interactionId });",
     "    messageTextById.delete(messageId);",
-    "    skillNamesByMessageId.delete(messageId);",
+    "    skillUsagesByMessageId.delete(messageId);",
     "    toolCallIdsByMessageId.delete(messageId);",
     "    toolCallIdsBySessionId.delete(sessionId);",
     "    toolResultIdsByMessageId.delete(messageId);",
@@ -597,6 +647,18 @@ function shQuote(s) {
   return `'${String(s).replace(/'/g, "'\"'\"'")}'`;
 }
 
+function autoUpdateRuntimePath() {
+  return path.join(rootDir, "scripts", "auto-update-runtime.mjs");
+}
+
+function windowsAutoUpdateCommand(target) {
+  return `call ${cmdQuote(process.execPath)} ${cmdQuote(autoUpdateRuntimePath())} ${target} --skip-check`;
+}
+
+function unixAutoUpdateCommand(target) {
+  return `${shQuote(process.execPath)} ${shQuote(autoUpdateRuntimePath())} ${target} --skip-check || true`;
+}
+
 function writeWindowsUpdateCheckScript(dir) {
   if (process.platform !== "win32") return null;
   ensureDir(dir);
@@ -624,14 +686,13 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
   ensureDir(shimDir);
   if (process.platform === "win32") {
     const shim = path.join(shimDir, "opencode.cmd");
-    writeWindowsUpdateCheckScript(shimDir);
     const cmd = ["@echo off", "REM Auto-generated by scripts/opencode-langfuse-setup.mjs"];
     cmd.push("set OH_LANGFUSE_OPENCODE_SHIM=1");
     cmd.push(`set LANGFUSE_PUBLIC_KEY=${publicKey}`);
     cmd.push(`set LANGFUSE_SECRET_KEY=${secretKey}`);
     cmd.push(`set LANGFUSE_BASEURL=${baseUrl}`);
     if (userId) cmd.push(`set LANGFUSE_USER_ID=${userId}`);
-    cmd.push('powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0oh-langfuse-opencode-update-check.ps1"');
+    cmd.push(windowsAutoUpdateCommand("opencode"));
     cmd.push(`call ${cmdQuote(realOpencodeCli)} %*`);
     cmd.push("exit /b %ERRORLEVEL%");
     fs.writeFileSync(shim, cmd.join("\r\n") + "\r\n", "utf8");
@@ -648,9 +709,7 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     `export LANGFUSE_SECRET_KEY=${shQuote(secretKey)}`,
     `export LANGFUSE_BASEURL=${shQuote(baseUrl)}`,
     userId ? `export LANGFUSE_USER_ID=${shQuote(userId)}` : null,
-    'if command -v npx >/dev/null 2>&1; then',
-    '  npx -y oh-langfuse@latest auto-update opencode --skip-check --notify-only || true',
-    "fi",
+    unixAutoUpdateCommand("opencode"),
     `exec ${shQuote(realOpencodeCli)} "$@"`,
     ""
   ].filter(Boolean);
@@ -670,9 +729,7 @@ function writeUnixLauncherSh(opencodeDir, { publicKey, secretKey, baseUrl, userI
     `export LANGFUSE_SECRET_KEY=${shQuote(secretKey)}`,
     `export LANGFUSE_BASEURL=${shQuote(baseUrl)}`,
     userId ? `export LANGFUSE_USER_ID=${shQuote(userId)}` : null,
-    'if command -v npx >/dev/null 2>&1; then',
-    '  npx -y oh-langfuse@latest auto-update opencode --skip-check --notify-only || true',
-    "fi",
+    unixAutoUpdateCommand("opencode"),
     'if [ -x "$HOME/.opencode/bin/opencode" ]; then',
     '  exec "$HOME/.opencode/bin/opencode" "$@"',
     "fi",

package/scripts/real-self-verify.mjs

@@ -214,7 +214,7 @@ function triggerOpenCode(prompt, args, env) {
 }
 
 function triggerCodex(prompt, args, env) {
-  const cmd = String(args.codexCmd || findOnPath(process.platform === "win32" ? ["codex.cmd", "codex"] : ["codex"]));
+  const cmd = String(args.codexCmd || findOnPath(process.platform === "win32" ? ["codex.cmd", "codex.exe", "codex"] : ["codex"]));
   if (!cmd) return { status: 127, stdout: "", stderr: "Codex CLI not found. Set --codexCmd=<path>.", command: "codex", args: [] };
   const candidates = [
     ["exec", prompt],
@@ -339,8 +339,8 @@ function hasMetadataKey(item, key) {
   return metadataValue(item, key) !== undefined;
 }
 
-function isAiInteractionObservation(item) {
-  if (item?.name === "AI Interaction" || metadataValue(item, "interaction_count") === 1 || metadataValue(item, "interaction_count") === "1") {
+function isAgentTurnObservation(item) {
+  if (item?.name === "Agent Turn" || metadataValue(item, "interaction_count") === 1 || metadataValue(item, "interaction_count") === "1") {
     return true;
   }
   const metadata = item?.metadata || {};
@@ -371,9 +371,14 @@ async function verifyMetricObservations(config, found, { since, target }) {
     observations = found.item.observations.filter((item) => typeof item === "object");
   }
 
-  const interactions = observations.filter(isAiInteractionObservation);
+  const skillUseObservations = observations.filter((item) => item?.name === "Skill Use");
+  if (skillUseObservations.length) {
+    throw new Error(`Metric verification failed for ${target}: Skill Use observations should not be emitted anymore, found ${skillUseObservations.length}.`);
+  }
+
+  const interactions = observations.filter(isAgentTurnObservation);
   if (!interactions.length) {
-    throw new Error(`Metric verification failed for ${target}: AI Interaction observation was not found for trace ${traceId || found.id}.`);
+    throw new Error(`Metric verification failed for ${target}: Agent Turn observation was not found for trace ${traceId || found.id}.`);
   }
 
   const byInteractionId = new Map();
@@ -382,12 +387,12 @@ async function verifyMetricObservations(config, found, { since, target }) {
       ? directMetadataValue(item, "interaction_id") || metadataValue(item, "interaction_id")
       : metadataValue(item, "interaction_id");
     if (!interactionId) {
-      throw new Error(`Metric verification failed for ${target}: AI Interaction is missing interaction_id.`);
+      throw new Error(`Metric verification failed for ${target}: Agent Turn is missing interaction_id.`);
     }
     byInteractionId.set(interactionId, (byInteractionId.get(interactionId) || 0) + 1);
     for (const key of ["user_id", "token_metrics_available", "tool_call_count", "skill_use_count", "metrics_schema_version"]) {
       if (!hasMetadataKey(item, key)) {
-        throw new Error(`Metric verification failed for ${target}: AI Interaction is missing ${key}.`);
+        throw new Error(`Metric verification failed for ${target}: Agent Turn is missing ${key}.`);
       }
     }
     if (target === "opencode") {
@@ -554,7 +559,7 @@ async function main() {
     const found = await pollLangfuse(config, marker, { ...args, since, target });
     console.log(`[OK] Langfuse marker found for ${target}: ${found.kind} ${found.id || ""}`.trim());
     const metrics = await verifyMetricObservations(config, found, { since, target });
-    console.log(`[OK] Langfuse metrics found for ${target}: AI Interaction x${metrics.interactionCount}`);
+    console.log(`[OK] Langfuse metrics found for ${target}: Agent Turn x${metrics.interactionCount}`);
     results.push({ target, marker, langfuse: { kind: found.kind, id: found.id || "", traceId: metrics.traceId }, metrics });
   }