oh-langfuse 0.1.45 → 0.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "private": false,
   "type": "module",
   "description": "Use npm scripts to configure Claude Code / OpenCode / Codex with Langfuse tracing.",

package/scripts/metrics-utils.mjs

@@ -132,6 +132,14 @@ function collectOpencodeExplicitSkillUsages(value, out = []) {
   }
   if (typeof value !== "object") return out;
 
+  const command = normalizeExplicitSkillCommand(
+    value.command ?? value.commandName ?? value.promptCommand ?? value.properties?.command ?? value.properties?.commandName,
+  );
+  if (command) {
+    const callId = pickString(value.commandID, value.commandId, value.id);
+    out.push({ name: command, skill_namespace: skillNamespace(command), detected_by: "slash_command", skill_call_id: callId });
+  }
+
   const toolName = pickString(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)) {
@@ -155,6 +163,10 @@ export function detectOpencodeSkillUsages(source, knownSkills = []) {
       const key = `call:${usage.skill_call_id}`;
       if (explicitSeen.has(key)) continue;
       explicitSeen.add(key);
+    } else if (usage.detected_by === "slash_command") {
+      const key = `command:${usage.name}`;
+      if (explicitSeen.has(key)) continue;
+      explicitSeen.add(key);
     }
     explicit.push(usage);
   }
@@ -177,6 +189,12 @@ function pickString(...values) {
   return "";
 }
 
