oh-langfuse 0.1.79 → 0.1.80

package/scripts/opencode-langfuse-setup.mjs

@@ -8,24 +8,24 @@ import { shouldSuppressAgentLogLine } from "./log-filter-utils.mjs";
 import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
 import { resolveOpencodeCli } from "./resolve-opencode-cli.mjs";
 
-const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
-const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
-const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const packageJson = JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf8"));
-const DEFAULT_LANGFUSE_BASE_URL = "https://metrics.openharmonyinsight.cn";
-const LEGACY_LANGFUSE_BASE_URLS = new Set([
-  "http://120.46.221.227:3000",
-  "https://120.46.221.227:3000",
-]);
-
-function normalizeLegacyBaseUrl(baseUrl) {
-  const value = String(baseUrl || "").trim().replace(/\/+$/, "");
-  return LEGACY_LANGFUSE_BASE_URLS.has(value) ? DEFAULT_LANGFUSE_BASE_URL : baseUrl;
-}
-
-function normalizeUserId(v) {
-  return String(v || "").trim();
-}
+const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
+const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
+const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const packageJson = JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf8"));
+const DEFAULT_LANGFUSE_BASE_URL = "https://metrics.openharmonyinsight.cn";
+const LEGACY_LANGFUSE_BASE_URLS = new Set([
+  "http://120.46.221.227:3000",
+  "https://120.46.221.227:3000",
+]);
+
+function normalizeLegacyBaseUrl(baseUrl) {
+  const value = String(baseUrl || "").trim().replace(/\/+$/, "");
+  return LEGACY_LANGFUSE_BASE_URLS.has(value) ? DEFAULT_LANGFUSE_BASE_URL : baseUrl;
+}
+
+function normalizeUserId(v) {
+  return String(v || "").trim();
+}
 
 function assertValidUserId(userId) {
   if (!USER_ID_PATTERN.test(normalizeUserId(userId))) {
@@ -144,6 +144,7 @@ export function getPatchedLangfuseDistIndexJs() {
     'import os from "node:os";',
     'import path from "node:path";',
     'import { execFileSync } from "node:child_process";',
+    'import { pathToFileURL } from "node:url";',
     'import { NodeSDK } from "@opentelemetry/sdk-node";',
     'import { trace } from "@opentelemetry/api";',
     "",
@@ -687,7 +688,7 @@ export function getPatchedLangfuseDistIndexJs() {
     "  }).filter((event) => event.skill_name);",
     "};",
     "",
-    "const collectKnownSkillNames = async () => {",
+    "const collectKnownSkillNames = async (extraPaths) => {",
     "  const dirs = [",
     "    path.join(process.cwd(), '.opencode', 'skill'),",
     "    path.join(process.cwd(), '.opencode', 'skills'),",
@@ -696,6 +697,7 @@ export function getPatchedLangfuseDistIndexJs() {
     "    path.join(os.homedir(), '.opencode', 'skill'),",
     "    path.join(os.homedir(), '.opencode', 'skills'),",
     "  ];",
+    "  if (Array.isArray(extraPaths)) for (const p of extraPaths) if (typeof p === 'string' && p) dirs.push(p);",
     "  const names = new Set();",
     "  for (const dir of dirs) {",
     "    try {",
@@ -719,7 +721,7 @@ export function getPatchedLangfuseDistIndexJs() {
     "export const LangfusePlugin = async ({ client }) => {",
     "  const publicKey = process.env.LANGFUSE_PUBLIC_KEY;",
     "  const secretKey = process.env.LANGFUSE_SECRET_KEY;",
-    '  const baseUrl = process.env.LANGFUSE_BASEURL ?? "https://metrics.openharmonyinsight.cn";',
+    '  const baseUrl = process.env.LANGFUSE_BASEURL ?? "https://metrics.openharmonyinsight.cn";',
     '  const environment = process.env.LANGFUSE_ENVIRONMENT ?? "development";',
     "",
     "  const userIdFromConfig = await readConfiguredUserId();",
@@ -745,7 +747,7 @@ export function getPatchedLangfuseDistIndexJs() {
     '    log("warn", `OTEL SDK start failed: ${err?.message ?? err}`);',
     "  });",
     "  const getMetricsTracer = () => trace.getTracer('oh-langfuse-opencode-metrics');",
-    "  const knownSkillNames = await collectKnownSkillNames();",
+    "  let knownSkillNames = await collectKnownSkillNames();",
     "  const startupSkillUsages = detectOpencodeSkillUsages(process.argv.join('\\n'), knownSkillNames);",
     "  const startupPromptText = limitObservationText(promptFromArgv());",
     "  const messageTextById = new Map();",
@@ -923,6 +925,26 @@ export function getPatchedLangfuseDistIndexJs() {
     "      if (!config.experimental?.openTelemetry) {",
     '        log("warn", "OpenTelemetry experimental feature is disabled in Opencode config - tracing disabled");',
     "      }",
+    "      try {",
+    "        const discoverPath = path.join(os.homedir(), '.config', 'oh-langfuse', 'opencode-skills-discover.mjs');",
+    "        let roots = [];",
+    "        try {",
+    "          const mod = await import(pathToFileURL(discoverPath).href);",
+    "          if (mod && typeof mod.collectSkillRoots === 'function') roots = mod.collectSkillRoots(process.cwd());",
+    "        } catch (e) { /* discover script absent or import failed: skip augmentation */ }",
+    "        if (roots.length) {",
+    "          config.skills = config.skills || {};",
+    "          config.skills.paths = Array.isArray(config.skills.paths) ? [...config.skills.paths] : [];",
+    "          for (const r of roots) if (!config.skills.paths.includes(r)) config.skills.paths.push(r);",
+    "          config.permission = config.permission || {};",
+    "          config.permission.skill = config.permission.skill || {};",
+    "          config.permission.skill['*'] = 'allow';",
+    "        }",
+    "        knownSkillNames = await collectKnownSkillNames(config.skills && config.skills.paths);",
+    "        if (knownSkillNames.length) log('info', `OpenCode skills discovered -> ${knownSkillNames.length}`);",
+    "      } catch (e) {",
+    "        log('warn', `skills config hook failed: ${e && e.message || e}`);",
+    "      }",
     "    },",
     "    event: async ({ event }) => {",
     "      const eventType = pickEventString(event?.name, event?.type, eventPayload(event)?.name, eventPayload(event)?.type);",
@@ -1034,6 +1056,29 @@ function unixAutoUpdateCommand(target) {
   return `${shQuote(writeAutoUpdateHelper(target))} || true`;
 }
 
+function skillsDiscoverScriptPath() {
+  return path.join(rootDir, "scripts", "opencode-skills-discover.mjs");
+}
+
+function skillsDiscoverInstallPath() {
+  return path.join(os.homedir(), ".config", "oh-langfuse", "opencode-skills-discover.mjs");
+}
+
+function installSkillsDiscoverHelper() {
+  const dest = skillsDiscoverInstallPath();
+  ensureDir(path.dirname(dest));
+  fs.copyFileSync(skillsDiscoverScriptPath(), dest);
+  return dest;
+}
+
+// installSkillsDiscoverHelper() (above) copies the skills-discover script to
+// ~/.config/oh-langfuse/opencode-skills-discover.mjs. The opencode plugin's
+// config hook imports that script (see getPatchedLangfuseDistIndexJs) and calls
+// its collectSkillRoots(cwd) to register skill repos near cwd into config.skills.paths,
+// PATH-independently. The earlier shim/OPENCODE_CONFIG_CONTENT approach was removed:
+// it was shadowed by system-level opencode wrappers (e.g. DevEco Studio) and is
+// redundant with the plugin config hook, which runs inside opencode regardless of PATH.
+
 function windowsGitPathBootstrap() {
   return [
     "for /f \"delims=\" %%G in ('where.exe git.exe 2^>nul') do (",
@@ -1046,7 +1091,7 @@ function windowsGitPathBootstrap() {
   ];
 }
 
-function writeWindowsUpdateCheckScript(dir) {
+function writeWindowsUpdateCheckScript(dir) {
   if (process.platform !== "win32") return null;
   ensureDir(dir);
   const p = path.join(dir, "oh-langfuse-opencode-update-check.ps1");
@@ -1065,25 +1110,25 @@ function writeWindowsUpdateCheckScript(dir) {
     ""
   ].join("\r\n");
   fs.writeFileSync(p, "\ufeff" + ps, "utf8");
-  return p;
-}
-
-function readRealOpencodeFromManagedShim(shimPath) {
-  try {
-    if (!shimPath || !fs.existsSync(shimPath)) return "";
-    const text = fs.readFileSync(shimPath, "utf8");
-    const cmdMatch = text.match(/set\s+"OH_LANGFUSE_REAL_OPENCODE=([^"]+)"/i);
-    if (cmdMatch?.[1] && fs.existsSync(cmdMatch[1])) return path.resolve(cmdMatch[1]);
-    const shMatch = text.match(/^OH_LANGFUSE_REAL_OPENCODE=(?:"([^"]+)"|'([^']+)'|([^\r\n]+))/m);
-    const candidate = shMatch?.[1] || shMatch?.[2] || shMatch?.[3];
-    if (candidate && fs.existsSync(candidate.trim())) return path.resolve(candidate.trim());
-  } catch {
-    // Best effort only; setup can still fall back to ordinary CLI discovery.
-  }
-  return "";
-}
-
-function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl, userId, realOpencodeCli }) {
+  return p;
+}
+
+function readRealOpencodeFromManagedShim(shimPath) {
+  try {
+    if (!shimPath || !fs.existsSync(shimPath)) return "";
+    const text = fs.readFileSync(shimPath, "utf8");
+    const cmdMatch = text.match(/set\s+"OH_LANGFUSE_REAL_OPENCODE=([^"]+)"/i);
+    if (cmdMatch?.[1] && fs.existsSync(cmdMatch[1])) return path.resolve(cmdMatch[1]);
+    const shMatch = text.match(/^OH_LANGFUSE_REAL_OPENCODE=(?:"([^"]+)"|'([^']+)'|([^\r\n]+))/m);
+    const candidate = shMatch?.[1] || shMatch?.[2] || shMatch?.[3];
+    if (candidate && fs.existsSync(candidate.trim())) return path.resolve(candidate.trim());
+  } catch {
+    // Best effort only; setup can still fall back to ordinary CLI discovery.
+  }
+  return "";
+}
+
+function writeOpencodeCommandShim(opencodeDir, { publicKey, secretKey, baseUrl, userId, realOpencodeCli }) {
   const shimDir = path.join(opencodeDir, "bin");
   ensureDir(shimDir);
   if (process.platform === "win32") {
@@ -1527,9 +1572,9 @@ async function main() {
     args.publicKey || process.env.LANGFUSE_PUBLIC_KEY || "pk-lf-da0c90a7-6e93-4eb7-bb86-c1047c8d187d";
   const secretKey =
     args.secretKey || process.env.LANGFUSE_SECRET_KEY || "sk-lf-0269b85d-bfdc-442c-bfa3-e737954e3315";
-  const baseUrl = normalizeLegacyBaseUrl(
-    args.langfuseBaseUrl || process.env.LANGFUSE_BASEURL || DEFAULT_LANGFUSE_BASE_URL
-  );
+  const baseUrl = normalizeLegacyBaseUrl(
+    args.langfuseBaseUrl || process.env.LANGFUSE_BASEURL || DEFAULT_LANGFUSE_BASE_URL
+  );
   const userId = normalizeUserId(args.userId || args.userid || "");
   if (!userId || typeof userId !== "string") {
     throw new Error("缺少参数：--userId=你的工号");
@@ -1578,6 +1623,17 @@ async function main() {
     patchDistIndexJs(distIndexInPlugins);
   }
 
+  // Install the skills-discover script the plugin's config hook imports at runtime.
+  // Wrapped so a missing source file (e.g. not in the published package's files
+  // allowlist) degrades gracefully instead of failing the whole setup.
+  try {
+    const installedDiscover = installSkillsDiscoverHelper();
+    console.log(`Skills discover helper ready: ${installedDiscover}`);
+  } catch (e) {
+    console.log(`Skills discover helper skipped: ${e?.message || e}`);
+    console.log("Skill-repo auto-discovery will not be available until setup is re-run from a complete package.");
+  }
+
   // Write plugin user config to support userId injection.
   if (userId) {
     const cfg = writeLangfusePluginUserConfig({ userId });
@@ -1600,12 +1656,12 @@ async function main() {
   writeJsonPretty(opencodeJsonPath, merged);
   let realOpencodeCli = resolveOpencodeCli(args.cmd);
   const shimDir = path.join(opencodeDir, "bin");
-  if (realOpencodeCli) {
-    const relativeToShim = path.relative(path.resolve(shimDir), path.resolve(realOpencodeCli));
-    if (relativeToShim && !relativeToShim.startsWith("..") && !path.isAbsolute(relativeToShim)) {
-      realOpencodeCli = readRealOpencodeFromManagedShim(realOpencodeCli);
-    }
-  }
+  if (realOpencodeCli) {
+    const relativeToShim = path.relative(path.resolve(shimDir), path.resolve(realOpencodeCli));
+    if (relativeToShim && !relativeToShim.startsWith("..") && !path.isAbsolute(relativeToShim)) {
+      realOpencodeCli = readRealOpencodeFromManagedShim(realOpencodeCli);
+    }
+  }
   console.log(`已更新：${opencodeJsonPath}`);
 
   const launcher = writeWindowsLauncherCmd(opencodeDir, { publicKey, secretKey, baseUrl, userId });

package/scripts/opencode-skills-discover.mjs

@@ -0,0 +1,125 @@
+// Auto-discover OpenCode skill repositories located as a child or sibling of the
+// current working directory, and print an opencode config fragment (JSON, single
+// line) to stdout. The generated opencode shim captures this output into the
+// OPENCODE_CONFIG_CONTENT env var so opencode loads it as an additional merged
+// config, registering those skill folders and allowing all skills regardless of
+// where opencode was launched from.
+//
+// This script is intentionally self-contained (only node built-ins) because it
+// is copied to ~/.config/oh-langfuse/opencode-skills-discover.mjs during setup
+// and invoked standalone via `node <path>` from the generated opencode shim.
+//
+// Discovery rules (matches the typical "launch from a sibling or parent of the
+// skills repo" usage pattern):
+//   - cwd/skills, cwd/.opencode/skills, cwd/.opencode/skill   (cwd IS a skills repo)
+//   - cwd/<child>/skills                                       (cwd is a parent of a skills repo)
+//   - ../<sibling>/skills                                      (cwd is a sibling of a skills repo)
+// A `<x>/skills` folder counts when it contains at least one SKILL.md (directly
+// or one level deep, matching the openharmony-skills layout). opencode itself
+// then scans **/SKILL.md inside each registered path.
+
+import fs from "node:fs";
+import path from "node:path";
+import os from "node:os";
+import { pathToFileURL } from "node:url";
+
+function dirExists(p) {
+  try {
+    return fs.statSync(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+
+function hasSkillFile(skillsDir) {
+  if (!dirExists(skillsDir)) return false;
+  let entries;
+  try {
+    entries = fs.readdirSync(skillsDir, { withFileTypes: true });
+  } catch {
+    return false;
+  }
+  for (const entry of entries) {
+    if (entry.isFile() && entry.name === "SKILL.md") return true;
+    if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+    try {
+      fs.accessSync(path.join(skillsDir, entry.name, "SKILL.md"));
+      return true;
+    } catch {
+      // keep scanning siblings
+    }
+  }
+  return false;
+}
+
+function safeReaddir(p) {
+  try {
+    return fs.readdirSync(p, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+}
+
+export function collectSkillRoots(cwd) {
+  const roots = new Set();
+
+  // 1. cwd itself hosts a skills folder (cwd is a skills repo root).
+  for (const sub of ["skills", path.join(".opencode", "skills"), path.join(".opencode", "skill")]) {
+    const cand = path.join(cwd, sub);
+    if (hasSkillFile(cand)) roots.add(path.resolve(cand));
+  }
+
+  // 2. cwd's children host a skills folder (cwd is a parent of skills repos).
+  for (const entry of safeReaddir(cwd)) {
+    if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+    const cand = path.join(cwd, entry.name, "skills");
+    if (hasSkillFile(cand)) roots.add(path.resolve(cand));
+  }
+
+  // 3. cwd's siblings host a skills folder (cwd is a sibling of skills repos).
+  const parent = path.dirname(cwd);
+  if (parent && parent !== cwd) {
+    for (const entry of safeReaddir(parent)) {
+      if (!entry.isDirectory() || entry.name.startsWith(".")) continue;
+      const cand = path.join(parent, entry.name, "skills");
+      if (hasSkillFile(cand)) roots.add(path.resolve(cand));
+    }
+  }
+
+  return [...roots];
+}
+
+export function buildConfig(cwd) {
+  const roots = collectSkillRoots(cwd);
+  return {
+    $schema: "https://opencode.ai/config.json",
+    skills: { paths: roots },
+    permission: { skill: { "*": "allow" } }
+  };
+}
+
+function main() {
+  const config = buildConfig(process.cwd());
+  // Single line so the calling shim can capture stdout into one env var.
+  process.stdout.write(JSON.stringify(config));
+}
+
+// Only run main() when invoked directly via `node <path>`, not when imported
+// (the opencode plugin's config hook imports this module to call
+// collectSkillRoots/buildConfig without side effects).
+function isMain() {
+  try {
+    return import.meta.url === pathToFileURL(process.argv[1] || "").href;
+  } catch {
+    return false;
+  }
+}
+
+if (isMain()) {
+  try {
+    main();
+  } catch {
+    // Stay silent on failure: if nothing is captured, OPENCODE_CONFIG_CONTENT
+    // stays unset and opencode uses its default config loading.
+  }
+}

package/scripts/real-self-verify.mjs

@@ -9,12 +9,12 @@ import { resolveOpencodeCli } from "./resolve-opencode-cli.mjs";
 const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const packageJson = JSON.parse(fs.readFileSync(path.join(rootDir, "package.json"), "utf8"));
 
-const DEFAULT_LANGFUSE_BASE_URL = "https://metrics.openharmonyinsight.cn";
-const LEGACY_LANGFUSE_BASE_URLS = new Set([
-  "http://120.46.221.227:3000",
-  "https://120.46.221.227:3000",
-]);
-const DEFAULT_LANGFUSE_PUBLIC_KEY = "pk-lf-da0c90a7-6e93-4eb7-bb86-c1047c8d187d";
+const DEFAULT_LANGFUSE_BASE_URL = "https://metrics.openharmonyinsight.cn";
+const LEGACY_LANGFUSE_BASE_URLS = new Set([
+  "http://120.46.221.227:3000",
+  "https://120.46.221.227:3000",
+]);
+const DEFAULT_LANGFUSE_PUBLIC_KEY = "pk-lf-da0c90a7-6e93-4eb7-bb86-c1047c8d187d";
 const DEFAULT_LANGFUSE_SECRET_KEY = "sk-lf-0269b85d-bfdc-442c-bfa3-e737954e3315";
 const OPENCODE_NATIVE_AGENT_TURN_NAMES = new Set(["session.llm:ai.streamText.doStream"]);
 
@@ -149,7 +149,7 @@ function findOnPath(names) {
   return "";
 }
 
-function localCodexCliCandidates() {
+function localCodexCliCandidates() {
   if (process.platform !== "win32") return ["codex"];
   const localAppData = process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
   const codexBin = path.join(localAppData, "OpenAI", "Codex", "bin");
@@ -167,20 +167,20 @@ function localCodexCliCandidates() {
     // Fall back to PATH probing below.
   }
   return [...candidates, "codex.cmd", "codex.exe", "codex"].filter(Boolean);
-}
-
-function normalizeLegacyBaseUrl(baseUrl) {
-  const value = String(baseUrl || "").trim().replace(/\/+$/, "");
-  return LEGACY_LANGFUSE_BASE_URLS.has(value) ? DEFAULT_LANGFUSE_BASE_URL : baseUrl;
-}
-
-function configFromArgs(args) {
-  return {
-    baseUrl: String(
-      normalizeLegacyBaseUrl(
-        args.langfuseBaseUrl || args.langfuseHost || args.host || process.env.LANGFUSE_BASEURL || process.env.LANGFUSE_HOST || DEFAULT_LANGFUSE_BASE_URL
-      )
-    ),
+}
+
+function normalizeLegacyBaseUrl(baseUrl) {
+  const value = String(baseUrl || "").trim().replace(/\/+$/, "");
+  return LEGACY_LANGFUSE_BASE_URLS.has(value) ? DEFAULT_LANGFUSE_BASE_URL : baseUrl;
+}
+
+function configFromArgs(args) {
+  return {
+    baseUrl: String(
+      normalizeLegacyBaseUrl(
+        args.langfuseBaseUrl || args.langfuseHost || args.host || process.env.LANGFUSE_BASEURL || process.env.LANGFUSE_HOST || DEFAULT_LANGFUSE_BASE_URL
+      )
+    ),
     publicKey: String(args.publicKey || process.env.LANGFUSE_PUBLIC_KEY || DEFAULT_LANGFUSE_PUBLIC_KEY),
     secretKey: String(args.secretKey || process.env.LANGFUSE_SECRET_KEY || DEFAULT_LANGFUSE_SECRET_KEY),
     userId: String(args.userId || args.userid || process.env.LANGFUSE_USER_ID || process.env.CC_USER_ID || "").trim(),
@@ -270,7 +270,7 @@ function basicAuth(publicKey, secretKey) {
   return `Basic ${Buffer.from(`${publicKey}:${secretKey}`, "utf8").toString("base64")}`;
 }
 
-async function langfuseGet(config, pathname, params = {}) {
+async function langfuseGet(config, pathname, params = {}) {
   const url = new URL(`${apiBase(config.baseUrl)}${pathname}`);
   for (const [key, value] of Object.entries(params)) {
     if (value !== undefined && value !== null && String(value) !== "") url.searchParams.set(key, String(value));
@@ -290,22 +290,22 @@ async function langfuseGet(config, pathname, params = {}) {
     error.status = response.status;
     throw error;
   }
-  return await response.json();
-}
-
-function isLangfuseQueryShapeError(error) {
-  if (!error) return false;
-  return error.status === 400 || error.status === 422;
-}
-
-async function langfuseGetLenient(config, pathname, params = {}) {
-  try {
-    return await langfuseGet(config, pathname, params);
-  } catch (error) {
-    if (!isLangfuseQueryShapeError(error)) throw error;
-    const fallback = {};
-    for (const key of ["limit", "page", "userId", "fields"]) {
-      if (params[key] !== undefined) fallback[key] = params[key];
+  return await response.json();
+}
+
+function isLangfuseQueryShapeError(error) {
+  if (!error) return false;
+  return error.status === 400 || error.status === 422;
+}
+
+async function langfuseGetLenient(config, pathname, params = {}) {
+  try {
+    return await langfuseGet(config, pathname, params);
+  } catch (error) {
+    if (!isLangfuseQueryShapeError(error)) throw error;
+    const fallback = {};
+    for (const key of ["limit", "page", "userId", "fields"]) {
+      if (params[key] !== undefined) fallback[key] = params[key];
     }
     return await langfuseGet(config, pathname, fallback);
   }
@@ -371,29 +371,29 @@ function metadataValue(item, key) {
   return 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 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"
@@ -424,18 +424,18 @@ function expectedAgentTurnName(target) {
 async function observationsForTrace(config, traceId, since) {
   if (!traceId) return [];
   const params = { limit: 100, fields: "core,basic,usage", traceId };
-  try {
-    return dataArray(await langfuseGet(config, "/v2/observations", params));
-  } catch (error) {
-    if (!isLangfuseQueryShapeError(error) && error.status !== 404) throw error;
-  }
-  try {
-    return dataArray(await langfuseGet(config, "/observations", { limit: 100, traceId }));
-  } catch (error) {
-    if (!isLangfuseQueryShapeError(error)) throw error;
-  }
-  const fallback = dataArray(await langfuseGetLenient(config, "/observations", { limit: 100, fromTimestamp: since.toISOString() }));
-  return fallback.filter((item) => item.traceId === traceId || item.trace_id === traceId);
+  try {
+    return dataArray(await langfuseGet(config, "/v2/observations", params));
+  } catch (error) {
+    if (!isLangfuseQueryShapeError(error) && error.status !== 404) throw error;
+  }
+  try {
+    return dataArray(await langfuseGet(config, "/observations", { limit: 100, traceId }));
+  } catch (error) {
+    if (!isLangfuseQueryShapeError(error)) throw error;
+  }
+  const fallback = dataArray(await langfuseGetLenient(config, "/observations", { limit: 100, fromTimestamp: since.toISOString() }));
+  return fallback.filter((item) => item.traceId === traceId || item.trace_id === traceId);
 }
 
 function mergeMetricCandidates(items) {
@@ -456,12 +456,12 @@ async function recentMetricCandidates(config, since) {
   const candidates = [];
   for (const pathname of ["/traces"]) {
     for (const params of [{ ...baseParams, userId: config.userId }, baseParams]) {
-      try {
-        candidates.push(...dataArray(await langfuseGetLenient(config, pathname, params)));
-      } catch (error) {
-        if (error.name === "AbortError" || error.status === 404 || isLangfuseQueryShapeError(error)) continue;
-        throw error;
-      }
+      try {
+        candidates.push(...dataArray(await langfuseGetLenient(config, pathname, params)));
+      } catch (error) {
+        if (error.name === "AbortError" || error.status === 404 || isLangfuseQueryShapeError(error)) continue;
+        throw error;
+      }
     }
   }
   return mergeMetricCandidates(candidates);
@@ -539,20 +539,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 (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}.`);
-          }
-        }
-      }
-    }
+    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);
@@ -581,12 +581,12 @@ async function findLangfuseMarker(config, marker, { since, target }) {
 
   for (const params of traceQueries) {
     let traces;
-    try {
-      traces = await langfuseGetLenient(config, "/traces", params);
-    } catch (error) {
-      if (error.status === 404 || isLangfuseQueryShapeError(error)) continue;
-      throw error;
-    }
+    try {
+      traces = await langfuseGetLenient(config, "/traces", params);
+    } catch (error) {
+      if (error.status === 404 || isLangfuseQueryShapeError(error)) continue;
+      throw error;
+    }
     for (const trace of dataArray(traces)) {
       if (containsMarker(trace, marker)) return { kind: "trace-list", target, id: idOf(trace), item: trace };
     }
@@ -614,10 +614,10 @@ async function findLangfuseMarker(config, marker, { since, target }) {
       for (const observation of dataArray(observations)) {
         if (containsMarker(observation, marker)) return { kind: pathname, target, id: idOf(observation), item: observation };
       }
-    } catch (error) {
-      if (error.status === 404 || isLangfuseQueryShapeError(error)) continue;
-      throw error;
-    }
+    } catch (error) {
+      if (error.status === 404 || isLangfuseQueryShapeError(error)) continue;
+      throw error;
+    }
   }
 
   return null;