oh-langfuse 0.1.41 → 0.1.43

package/scripts/codex-langfuse-setup.mjs

@@ -2,10 +2,11 @@ import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
-import { execFileSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
 
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
 const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
 
@@ -68,15 +69,143 @@ function shQuote(s) {
   return `'${String(s).replace(/'/g, "'\"'\"'")}'`;
 }
 
+function psQuote(s) {
+  return `'${String(s).replace(/'/g, "''")}'`;
+}
+
+function cmdQuote(s) {
+  return `"${String(s).replace(/"/g, '""')}"`;
+}
+
+function autoUpdateRuntimePath() {
+  return path.join(packageRoot, "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 isPathInsideDir(candidate, dir) {
+  if (!candidate || !dir) return false;
+  const relative = path.relative(path.resolve(dir), path.resolve(candidate));
+  return relative === "" || (relative && !relative.startsWith("..") && !path.isAbsolute(relative));
+}
+
+function existingCliCandidate(candidate, shimDir) {
+  if (!candidate || isPathInsideDir(candidate, shimDir)) return "";
+  try {
+    return fs.existsSync(candidate) ? candidate : "";
+  } catch {
+    return "";
+  }
+}
+
+function listCliCandidatesFromPath(target) {
+  const cmd = process.platform === "win32" ? "where.exe" : "which";
+  const args = process.platform === "win32" ? [target] : ["-a", target];
+  const result = spawnSync(cmd, args, { encoding: "utf8", windowsHide: true });
+  if (result.status !== 0) return [];
+  return String(result.stdout || "")
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+}
+
+function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
+  const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
+  const candidates = [
+    preferred,
+    process.platform === "win32" ? path.join(appData, "npm", `${target}.cmd`) : "",
+    process.platform === "win32" ? path.join(appData, "npm", `${target}.exe`) : "",
+    process.platform === "win32" ? path.join(appData, "npm", target) : "",
+    ...listCliCandidatesFromPath(target)
+  ];
+  for (const candidate of candidates) {
+    const found = existingCliCandidate(candidate, shimDir);
+    if (found) return found;
+  }
+  return "";
+}
+
+function prependWindowsUserPath(dir) {
+  if (process.platform !== "win32") return false;
+  const cmd = [
+    "$ErrorActionPreference = 'Stop';",
+    `$dir = ${psQuote(dir)};`,
+    "$current = [Environment]::GetEnvironmentVariable('Path', 'User');",
+    "$parts = @();",
+    "if ($current) { $parts = $current -split ';' | Where-Object { $_ -and $_.Trim() } }",
+    "$exists = $false;",
+    "foreach ($part in $parts) { if ([string]::Equals($part.TrimEnd('\\'), $dir.TrimEnd('\\'), [StringComparison]::OrdinalIgnoreCase)) { $exists = $true } }",
+    "if (-not $exists) {",
+    "  $next = (@($dir) + $parts) -join ';';",
+    "  [Environment]::SetEnvironmentVariable('Path', $next, 'User');",
+    "}"
+  ].join(" ");
+  const result = spawnSync("powershell", ["-NoProfile", "-Command", cmd], { stdio: "inherit", windowsHide: true });
+  if (result.status !== 0) throw new Error("Failed to prepend Codex Langfuse shim to the user PATH.");
+
+  const currentParts = String(process.env.PATH || "").split(path.delimiter);
+  const normalized = dir.replace(/[\\/]+$/, "").toLowerCase();
+  if (!currentParts.some((part) => part && part.replace(/[\\/]+$/, "").toLowerCase() === normalized)) {
+    process.env.PATH = `${dir}${path.delimiter}${process.env.PATH || ""}`;
+  }
+  return true;
+}
+
+function writeAgentCommandShim({ baseDir, target, executable, realCli, publicKey, secretKey, baseUrl, userId }) {
+  if (!realCli) return null;
+  const shimDir = path.join(baseDir, "bin");
+  ensureDir(shimDir);
+  if (process.platform === "win32") {
+    const shim = path.join(shimDir, `${executable}.cmd`);
+    const envPrefix = `OH_LANGFUSE_${target.toUpperCase()}_SHIM`;
+    const content = [
+      "@echo off",
+      "REM Auto-generated by scripts/codex-langfuse-setup.mjs",
+      `set ${envPrefix}=1`,
+      `set LANGFUSE_PUBLIC_KEY=${publicKey}`,
+      `set LANGFUSE_SECRET_KEY=${secretKey}`,
+      `set LANGFUSE_BASEURL=${baseUrl}`,
+      userId ? `set LANGFUSE_USER_ID=${userId}` : null,
+      windowsAutoUpdateCommand(target),
+      `call ${cmdQuote(realCli)} %*`,
+      "exit /b %ERRORLEVEL%",
+      ""
+    ].filter(Boolean).join(os.EOL);
+    fs.writeFileSync(shim, content, "utf8");
+    return { shim, shimDir };
+  }
+
+  const shim = path.join(shimDir, executable);
+  const lines = [
+    "#!/usr/bin/env sh",
+    "# Auto-generated by scripts/codex-langfuse-setup.mjs",
+    "set -eu",
+    `export OH_LANGFUSE_${target.toUpperCase()}_SHIM=1`,
+    `export LANGFUSE_PUBLIC_KEY=${shQuote(publicKey)}`,
+    `export LANGFUSE_SECRET_KEY=${shQuote(secretKey)}`,
+    `export LANGFUSE_BASEURL=${shQuote(baseUrl)}`,
+    userId ? `export LANGFUSE_USER_ID=${shQuote(userId)}` : null,
+    unixAutoUpdateCommand(target),
+    `exec ${shQuote(realCli)} "$@"`,
+    ""
+  ].filter(Boolean);
+  fs.writeFileSync(shim, lines.join("\n"), "utf8");
+  fs.chmodSync(shim, 0o755);
+  return { shim, shimDir };
+}
+
 function createAgentLauncher({ baseDir, target, executable }) {
   if (process.platform === "win32") {
     const launcher = path.join(baseDir, `launch-${target}-langfuse.cmd`);
     const content = [
       "@echo off",
-      "where npx >nul 2>nul",
-      "if %ERRORLEVEL% EQU 0 (",
-      `  call npx -y oh-langfuse@latest auto-update ${target} --skip-check`,
-      ")",
+      windowsAutoUpdateCommand(target),
       `${executable} %*`,
       ""
     ].join(os.EOL);
@@ -88,9 +217,7 @@ function createAgentLauncher({ baseDir, target, executable }) {
   const content = [
     "#!/usr/bin/env sh",
     "set -eu",
-    "if command -v npx >/dev/null 2>&1; then",
-    `  npx -y oh-langfuse@latest auto-update ${target} --skip-check || true`,
-    "fi",
+    unixAutoUpdateCommand(target),
     `exec ${shQuote(executable)} "$@"`,
     ""
   ].join("\n");
@@ -172,7 +299,7 @@ function updateCodexNotify(configPath, notifyCommand) {
 
 async function main() {
   const args = parseArgs(process.argv.slice(2));
-  const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+  const rootDir = packageRoot;
   const packageJson = JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf8"));
 
   const publicKey =
@@ -226,12 +353,37 @@ async function main() {
     ? pythonCmd
     : createOrUpdateLangfuseVenv({ baseDir: codexHome, pipIndexUrl });
   updateCodexNotify(configPath, [notifyPython, destHook]);
-  const agentLauncher = createAgentLauncher({ baseDir: codexHome, target: "codex", executable: "codex" });
-
+  const codexShimDir = path.join(codexHome, "bin");
+  const realCodexCli = resolveAgentCli({ target: "codex", preferred: args.cmd || "", shimDir: codexShimDir });
+  const directShim = writeAgentCommandShim({
+    baseDir: codexHome,
+    target: "codex",
+    executable: "codex",
+    realCli: realCodexCli,
+    publicKey,
+    secretKey,
+    baseUrl,
+    userId
+  });
+  if (directShim?.shimDir) {
+    prependWindowsUserPath(directShim.shimDir);
+  }
+  const agentLauncher = createAgentLauncher({
+    baseDir: codexHome,
+    target: "codex",
+    executable: realCodexCli ? cmdQuote(realCodexCli) : "codex"
+  });
+
   console.log(`Updated Codex notify hook: ${configPath}`);
   console.log(`Installed hook script: ${destHook}`);
   console.log(`Wrote Langfuse config: ${path.join(langfuseDir, "config.json")}`);
   console.log(`Agent launcher with update check: ${agentLauncher}`);
+  if (directShim) {
+    console.log(`Direct Codex command shim ready: ${directShim.shim}`);
+    console.log(`Real Codex CLI: ${realCodexCli}`);
+  } else {
+    console.log("Codex CLI not found; skipped direct codex command shim.");
+  }
   const runtimeState = writeRuntimeInstallRecord("codex", {
     packageName: packageJson.name,
     packageVersion: packageJson.version,

package/scripts/langfuse-check.mjs

@@ -26,11 +26,17 @@ function launcherPath(hooksDir) {
     : path.join(hooksDir, "run-langfuse-hook.sh");
 }
 
-function expectedHookCommands(launcher) {
+function directPythonHookCommand(pythonPath, pyPath) {
+  if (process.platform !== "win32") return `${pythonPath} ${pyPath}`;
+  return `"${String(pythonPath).replace(/"/g, '""')}" "${String(pyPath).replace(/"/g, '""')}"`;
+}
+
+function expectedHookCommands({ launcher, pythonPath, pyPath }) {
   if (process.platform !== "win32") return [path.normalize(launcher)];
   return [
     path.normalize(launcher),
-    `cmd.exe /d /s /c "${launcher.replace(/"/g, '""')}"`
+    `cmd.exe /d /s /c "${launcher.replace(/"/g, '""')}"`,
+    directPythonHookCommand(pythonPath, pyPath)
   ];
 }
 
@@ -118,7 +124,7 @@ function main() {
   const hook = findLangfuseHook(settings);
   addResult(results, "hooks.Stop contains Langfuse", !!hook, hook ? "OK" : "missing", "Run setup again to register the Stop hook.");
 
-  const expectedCommands = expectedHookCommands(expectedLauncher);
+  const expectedCommands = expectedHookCommands({ launcher: expectedLauncher, pythonPath: expectedPython, pyPath });
   const hookCommand = hook?.command || "";
   const launcherFormOk =
     !!hook &&
@@ -128,8 +134,8 @@ function main() {
     results,
     "hook command form",
     launcherFormOk,
-    launcherFormOk ? "launcher command" : hook ? "legacy command form" : "missing",
-    "Run setup again. Claude Code should execute the generated run-langfuse-hook launcher directly."
+    launcherFormOk ? "supported command" : hook ? "legacy command form" : "missing",
+    "Run setup again. Claude Code should execute the generated Python hook command."
   );
 
   addResult(

package/scripts/langfuse-setup.mjs

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import fsp from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
-import { execFileSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
 
@@ -140,24 +140,144 @@ function cmdQuote(s) {
   return `"${String(s).replace(/"/g, '""')}"`;
 }
 
-function hookCommandForClaude(launcher) {
+function hookCommandForClaude({ launcher, hookPython, pyPath }) {
   if (process.platform !== "win32") return launcher;
-  return `cmd.exe /d /s /c ${cmdQuote(launcher)}`;
+  return `${cmdQuote(hookPython)} ${cmdQuote(pyPath)}`;
 }
 
 function shQuote(s) {
   return `'${String(s).replace(/'/g, "'\\''")}'`;
 }
 
+function autoUpdateRuntimePath() {
+  return path.join(packageRoot, "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 isPathInsideDir(candidate, dir) {
+  if (!candidate || !dir) return false;
+  const relative = path.relative(path.resolve(dir), path.resolve(candidate));
+  return relative === "" || (relative && !relative.startsWith("..") && !path.isAbsolute(relative));
+}
+
+function existingCliCandidate(candidate, shimDir) {
+  if (!candidate || isPathInsideDir(candidate, shimDir)) return "";
+  try {
+    return fs.existsSync(candidate) ? candidate : "";
+  } catch {
+    return "";
+  }
+}
+
+function listCliCandidatesFromPath(target) {
+  const cmd = process.platform === "win32" ? "where.exe" : "which";
+  const args = process.platform === "win32" ? [target] : ["-a", target];
+  const result = spawnSync(cmd, args, { encoding: "utf8", windowsHide: true });
+  if (result.status !== 0) return [];
+  return String(result.stdout || "")
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean);
+}
+
+function resolveAgentCli({ target, preferred = "", shimDir = "" }) {
+  const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
+  const candidates = [
+    preferred,
+    process.platform === "win32" ? path.join(appData, "npm", `${target}.cmd`) : "",
+    process.platform === "win32" ? path.join(appData, "npm", `${target}.exe`) : "",
+    process.platform === "win32" ? path.join(appData, "npm", target) : "",
+    ...listCliCandidatesFromPath(target)
+  ];
+  for (const candidate of candidates) {
+    const found = existingCliCandidate(candidate, shimDir);
+    if (found) return found;
+  }
+  return "";
+}
+
+function prependWindowsUserPath(dir) {
+  if (process.platform !== "win32") return false;
+  const cmd = [
+    "$ErrorActionPreference = 'Stop';",
+    `$dir = ${psQuote(dir)};`,
+    "$current = [Environment]::GetEnvironmentVariable('Path', 'User');",
+    "$parts = @();",
+    "if ($current) { $parts = $current -split ';' | Where-Object { $_ -and $_.Trim() } }",
+    "$exists = $false;",
+    "foreach ($part in $parts) { if ([string]::Equals($part.TrimEnd('\\'), $dir.TrimEnd('\\'), [StringComparison]::OrdinalIgnoreCase)) { $exists = $true } }",
+    "if (-not $exists) {",
+    "  $next = (@($dir) + $parts) -join ';';",
+    "  [Environment]::SetEnvironmentVariable('Path', $next, 'User');",
+    "}"
+  ].join(" ");
+  const result = spawnSync("powershell", ["-NoProfile", "-Command", cmd], { stdio: "inherit", windowsHide: true });
+  if (result.status !== 0) throw new Error("Failed to prepend Claude Langfuse shim to the user PATH.");
+
+  const currentParts = String(process.env.PATH || "").split(path.delimiter);
+  const normalized = dir.replace(/[\\/]+$/, "").toLowerCase();
+  if (!currentParts.some((part) => part && part.replace(/[\\/]+$/, "").toLowerCase() === normalized)) {
+    process.env.PATH = `${dir}${path.delimiter}${process.env.PATH || ""}`;
+  }
+  return true;
+}
+
+function writeAgentCommandShim({ baseDir, target, executable, realCli, publicKey, secretKey, baseUrl, userId }) {
+  if (!realCli) return null;
+  const shimDir = path.join(baseDir, "bin");
+  ensureDir(shimDir);
+  if (process.platform === "win32") {
+    const shim = path.join(shimDir, `${executable}.cmd`);
+    const envPrefix = `OH_LANGFUSE_${target.toUpperCase()}_SHIM`;
+    const content = [
+      "@echo off",
+      "REM Auto-generated by scripts/langfuse-setup.mjs",
+      `set ${envPrefix}=1`,
+      `set LANGFUSE_PUBLIC_KEY=${publicKey}`,
+      `set LANGFUSE_SECRET_KEY=${secretKey}`,
+      `set LANGFUSE_BASEURL=${baseUrl}`,
+      userId ? `set LANGFUSE_USER_ID=${userId}` : null,
+      windowsAutoUpdateCommand(target),
+      `call ${cmdQuote(realCli)} %*`,
+      "exit /b %ERRORLEVEL%",
+      ""
+    ].filter(Boolean).join(os.EOL);
+    fs.writeFileSync(shim, content, "utf8");
+    return { shim, shimDir };
+  }
+
+  const shim = path.join(shimDir, executable);
+  const lines = [
+    "#!/usr/bin/env sh",
+    "# Auto-generated by scripts/langfuse-setup.mjs",
+    "set -eu",
+    `export OH_LANGFUSE_${target.toUpperCase()}_SHIM=1`,
+    `export LANGFUSE_PUBLIC_KEY=${shQuote(publicKey)}`,
+    `export LANGFUSE_SECRET_KEY=${shQuote(secretKey)}`,
+    `export LANGFUSE_BASEURL=${shQuote(baseUrl)}`,
+    userId ? `export LANGFUSE_USER_ID=${shQuote(userId)}` : null,
+    unixAutoUpdateCommand(target),
+    `exec ${shQuote(realCli)} "$@"`,
+    ""
+  ].filter(Boolean);
+  fs.writeFileSync(shim, lines.join("\n"), "utf8");
+  fs.chmodSync(shim, 0o755);
+  return { shim, shimDir };
+}
+
 function createAgentLauncher({ baseDir, target, executable }) {
   if (process.platform === "win32") {
     const launcher = path.join(baseDir, `launch-${target}-langfuse.cmd`);
     const content = [
       "@echo off",
-      "where npx >nul 2>nul",
-      "if %ERRORLEVEL% EQU 0 (",
-      `  call npx -y oh-langfuse@latest auto-update ${target} --skip-check`,
-      ")",
+      windowsAutoUpdateCommand(target),
       `${executable} %*`,
       ""
     ].join(os.EOL);
@@ -169,9 +289,7 @@ function createAgentLauncher({ baseDir, target, executable }) {
   const content = [
     "#!/usr/bin/env sh",
     "set -eu",
-    "if command -v npx >/dev/null 2>&1; then",
-    `  npx -y oh-langfuse@latest auto-update ${target} --skip-check || true`,
-    "fi",
+    unixAutoUpdateCommand(target),
     `exec ${shQuote(executable)} "$@"`,
     ""
   ].join("\n");
@@ -321,7 +439,26 @@ async function main() {
   }
   const hookPython = createOrUpdateLangfuseVenv({ baseDir: claudeDir, pipIndexUrl });
   const hookLauncher = await createHookLauncher({ hooksDir, hookPython, pyPath });
-  const agentLauncher = createAgentLauncher({ baseDir: claudeDir, target: "claude", executable: "claude" });
+  const claudeShimDir = path.join(claudeDir, "bin");
+  const realClaudeCli = resolveAgentCli({ target: "claude", preferred: args.cmd || "", shimDir: claudeShimDir });
+  const directShim = writeAgentCommandShim({
+    baseDir: claudeDir,
+    target: "claude",
+    executable: "claude",
+    realCli: realClaudeCli,
+    publicKey,
+    secretKey,
+    baseUrl: langfuseHost,
+    userId
+  });
+  if (directShim?.shimDir) {
+    prependWindowsUserPath(directShim.shimDir);
+  }
+  const agentLauncher = createAgentLauncher({
+    baseDir: claudeDir,
+    target: "claude",
+    executable: realClaudeCli ? cmdQuote(realClaudeCli) : "claude"
+  });
 
   // 4) 合并写入 settings.json
   const settingsPath = path.join(claudeDir, "settings.json");
@@ -346,7 +483,7 @@ async function main() {
           hooks: [
             {
               type: "command",
-              command: hookCommandForClaude(hookLauncher)
+              command: hookCommandForClaude({ launcher: hookLauncher, hookPython, pyPath })
             }
           ]
         }
@@ -364,6 +501,12 @@ async function main() {
   console.log(`Runtime version recorded: ${runtimeState}`);
   console.log(`已更新：${settingsPath}`);
   console.log(`Agent launcher with update check: ${agentLauncher}`);
+  if (directShim) {
+    console.log(`Direct Claude command shim ready: ${directShim.shim}`);
+    console.log(`Real Claude CLI: ${realClaudeCli}`);
+  } else {
+    console.log("Claude CLI not found; skipped direct claude command shim.");
+  }
 
 }
 

package/scripts/metrics-utils.mjs

@@ -1,4 +1,4 @@
-export const METRICS_SCHEMA_VERSION = "1.0";
+export const METRICS_SCHEMA_VERSION = "1.1";
 
 function numberOrNull(value) {
   if (typeof value === "string" && value.trim().startsWith("{")) {
@@ -64,8 +64,39 @@ function normalizeSkillNames(names) {
   return out;
 }
 
-function escapeRegExp(value) {
-  return String(value).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+function skillNamespace(name) {
+  return String(name || "").includes(":") ? String(name).split(":", 1)[0] : "";
+}
+
+function skillEventType(detectedBy) {
+  return ["tool_call", "plugin_event", "attribution_skill", "slash_command"].includes(detectedBy) ? "invoked" : "detected";
+}
+
+function skillIdSegment(name) {
+  return String(name || "unknown")
+    .trim()
+    .replace(/[^A-Za-z0-9_.:-]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .slice(0, 96) || "unknown";
+}
+
+function normalizeSkillUsages(usages) {
+  if (!Array.isArray(usages)) return [];
+  const out = [];
+  for (const usage of usages) {
+    const raw = typeof usage === "string" ? { name: usage } : usage;
+    if (!raw || typeof raw !== "object") continue;
+    const name = String(raw.name ?? raw.skill_name ?? raw.skillName ?? "").trim();
+    if (!name) continue;
+    const detectedBy = String(raw.detected_by ?? raw.detectedBy ?? "metadata").trim() || "metadata";
+    out.push({
+      name,
+      skill_namespace: String(raw.skill_namespace ?? raw.skillNamespace ?? skillNamespace(name)),
+      detected_by: detectedBy,
+      skill_call_id: String(raw.skill_call_id ?? raw.skillCallId ?? raw.call_id ?? raw.callId ?? "").trim(),
+    });
+  }
+  return out;
 }
 
 function collectStrings(value, out = []) {
@@ -89,13 +120,52 @@ function collectStrings(value, out = []) {
 }
 
 export function detectOpencodeSkillNames(source, knownSkills = []) {
+  const detected = new Set(detectOpencodeSkillUsages(source, knownSkills).map((usage) => usage.name));
+  return normalizeSkillNames(knownSkills).filter((name) => detected.has(name));
+}
+
+function collectOpencodeExplicitSkillUsages(value, out = []) {
+  if (value == null) return out;
+  if (Array.isArray(value)) {
+    for (const item of value) collectOpencodeExplicitSkillUsages(item, out);
+    return out;
+  }
+  if (typeof value !== "object") return out;
+
+  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)) {
+    const skill = pickString(input.skill_name, input.skill, input.name);
+    const callId = pickString(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)) collectOpencodeExplicitSkillUsages(item, out);
+  return out;
+}
+
+export function 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 collectOpencodeExplicitSkillUsages(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;
 }
@@ -132,13 +202,19 @@ 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 skillNames = normalizeSkillNames(options.skillNames ?? options.skill_names);
-  const skillUseCount = skillNames.length || Number(options.skillUseCount ?? options.skill_use_count ?? 0) || 0;
+  const skillUseEvents = normalizeSkillUseEvents(options.skillUseEvents ?? options.skill_use_events);
+  const skillNamesAll = skillUseEvents.length
+    ? skillUseEvents.map((event) => event.skill_name)
+    : normalizeSkillNames(options.skillNames ?? options.skill_names);
+  const skillNames = normalizeSkillNames(skillNamesAll);
+  const skillUseCount = skillUseEvents.length || skillNamesAll.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 uniqueSkillCount = skillNames.length;
 
   const metadata = {
     source,
+    agent: source,
     user_id: String(options.userId || options.user_id || ""),
     session_id: sessionId,
     interaction_id: options.interactionId || buildInteractionId(source, sessionId, turnNumber),
@@ -149,6 +225,8 @@ export function buildInteractionMetadata(options = {}) {
     tool_call_count: toolCallCount,
     tool_result_count: toolResultCount,
     skill_use_count: skillUseCount,
+    unique_skill_count: uniqueSkillCount,
+    repeated_skill_count: Math.max(0, skillUseCount - uniqueSkillCount),
     ...tokenMetrics,
     model: options.model || null,
     turn_number: turnNumber,
@@ -163,12 +241,57 @@ export function buildInteractionMetadata(options = {}) {
 
   if (skillNames.length) {
     metadata.skill_names = skillNames;
-    metadata.skill_names_json = JSON.stringify(skillNames);
+  }
+  if (skillNamesAll.length) {
+    metadata.skill_names_all = skillNamesAll;
   }
 
   return metadata;
 }
 
+function normalizeSkillUseEvents(events) {
+  if (!Array.isArray(events)) return [];
+  return events
+    .filter((event) => event && typeof event === "object" && event.skill_name)
+    .map((event) => ({ ...event }));
+}
+
+export function buildSkillUseEvents(options = {}) {
+  const interactionId = String(options.interactionId ?? options.interaction_id ?? "unknown");
+  const usages = dedupeSkillUsages(normalizeSkillUsages(options.skillUsages ?? options.skill_usages));
+  const total = usages.length;
+  return usages.map((usage, index) => {
+    const skillUseIndex = index + 1;
+    const detectedBy = usage.detected_by;
+    return {
+      skill_use_id: `${interactionId}:skill:${skillUseIndex}:${skillIdSegment(usage.name)}`,
+      skill_use_index: skillUseIndex,
+      skill_use_count_in_interaction: total,
+      skill_event_type: skillEventType(detectedBy),
+      skill_trigger: "unknown",
+      skill_name: usage.name,
+      skill_namespace: usage.skill_namespace,
+      detected_by: detectedBy,
+      ...(usage.skill_call_id ? { skill_call_id: usage.skill_call_id } : {}),
+      skill_use_count: 1,
+    };
+  });
+}
+
+function dedupeSkillUsages(usages) {
+  const out = [];
+  const seenCallIds = new Set();
+  for (const usage of usages) {
+    if (usage.skill_call_id) {
+      const key = `call:${usage.skill_call_id}`;
+      if (seenCallIds.has(key)) continue;
+      seenCallIds.add(key);
+    }
+    out.push(usage);
+  }
+  return out;
+}
+
 export function buildOpencodeMetricAttributes(options = {}) {
   const attrs = options.attributes || {};
   const userId = String(options.userId || attrs["oh.langfuse.user_id"] || attrs["langfuse.user.id"] || "");
@@ -178,6 +301,7 @@ export function buildOpencodeMetricAttributes(options = {}) {
 
   return {
     "langfuse.observation.metadata.source": "opencode",
+    "langfuse.observation.metadata.agent": "opencode",
     "langfuse.observation.metadata.user_id": userId,
     "langfuse.observation.metadata.metrics_schema_version": METRICS_SCHEMA_VERSION,
     "langfuse.observation.metadata.model": model,