oh-langfuse 0.1.29 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-langfuse",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "private": false,
   "type": "module",
   "description": "Use npm scripts to configure Claude Code / OpenCode / Codex with Langfuse tracing.",
@@ -23,6 +23,7 @@
     "scripts/opencode-langfuse-setup.mjs",
     "scripts/resolve-opencode-cli.mjs",
     "scripts/real-self-verify.mjs",
+    "scripts/log-filter-utils.mjs",
     "scripts/metrics-utils.mjs",
     "scripts/update-langfuse-runtime.mjs",
     "scripts/update-utils.mjs",

package/scripts/log-filter-utils.mjs

@@ -0,0 +1,18 @@
+function envShowsWarnings(env = process.env) {
+  return /^(1|true|yes|on)$/i.test(String(env.OH_LANGFUSE_SHOW_WARN || env.LANGFUSE_SHOW_WARN || ""));
+}
+
+export function shouldSuppressAgentLogLine(line, options = {}) {
+  const showWarnings = options.showWarnings ?? envShowsWarnings(options.env);
+  if (showWarnings) return false;
+  const text = String(line || "").trim();
+  return /(?:^|\s)(npm\s+warn|warn(?:ing)?\b|\[warn\])/i.test(text);
+}
+
+export function filterAgentLogText(text, options = {}) {
+  const source = String(text || "");
+  return source
+    .split(/\r?\n/)
+    .filter((line) => line !== "" && !shouldSuppressAgentLogLine(line, options))
+    .join("\n");
+}

package/scripts/metrics-utils.mjs

