oh-langfuse 0.1.69 → 0.1.71

package/package.json

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

package/scripts/opencode-langfuse-setup.mjs

@@ -413,16 +413,42 @@ function getPatchedLangfuseDistIndexJs() {
     "    toolCallId: callId || '',",
     "  };",
     "};",
-    "const tokenMetricsFromPart = (part) => {",
-    "  const tokens = part?.tokens ?? part?.usage ?? {};",
-    "  return {",
-    "    input: metricNumber(tokens.input ?? tokens.input_tokens ?? tokens.inputTokens),",
+    "const tokenMetricsFromPart = (part) => {",
+    "  const tokens = part?.tokens ?? part?.usage ?? {};",
+    "  return {",
+    "    input: metricNumber(tokens.input ?? tokens.input_tokens ?? tokens.inputTokens),",
     "    output: metricNumber(tokens.output ?? tokens.output_tokens ?? tokens.outputTokens),",
     "    total: metricNumber(tokens.total ?? tokens.total_tokens ?? tokens.totalTokens),",
     "    cacheRead: metricNumber(tokens.cache?.read ?? tokens.cacheRead ?? tokens.cache_read_tokens ?? tokens.cachedInputTokens),",
-    "    reasoning: metricNumber(tokens.reasoning ?? tokens.reasoning_tokens ?? tokens.reasoningTokens),",
-    "  };",
-    "};",
+    "    reasoning: metricNumber(tokens.reasoning ?? tokens.reasoning_tokens ?? tokens.reasoningTokens),",
+    "  };",
+    "};",
+    "const OBSERVATION_TEXT_LIMIT = 20000;",
+    "const limitObservationText = (text) => {",
+    "  const normalized = typeof text === 'string' ? text.trim() : '';",
+    "  if (!normalized) return '';",
+    "  return normalized.length > OBSERVATION_TEXT_LIMIT ? `${normalized.slice(0, OBSERVATION_TEXT_LIMIT)}\\n...[truncated]` : normalized;",
+    "};",
+    "const textFromContent = (value, depth = 0) => {",
+    "  if (depth > 6 || value === null || value === undefined) return '';",
+    "  if (typeof value === 'string') return value.trim();",
+    "  if (Array.isArray(value)) return value.map((item) => textFromContent(item, depth + 1)).filter(Boolean).join('\\n').trim();",
+    "  if (typeof value !== 'object') return '';",
+    "  for (const key of ['text', 'content', 'prompt', 'message', 'input', 'output', 'parts']) {",
+    "    const text = textFromContent(value[key], depth + 1);",
+    "    if (text) return text;",
+    "  }",
+    "  return '';",
+    "};",
+    "const promptFromArgv = () => {",
+    "  const args = process.argv.slice(2);",
+    "  if (!args.includes('run')) return '';",
+    "  for (let i = args.length - 1; i >= 0; i -= 1) {",
+    "    const arg = args[i];",
+    "    if (typeof arg === 'string' && arg.trim() && !arg.startsWith('-')) return arg.trim();",
+    "  }",
+    "  return '';",
+    "};",
     "",
     "const normalizeSkillNames = (names) => {",
     "  if (!Array.isArray(names)) return [];",
@@ -643,11 +669,14 @@ function getPatchedLangfuseDistIndexJs() {
     "  const sdkStartPromise = Promise.resolve().then(() => sdk.start()).catch((err) => {",
     '    log("warn", `OTEL SDK start failed: ${err?.message ?? err}`);',
     "  });",
-    "  const getMetricsTracer = () => trace.getTracer('oh-langfuse-opencode-metrics');",
-    "  const knownSkillNames = await collectKnownSkillNames();",
-    "  const startupSkillUsages = detectOpencodeSkillUsages(process.argv.join('\\n'), knownSkillNames);",
-    "  const messageTextById = new Map();",
-    "  const skillUsagesByMessageId = new Map();",
+    "  const getMetricsTracer = () => trace.getTracer('oh-langfuse-opencode-metrics');",
+    "  const knownSkillNames = await collectKnownSkillNames();",
+    "  const startupSkillUsages = detectOpencodeSkillUsages(process.argv.join('\\n'), knownSkillNames);",
+    "  const startupPromptText = limitObservationText(promptFromArgv());",
+    "  const messageTextById = new Map();",
+    "  const messageInputById = new Map();",
+    "  const lastUserTextBySessionId = new Map();",
+    "  const skillUsagesByMessageId = new Map();",
     "  const skillUsagesBySessionId = new Map();",
     "  const startupSkillSessionIds = new Set();",
     "  const toolCallIdsByMessageId = new Map();",
@@ -717,9 +746,17 @@ function getPatchedLangfuseDistIndexJs() {
     "  const recordInteractionMetric = async (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, event?.sessionID, event?.sessionId);",
-    "    const messageId = pickEventString(part?.messageID, part?.messageId, payload?.messageID, payload?.messageId, payload?.message?.id, event?.messageID, event?.messageId);",
+    "    const partType = part?.type ?? '';",
+    "    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 role = pickEventString(part?.role, payload?.role, payload?.message?.role, event?.role).toLowerCase();",
+    "    const eventText = textFromContent(part) || textFromContent(payload?.message) || textFromContent(payload);",
+    "    if (eventText && role === 'user') {",
+    "      const inputText = limitObservationText(eventText);",
+    "      if (messageId) messageInputById.set(messageId, inputText);",
+    "      if (sessionId) lastUserTextBySessionId.set(sessionId, inputText);",
+    "      return;",
+    "    }",
     "    if (sessionId && startupSkillUsages.length && !startupSkillSessionIds.has(sessionId)) {",
     "      startupSkillSessionIds.add(sessionId);",
     "      rememberSkillUsages(skillUsagesBySessionId, sessionId, startupSkillUsages);",
@@ -733,11 +770,11 @@ function getPatchedLangfuseDistIndexJs() {
     "    rememberToolActivity(toolCallIdsBySessionId, sessionId, toolActivity, 'toolCallCount');",
     "    rememberToolActivity(toolResultIdsByMessageId, messageId, toolActivity, 'toolResultCount');",
     "    rememberToolActivity(toolResultIdsBySessionId, sessionId, toolActivity, 'toolResultCount');",
-    "    if (partType === 'text' && messageId && typeof part.text === 'string') {",
-    "      messageTextById.set(messageId, part.text);",
-    "      const textSkillUsages = detectOpencodeSkillUsages(part.text, knownSkillNames);",
-    "      rememberSkillUsages(skillUsagesByMessageId, messageId, textSkillUsages);",
-    "      rememberSkillUsages(skillUsagesBySessionId, sessionId, textSkillUsages);",
+    "    if (eventText && messageId && (role === 'assistant' || partType === 'text')) {",
+    "      messageTextById.set(messageId, limitObservationText(eventText));",
+    "      const textSkillUsages = detectOpencodeSkillUsages(eventText, knownSkillNames);",
+    "      rememberSkillUsages(skillUsagesByMessageId, messageId, textSkillUsages);",
+    "      rememberSkillUsages(skillUsagesBySessionId, sessionId, textSkillUsages);",
     "      return;",
     "    }",
     "    if (partType !== 'step-finish' || !messageId || emittedMessageIds.has(messageId)) return;",
@@ -745,10 +782,11 @@ 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);",
-    "    await sdkStartPromise;",
-    "    const span = getMetricsTracer().startSpan('OpenCode Agent Turn');",
-    "    const text = messageTextById.get(messageId) || '';",
-    "    const skillUsages = dedupeSkillUsages([...(skillUsagesByMessageId.get(messageId) ?? []), ...(skillUsagesBySessionId.get(sessionId) ?? [])]);",
+    "    await sdkStartPromise;",
+    "    const span = getMetricsTracer().startSpan('OpenCode Agent Turn');",
+    "    const text = messageTextById.get(messageId) || '';",
+    "    const inputText = messageInputById.get(messageId) || lastUserTextBySessionId.get(sessionId) || startupPromptText || '';",
+    "    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);",
@@ -781,14 +819,22 @@ function getPatchedLangfuseDistIndexJs() {
     '    if (skillInvocationModes.length) span.setAttribute("langfuse.observation.metadata.skill_invocation_modes", skillInvocationModes);',
     '    if (skillAgentPaths.length) span.setAttribute("langfuse.observation.metadata.skill_agent_paths", skillAgentPaths);',
     '    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);',
-    '    if (tokenMetrics.cacheRead !== undefined) span.setAttribute("langfuse.observation.metadata.cache_read_tokens", tokenMetrics.cacheRead);',
-    '    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));',
-    '    writeRepoContextMetrics(span, collectRepoContext(process.cwd(), "process"));',
-    "    span.end();",
-    "    messageTextById.delete(messageId);",
+    '    if (tokenMetrics.output !== undefined) span.setAttribute("langfuse.observation.metadata.output_tokens", tokenMetrics.output);',
+    '    if (total !== undefined) span.setAttribute("langfuse.observation.metadata.total_tokens", total);',
+    '    if (tokenMetrics.cacheRead !== undefined) span.setAttribute("langfuse.observation.metadata.cache_read_tokens", tokenMetrics.cacheRead);',
+    '    if (tokenMetrics.reasoning !== undefined) span.setAttribute("langfuse.observation.metadata.reasoning_tokens", tokenMetrics.reasoning);',
+    '    if (inputText) span.setAttribute("langfuse.observation.input", inputText);',
+    '    if (inputText) span.setAttribute("langfuse.trace.input", inputText);',
+    '    if (inputText) span.setAttribute("input.value", inputText);',
+    '    if (text) span.setAttribute("langfuse.observation.output", text);',
+    '    if (text) span.setAttribute("langfuse.trace.output", text);',
+    '    if (text) span.setAttribute("output.value", text);',
+    '    if (inputText) span.setAttribute("langfuse.observation.metadata.input_text_preview", inputText.slice(0, 512));',
+    '    if (text) span.setAttribute("langfuse.observation.metadata.output_text_preview", text.slice(0, 512));',
+    '    writeRepoContextMetrics(span, collectRepoContext(process.cwd(), "process"));',
+    "    span.end();",
+    "    messageTextById.delete(messageId);",
+    "    messageInputById.delete(messageId);",
     "    skillUsagesByMessageId.delete(messageId);",
     "    skillUsagesBySessionId.delete(sessionId);",
     "    toolCallIdsByMessageId.delete(messageId);",
@@ -977,6 +1023,26 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push('  call "%APPDATA%\\npm\\opencode.cmd" %*');
     cmd.push("  exit /b %ERRORLEVEL%");
     cmd.push(")");
+    cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-ai\\bin\\opencode.exe" (');
+    cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-ai\\bin\\opencode.exe" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
+    cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" (');
+    cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
+    cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64-baseline\\bin\\opencode.exe" (');
+    cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-ai\\node_modules\\opencode-windows-x64-baseline\\bin\\opencode.exe" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
+    cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" (');
+    cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-windows-x64\\bin\\opencode.exe" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
+    cmd.push('if exist "%APPDATA%\\npm\\node_modules\\opencode-windows-x64-baseline\\bin\\opencode.exe" (');
+    cmd.push('  call "%APPDATA%\\npm\\node_modules\\opencode-windows-x64-baseline\\bin\\opencode.exe" %*');
+    cmd.push("  exit /b %ERRORLEVEL%");
+    cmd.push(")");
     cmd.push('for /f "delims=" %%O in (\'where.exe opencode 2^>nul\') do (');
     cmd.push('  if /I not "%%~fO"=="%~f0" (');
     cmd.push('    call "%%O" %*');
@@ -984,7 +1050,7 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     cmd.push("  )");
     cmd.push(")");
     cmd.push("echo [ERROR] OpenCode CLI not found. Install OpenCode CLI first. 1>&2");
-    cmd.push("echo Try: npm install -g opencode-windows-x64 1>&2");
+    cmd.push("echo Try: npm install -g opencode-ai@latest 1>&2");
     cmd.push("echo Then run: npx oh-langfuse@latest update opencode 1>&2");
     cmd.push("exit /b 127");
     fs.writeFileSync(shim, cmd.join("\r\n") + "\r\n", "utf8");
@@ -1021,14 +1087,12 @@ function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl,
     "fi",
     'if [ -n "$OH_LANGFUSE_BROKEN_OPENCODE" ]; then',
     '  echo "[ERROR] OpenCode CLI was found but failed to start: $OH_LANGFUSE_BROKEN_OPENCODE" >&2',
-    '  echo "Try: npm install -g opencode-linux-x64 --registry=https://registry.npmjs.org/" >&2',
-    '  echo "If that package fails on your host, try opencode-linux-x64-baseline or opencode-linux-x64-musl." >&2',
+    '  echo "Try: npm install -g opencode-ai@latest --registry=https://registry.npmjs.org/" >&2',
     '  echo "Then run: npx --registry=https://registry.npmjs.org/ -y oh-langfuse@latest update opencode --npmRegistry=https://registry.npmjs.org/" >&2',
     "  exit 127",
     "fi",
     'echo "[ERROR] OpenCode CLI not found. Install OpenCode CLI first." >&2',
-    'echo "Try: npm install -g opencode-linux-x64" >&2',
-    'echo "If that package fails on your host, try opencode-linux-x64-baseline or opencode-linux-x64-musl." >&2',
+    'echo "Try: npm install -g opencode-ai@latest" >&2',
     'echo "Then run: npx oh-langfuse@latest update opencode" >&2',
     "exit 127",
     ""

package/scripts/real-self-verify.mjs

@@ -354,14 +354,29 @@ function metadataValue(item, key) {
   return undefined;
 }
 
-function directMetadataValue(item, key) {
-  const metadata = item?.metadata || {};
-  return metadata[key];
-}
-
-function hasMetadataKey(item, key) {
-  return metadataValue(item, key) !== undefined;
-}
+function directMetadataValue(item, key) {
+  const metadata = item?.metadata || {};
+  return metadata[key];
+}
+
+function observationIOValue(item, key) {
+  const metadata = item?.metadata || {};
+  const attrs = metadata.attributes || {};
+  for (const value of [
+    item?.[key],
+    metadata[key],
+    attrs[`langfuse.observation.${key}`],
+    attrs[`langfuse.trace.${key}`],
+    attrs[`${key}.value`],
+  ]) {
+    if (value !== undefined && value !== null && String(value).trim() !== "") return value;
+  }
+  return undefined;
+}
+
+function hasMetadataKey(item, key) {
+  return metadataValue(item, key) !== undefined;
+}
 
 function metricInteractionId(item, target) {
   return target === "opencode"
@@ -507,13 +522,20 @@ async function verifyMetricObservations(config, found, { since, target, marker =
         throw new Error(`Metric verification failed for ${target}: Agent Turn is missing repo context ${key}.`);
       }
     }
-    if (target === "opencode") {
-      for (const key of ["interaction_id", "interaction_count", "token_metrics_available", "tool_call_count", "skill_use_count", "input_tokens", "output_tokens", "total_tokens"]) {
-        if (metadataValue(item, key) === undefined) {
-          throw new Error(`Metric verification failed for ${target}: effective metadata is missing ${key}.`);
-        }
-      }
-    }
+    if (target === "opencode") {
+      for (const key of ["interaction_id", "interaction_count", "token_metrics_available", "tool_call_count", "skill_use_count", "input_tokens", "output_tokens", "total_tokens"]) {
+        if (metadataValue(item, key) === undefined) {
+          throw new Error(`Metric verification failed for ${target}: effective metadata is missing ${key}.`);
+        }
+      }
+      if (item?.name === expectedName) {
+        for (const key of ["input", "output"]) {
+          if (observationIOValue(item, key) === undefined) {
+            throw new Error(`Metric verification failed for ${target}: ${expectedName} is missing ${key}.`);
+          }
+        }
+      }
+    }
     const tokenAvailable = metadataValue(item, "token_metrics_available");
     for (const tokenKey of ["input_tokens", "output_tokens", "total_tokens"]) {
       const value = metadataValue(item, tokenKey);

package/scripts/resolve-opencode-cli.mjs

@@ -26,10 +26,15 @@ export function resolveOpencodeCli(preferred) {
     if (process.env.LOCALAPPDATA) {
       candidates.push(path.join(process.env.LOCALAPPDATA, "Programs", "opencode", "opencode.exe"));
     }
-    if (process.env.APPDATA) {
-      candidates.push(path.join(process.env.APPDATA, "npm", "opencode.cmd"));
-      candidates.push(path.join(process.env.APPDATA, "npm", "opencode"));
-    }
+    if (process.env.APPDATA) {
+      candidates.push(path.join(process.env.APPDATA, "npm", "opencode.cmd"));
+      candidates.push(path.join(process.env.APPDATA, "npm", "opencode"));
+      candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "bin", "opencode.exe"));
+      candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "node_modules", "opencode-windows-x64", "bin", "opencode.exe"));
+      candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-ai", "node_modules", "opencode-windows-x64-baseline", "bin", "opencode.exe"));
+      candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-windows-x64", "bin", "opencode.exe"));
+      candidates.push(path.join(process.env.APPDATA, "npm", "node_modules", "opencode-windows-x64-baseline", "bin", "opencode.exe"));
+    }
     candidates.push(path.join(home, "scoop", "shims", "opencode.exe"));
   } else {
     candidates.push(path.join(home, ".opencode", "bin", "opencode"));