+function normalizeExplicitSkillCommand(value) {
+  const command = pickString(value).replace(/^\/+/, "").trim();
+  if (!command) return "";
+  return command.split(/\s+/, 1)[0];
+}
+
 export function countOpencodeToolActivity(source) {
   const payload = source?.properties ?? source?.body ?? source ?? {};
   const part = payload?.part ?? payload?.properties?.part ?? payload;

package/scripts/opencode-langfuse-setup.mjs

@@ -256,10 +256,10 @@ function getPatchedLangfuseDistIndexJs() {
     "  shutdown: async () => {},",
     "});",
     "",
-    "const eventPayload = (event) => event?.properties ?? event?.body ?? event ?? {};",
+    "const eventPayload = (event) => event?.properties ?? event?.data ?? event?.payload ?? event?.body ?? event ?? {};",
     "const eventPart = (event) => {",
     "  const payload = eventPayload(event);",
-    "  return payload.part ?? payload.properties?.part ?? payload;",
+    "  return payload.part ?? payload.properties?.part ?? payload.data?.part ?? payload.payload?.part ?? event?.part ?? event?.data?.part ?? event?.payload?.part ?? payload;",
     "};",
     "const pickEventString = (...values) => {",
     "  for (const value of values) {",
@@ -270,7 +270,7 @@ function getPatchedLangfuseDistIndexJs() {
     "const countOpencodeToolActivity = (event) => {",
     "  const payload = eventPayload(event);",
     "  const part = eventPart(event);",
-    "  const eventType = pickEventString(event?.type, payload?.type);",
+    "  const eventType = pickEventString(event?.name, event?.type, payload?.name, payload?.type);",
     "  const partType = pickEventString(part?.type);",
     "  const toolName = pickEventString(part?.tool, part?.toolName, part?.name, payload?.tool, payload?.toolName, payload?.name);",
     "  const callId = pickEventString(part?.callID, part?.callId, payload?.callID, payload?.callId, part?.id);",
@@ -309,10 +309,15 @@ function getPatchedLangfuseDistIndexJs() {
     "  return out;",
     "};",
     "const skillNamespace = (name) => String(name || '').includes(':') ? String(name).split(':', 1)[0] : '';",
-    "const skillEventType = (detectedBy) => detectedBy === 'tool_call' || detectedBy === 'plugin_event' ? 'invoked' : 'detected';",
+    "const skillEventType = (detectedBy) => detectedBy === 'tool_call' || detectedBy === 'plugin_event' || detectedBy === 'slash_command' ? '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, '\\\\$&');",
+    "const normalizeExplicitSkillCommand = (value) => {",
+    "  const command = pickEventString(value).replace(/^\\/+/, '').trim();",
+    "  if (!command) return '';",
+    "  return command.split(/\\s+/, 1)[0];",
+    "};",
     "",
     "const collectStrings = (value, out = []) => {",
     "  if (value == null) return out;",
@@ -341,6 +346,11 @@ function getPatchedLangfuseDistIndexJs() {
     "    return out;",
     "  }",
     "  if (typeof value !== 'object') return out;",
+    "  const command = normalizeExplicitSkillCommand(value.command ?? value.commandName ?? value.promptCommand ?? value.properties?.command ?? value.properties?.commandName);",
+    "  if (command) {",
+    "    const callId = pickEventString(value.commandID, value.commandId, value.id);",
+    "    out.push({ name: command, skill_namespace: skillNamespace(command), detected_by: 'slash_command', skill_call_id: callId });",
+    "  }",
     "  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)) {",
@@ -363,6 +373,10 @@ function getPatchedLangfuseDistIndexJs() {
     "      const key = `call:${usage.skill_call_id}`;",
     "      if (explicitSeen.has(key)) continue;",
     "      explicitSeen.add(key);",
+    "    } else if (usage.detected_by === 'slash_command') {",
+    "      const key = `command:${usage.name}`;",
+    "      if (explicitSeen.has(key)) continue;",
+    "      explicitSeen.add(key);",
     "    }",
     "    explicit.push(usage);",
     "  }",
@@ -378,9 +392,21 @@ function getPatchedLangfuseDistIndexJs() {
     "  return found;",
     "};",
     "const uniqueSkillNames = (usages) => normalizeSkillNames((usages || []).map((usage) => usage.name));",
+    "const dedupeSkillUsages = (usages) => {",
+    "  const out = [];",
+    "  const seen = new Set();",
+    "  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);",
+    "    out.push(usage);",
+    "  }",
+    "  return out;",
+    "};",
     "const buildSkillUseEvents = (interactionId, skillUsages) => {",
-    "  const total = skillUsages.length;",
-    "  return skillUsages.map((usage, index) => {",
+    "  const usages = dedupeSkillUsages(skillUsages);",
+    "  const total = usages.length;",
+    "  return usages.map((usage, index) => {",
     "    const skillName = String(usage.name || '').trim();",
     "    const detectedBy = String(usage.detected_by || 'metadata');",
     "    return {",
@@ -457,6 +483,7 @@ function getPatchedLangfuseDistIndexJs() {
     "  const knownSkillNames = await collectKnownSkillNames();",
     "  const messageTextById = new Map();",
     "  const skillUsagesByMessageId = new Map();",
+    "  const skillUsagesBySessionId = new Map();",
     "  const toolCallIdsByMessageId = new Map();",
     "  const toolCallIdsBySessionId = new Map();",
     "  const toolResultIdsByMessageId = new Map();",
@@ -495,12 +522,12 @@ function getPatchedLangfuseDistIndexJs() {
     "    void shutdown('process.exit').finally(() => originalExit(code));",
     "  });",
     "",
-    "  const rememberSkillUsages = (messageId, usages) => {",
-    "    if (!messageId || !usages.length) return;",
-    "    let list = skillUsagesByMessageId.get(messageId);",
+    "  const rememberSkillUsages = (map, key, usages) => {",
+    "    if (!key || !usages.length) return;",
+    "    let list = map.get(key);",
     "    if (!list) {",
     "      list = [];",
-    "      skillUsagesByMessageId.set(messageId, list);",
+    "      map.set(key, 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) {",
@@ -523,11 +550,12 @@ function getPatchedLangfuseDistIndexJs() {
     "    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 sessionId = pickEventString(part?.sessionID, part?.sessionId, payload?.sessionID, payload?.sessionId, payload?.session?.id, event?.sessionID, event?.sessionId);",
+    "    const messageId = pickEventString(part?.messageID, part?.messageId, payload?.messageID, payload?.messageId, payload?.message?.id, event?.messageID, event?.messageId);",
     "    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);",
+    "    rememberSkillUsages(skillUsagesByMessageId, messageId, eventSkillUsages);",
+    "    rememberSkillUsages(skillUsagesBySessionId, sessionId, eventSkillUsages);",
     "    const toolActivity = countOpencodeToolActivity(event);",
     "    rememberToolActivity(toolCallIdsByMessageId, messageId, toolActivity, 'toolCallCount');",
     "    rememberToolActivity(toolCallIdsBySessionId, sessionId, toolActivity, 'toolCallCount');",
@@ -535,7 +563,9 @@ function getPatchedLangfuseDistIndexJs() {
     "    rememberToolActivity(toolResultIdsBySessionId, sessionId, toolActivity, 'toolResultCount');",
     "    if (partType === 'text' && messageId && typeof part.text === 'string') {",
     "      messageTextById.set(messageId, part.text);",
-    "      rememberSkillUsages(messageId, detectOpencodeSkillUsages(part.text, knownSkillNames));",
+    "      const textSkillUsages = detectOpencodeSkillUsages(part.text, knownSkillNames);",
+    "      rememberSkillUsages(skillUsagesByMessageId, messageId, textSkillUsages);",
+    "      rememberSkillUsages(skillUsagesBySessionId, sessionId, textSkillUsages);",
     "      return;",
     "    }",
     "    if (partType !== 'step-finish' || !messageId || emittedMessageIds.has(messageId)) return;",
@@ -545,7 +575,7 @@ function getPatchedLangfuseDistIndexJs() {
     "    const tokenAvailable = [tokenMetrics.input, tokenMetrics.output, total, tokenMetrics.cacheRead, tokenMetrics.reasoning].some((value) => value !== undefined);",
     "    const span = metricsTracer.startSpan('Agent Turn');",
     "    const text = messageTextById.get(messageId) || '';",
-    "    const skillUsages = [...(skillUsagesByMessageId.get(messageId) ?? [])];",
+    "    const skillUsages = dedupeSkillUsages([...(skillUsagesByMessageId.get(messageId) ?? []), ...(skillUsagesBySessionId.get(sessionId) ?? [])]);",
     "    const interactionId = `opencode:${userId || \"unknown\"}:${sessionId || \"unknown\"}:${messageId}`;",
     "    const skillUseEvents = buildSkillUseEvents(interactionId, skillUsages);",
     "    const skillNames = uniqueSkillNames(skillUsages);",
@@ -582,6 +612,7 @@ function getPatchedLangfuseDistIndexJs() {
     "    span.end();",
     "    messageTextById.delete(messageId);",
     "    skillUsagesByMessageId.delete(messageId);",
+    "    skillUsagesBySessionId.delete(sessionId);",
     "    toolCallIdsByMessageId.delete(messageId);",
     "    toolCallIdsBySessionId.delete(sessionId);",
     "    toolResultIdsByMessageId.delete(messageId);",
@@ -595,9 +626,9 @@ function getPatchedLangfuseDistIndexJs() {
     "      }",
     "    },",
     "    event: async ({ event }) => {",
-    "      const eventType = event?.type ?? '';",
+    "      const eventType = pickEventString(event?.name, event?.type, eventPayload(event)?.name, eventPayload(event)?.type);",
     "      recordInteractionMetric(event);",
-    '      if (eventType === "session.idle" || eventType === "message.updated" || eventType === "message.part.updated" || eventType === "session.updated") {',
+    '      if (eventType === "session.idle" || eventType === "message.updated" || eventType === "message.part.updated" || eventType === "session.updated" || eventType === "session.idle.1" || eventType === "message.updated.1" || eventType === "message.part.updated.1" || eventType === "session.updated.1") {',
     "        await flush(eventType);",
     "      }",
     '      if (eventType === "server.instance.disposed") {',