@@ -132,10 +132,10 @@ export function buildInteractionMetadata(options = {}) {
   const sessionId = String(options.sessionId || options.session_id || "unknown");
   const turnNumber = Number(options.turnNumber ?? options.turn_number ?? 0) || 0;
   const tokenMetrics = normalizeTokenMetrics(options.tokenMetrics);
-  const toolCallCount = Number(options.toolCallCount ?? options.tool_call_count ?? 0) || 0;
-  const toolResultCount = Number(options.toolResultCount ?? options.tool_result_count ?? 0) || 0;
   const skillNames = normalizeSkillNames(options.skillNames ?? options.skill_names);
   const skillUseCount = skillNames.length || Number(options.skillUseCount ?? options.skill_use_count ?? 0) || 0;
+  const toolCallCount = Math.max(Number(options.toolCallCount ?? options.tool_call_count ?? 0) || 0, skillUseCount);
+  const toolResultCount = Math.max(Number(options.toolResultCount ?? options.tool_result_count ?? 0) || 0, skillUseCount);
 
   const metadata = {
     source,
@@ -172,47 +172,14 @@ export function buildInteractionMetadata(options = {}) {
 export function buildOpencodeMetricAttributes(options = {}) {
   const attrs = options.attributes || {};
   const userId = String(options.userId || attrs["oh.langfuse.user_id"] || attrs["langfuse.user.id"] || "");
-  const sessionId = String(attrs["ai.request.headers.x-opencode-session"] || options.sessionId || options.session_id || "unknown");
-  const requestId = String(attrs["ai.request.headers.x-opencode-request"] || options.requestId || options.request_id || "unknown");
-  const spanId = String(options.spanId || attrs["span.id"] || "unknown");
   const provider = attrs["ai.model.provider"] || attrs["gen_ai.system"] || "";
   const modelId = attrs["ai.model.id"] || attrs["gen_ai.request.model"] || attrs["ai.response.model"] || "";
   const model = provider && modelId ? `${provider}/${modelId}` : provider || modelId || null;
-  const skillNames = normalizeSkillNames(options.skillNames ?? options.skill_names);
-  const toolCallCount = Number(options.toolCallCount ?? options.tool_call_count ?? 0) || 0;
-  const toolResultCount = Number(options.toolResultCount ?? options.tool_result_count ?? 0) || 0;
-  const tokenMetrics = normalizeTokenMetrics({
-    input: attrs["ai.usage.inputTokens"] ?? attrs["ai.usage.promptTokens"] ?? attrs["gen_ai.usage.input_tokens"],
-    output: attrs["ai.usage.outputTokens"] ?? attrs["ai.usage.completionTokens"] ?? attrs["gen_ai.usage.output_tokens"],
-    total: attrs["ai.usage.totalTokens"],
-    cacheRead: attrs["ai.usage.cachedInputTokens"] ?? attrs["ai.usage.inputTokenDetails.cacheReadTokens"],
-    reasoning: attrs["ai.usage.reasoningTokens"] ?? attrs["ai.usage.outputTokenDetails.reasoningTokens"],
-  });
-
-  const out = {
+
+  return {
     "langfuse.observation.metadata.source": "opencode",
     "langfuse.observation.metadata.user_id": userId,
-    "langfuse.observation.metadata.session_id": sessionId,
-    "langfuse.observation.metadata.interaction_id": `opencode:${userId || "unknown"}:${sessionId}:${requestId}:${spanId}`,
     "langfuse.observation.metadata.metrics_schema_version": METRICS_SCHEMA_VERSION,
-    "langfuse.observation.metadata.interaction_count": 1,
-    "langfuse.observation.metadata.user_message_count": 1,
-    "langfuse.observation.metadata.assistant_message_count": 1,
-    "langfuse.observation.metadata.tool_call_count": toolCallCount,
-    "langfuse.observation.metadata.tool_result_count": toolResultCount,
-    "langfuse.observation.metadata.skill_use_count": skillNames.length,
-    "langfuse.observation.metadata.token_metrics_available": tokenMetrics.token_metrics_available,
     "langfuse.observation.metadata.model": model,
   };
-
-  if (skillNames.length) {
-    out["langfuse.observation.metadata.skill_names"] = skillNames;
-    out["langfuse.observation.metadata.skill_names_json"] = JSON.stringify(skillNames);
-  }
-
-  for (const key of ["input_tokens", "output_tokens", "total_tokens", "cache_read_tokens", "reasoning_tokens"]) {
-    if (tokenMetrics[key] != null) out[`langfuse.observation.metadata.${key}`] = tokenMetrics[key];
-  }
-
-  return out;
 }

package/scripts/opencode-langfuse-setup.mjs

@@ -3,6 +3,7 @@ import path from "node:path";
 import os from "node:os";
 import { spawn, spawnSync } from "node:child_process";
 import { parseJsonRelaxed, stripBom } from "./json-utils.mjs";
+import { shouldSuppressAgentLogLine } from "./log-filter-utils.mjs";
 
 const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
 const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
@@ -114,7 +115,8 @@ function getPatchedLangfuseDistIndexJs() {
   // This replaces opencode-plugin-langfuse/dist/index.js to inject userId into spans.
   // It is intentionally self-contained (no extra build steps).
   return [
-    'import { LangfuseSpanProcessor } from "@langfuse/otel";',
+    'import { LangfuseSpanProcessor } from "@langfuse/otel";',
+    'import { configureGlobalLogger, LogLevel } from "@langfuse/core";',
     'import { promises as fs } from "node:fs";',
     'import os from "node:os";',
     'import path from "node:path";',
@@ -128,7 +130,7 @@ function getPatchedLangfuseDistIndexJs() {
     '  "config.json"',
     ");",
     "",
-    "const readConfiguredUserId = async () => {",
+    "const readConfiguredUserId = async () => {",
     "  try {",
     '    const content = await fs.readFile(USER_CONFIG_PATH, "utf8");',
     "    // tolerate UTF-8 BOM",
@@ -144,8 +146,14 @@ function getPatchedLangfuseDistIndexJs() {
     "  } catch {",
     "    return undefined;",
     "  }",
-    "};",
-    "",
+    "};",
+    "",
+    "const showWarnings = /^(1|true|yes|on)$/i.test(String(process.env.OH_LANGFUSE_SHOW_WARN || process.env.LANGFUSE_SHOW_WARN || ''));",
+    "if (!showWarnings) {",
+    "  process.env.LANGFUSE_LOG_LEVEL = 'ERROR';",
+    "  configureGlobalLogger({ level: LogLevel.ERROR });",
+    "}",
+    "",
     "const createUserIdSpanProcessor = (userId) => ({",
     "  onStart: (span) => {",
     '    span.setAttribute("langfuse.user.id", userId);',
@@ -218,34 +226,10 @@ function getPatchedLangfuseDistIndexJs() {
     '  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"];',
     "  if (!hasModel || isTool) return false;",
-    '  if (typeof span.updateName === "function") span.updateName("AI Interaction");',
-    '  const sessionId = String(attrs["ai.request.headers.x-opencode-session"] || attrs["session.id"] || "unknown");',
-    '  const requestId = String(attrs["ai.request.headers.x-opencode-request"] || attrs["ai.response.id"] || attrs["ai.operationId"] || "unknown");',
-    '  const spanId = span.spanContext?.().spanId || attrs["span.id"] || "unknown";',
     '  const provider = attrs["ai.model.provider"] || attrs["gen_ai.system"] || "";',
     '  const modelId = attrs["ai.model.id"] || attrs["gen_ai.request.model"] || attrs["ai.response.model"] || "";',
     '  const model = provider && modelId ? `${provider}/${modelId}` : provider || modelId || undefined;',
-    '  const inputTokens = metricNumber(attrs["ai.usage.inputTokens"] ?? attrs["ai.usage.promptTokens"] ?? attrs["gen_ai.usage.input_tokens"]);',
-    '  const outputTokens = metricNumber(attrs["ai.usage.outputTokens"] ?? attrs["ai.usage.completionTokens"] ?? attrs["gen_ai.usage.output_tokens"]);',
-    '  const totalTokens = metricNumber(attrs["ai.usage.totalTokens"]) ?? (inputTokens !== undefined && outputTokens !== undefined ? inputTokens + outputTokens : undefined);',
-    '  const cacheReadTokens = metricNumber(attrs["ai.usage.cachedInputTokens"] ?? attrs["ai.usage.inputTokenDetails.cacheReadTokens"]);',
-    '  const reasoningTokens = metricNumber(attrs["ai.usage.reasoningTokens"] ?? attrs["ai.usage.outputTokenDetails.reasoningTokens"]);',
-    "  const tokenAvailable = [inputTokens, outputTokens, totalTokens, cacheReadTokens, reasoningTokens].some((value) => value !== undefined);",
-    '  writeMetric(span, "session_id", sessionId);',
-    '  writeMetric(span, "interaction_id", `opencode:${userId || "unknown"}:${sessionId}:${requestId}:${spanId}`);',
-    '  writeMetric(span, "interaction_count", 1);',
-    '  writeMetric(span, "user_message_count", 1);',
-    '  writeMetric(span, "assistant_message_count", 1);',
-    '  writeMetric(span, "token_metrics_available", tokenAvailable);',
-    '  writeMetric(span, "tool_call_count", 0);',
-    '  writeMetric(span, "tool_result_count", 0);',
-    '  writeMetric(span, "skill_use_count", 0);',
     '  writeMetric(span, "model", model);',
-    '  writeMetric(span, "input_tokens", inputTokens);',
-    '  writeMetric(span, "output_tokens", outputTokens);',
-    '  writeMetric(span, "total_tokens", totalTokens);',
-    '  writeMetric(span, "cache_read_tokens", cacheReadTokens);',
-    '  writeMetric(span, "reasoning_tokens", reasoningTokens);',
     "  return true;",
     "};",
     "",
@@ -384,11 +368,12 @@ function getPatchedLangfuseDistIndexJs() {
     "",
     "  const userIdFromConfig = await readConfiguredUserId();",
     "  const userIdEnv = process.env.LANGFUSE_USER_ID?.trim();",
-    "  const userId = userIdFromConfig || userIdEnv;",
-    "",
-    "  const log = (level, message) => {",
-    '    client.app.log({ body: { service: "langfuse-otel", level, message } });',
-    "  };",
+    "  const userId = userIdFromConfig || userIdEnv;",
+    "",
+    "  const log = (level, message) => {",
+    "    if (level === 'warn' && !showWarnings) return;",
+    '    client.app.log({ body: { service: "langfuse-otel", level, message } });',
+    "  };",
     "",
     "  if (!publicKey || !secretKey) {",
     '    log("warn", "Missing LANGFUSE_PUBLIC_KEY or LANGFUSE_SECRET_KEY - tracing disabled");',
@@ -499,8 +484,8 @@ function getPatchedLangfuseDistIndexJs() {
     "    const span = metricsTracer.startSpan('AI Interaction');",
     "    const text = messageTextById.get(messageId) || '';",
     "    const skillNames = [...new Set([...(skillNamesByMessageId.get(messageId) ?? []), ...(skillNamesBySessionId.get(sessionId) ?? [])])];",
-    "    const toolCallCount = new Set([...(toolCallIdsByMessageId.get(messageId) ?? []), ...(toolCallIdsBySessionId.get(sessionId) ?? [])]).size;",
-    "    const toolResultCount = new Set([...(toolResultIdsByMessageId.get(messageId) ?? []), ...(toolResultIdsBySessionId.get(sessionId) ?? [])]).size;",
+    "    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);",
     '    span.setAttribute("oh.langfuse.source", "opencode");',
     '    span.setAttribute("oh.langfuse.user_id", userId || "");',
     '    span.setAttribute("oh.langfuse.metrics_schema_version", "1.0");',
@@ -700,7 +685,11 @@ function runNpmInstallCapture(npmArgs) {
     child.stderr?.on("data", (chunk) => {
       const text = String(chunk);
       stderr += text;
-      process.stderr.write(text);
+      const filtered = text
+        .split(/(\r?\n)/)
+        .filter((part) => part === "\n" || part === "\r\n" || !shouldSuppressAgentLogLine(part))
+        .join("");
+      if (filtered) process.stderr.write(filtered);
     });
     child.on("error", (error) => {
       clearInterval(timer);