oh-langfuse 0.1.54 → 0.1.55

package/package.json

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

package/scripts/codex-langfuse-setup.mjs

@@ -59,13 +59,54 @@ function tomlArray(items) {
   return `[${items.map(tomlString).join(", ")}]`;
 }
 
-function pythonExecutableInVenv(venvDir) {
-  return process.platform === "win32"
-    ? path.join(venvDir, "Scripts", "python.exe")
-    : path.join(venvDir, "bin", "python");
-}
-
-function shQuote(s) {
+function pythonExecutableInVenv(venvDir) {
+  return process.platform === "win32"
+    ? path.join(venvDir, "Scripts", "python.exe")
+    : path.join(venvDir, "bin", "python");
+}
+
+function pythonCanImport(pythonCmd, moduleName) {
+  try {
+    execFileSync(pythonCmd, ["-c", `import ${moduleName}`], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function runPipInstallWithFallback({ pythonCmd, pipIndexUrl }) {
+  const attempts = [
+    { command: pythonCmd, args: ["-m", "pip", "install", "--user", "-U", "langfuse", "-i", pipIndexUrl] },
+    { command: "pip3", args: ["install", "--user", "-U", "langfuse", "-i", pipIndexUrl] },
+    { command: "pip", args: ["install", "--user", "-U", "langfuse", "-i", pipIndexUrl] }
+  ];
+
+  const errors = [];
+  for (const attempt of attempts) {
+    try {
+      console.log(`Trying Python package install: ${attempt.command} ${attempt.args.join(" ")}`);
+      execFileSync(attempt.command, attempt.args, { stdio: "inherit" });
+      return;
+    } catch (error) {
+      errors.push(`${attempt.command}: ${error?.message || error}`);
+    }
+  }
+
+  throw new Error(
+    `Failed to install langfuse with system Python/pip. Tried python -m pip, pip3, and pip. Last errors: ${errors.join(" | ")}`
+  );
+}
+
+function installLangfuseWithSystemPython({ pythonCmd, pipIndexUrl }) {
+  console.log("Python venv is unavailable; falling back to system Python user install for langfuse.");
+  runPipInstallWithFallback({ pythonCmd, pipIndexUrl });
+  if (!pythonCanImport(pythonCmd, "langfuse")) {
+    throw new Error("langfuse was installed with pip, but python3 still cannot import it. Install python3-venv and rerun setup, for example: sudo apt install python3-venv");
+  }
+  return pythonCmd;
+}
+
+function shQuote(s) {
   return `'${String(s).replace(/'/g, "'\"'\"'")}'`;
 }
 
@@ -288,14 +329,14 @@ function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.
 
   if (!fs.existsSync(venvPython)) {
     console.log(`Creating Python virtual environment: ${venvDir}`);
-    try {
-      execFileSync(pythonCmd, ["-m", "venv", venvDir], { stdio: "inherit" });
-    } catch (e) {
-      if (process.platform !== "win32") {
-        throw new Error("Failed to create Python venv. Please install python3-venv first, for example: sudo apt install python3-venv");
-      }
-      throw new Error("Failed to create Python venv. Please confirm Python venv support is available.");
-    }
+    try {
+      execFileSync(pythonCmd, ["-m", "venv", venvDir], { stdio: "inherit" });
+    } catch (e) {
+      if (process.platform !== "win32") {
+        return installLangfuseWithSystemPython({ pythonCmd, pipIndexUrl });
+      }
+      throw new Error("Failed to create Python venv. Please confirm Python venv support is available.");
+    }
   }
 
   console.log("Installing/updating Python package in venv: langfuse");
@@ -303,11 +344,14 @@ function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.
     execFileSync(
       venvPython,
       ["-m", "pip", "install", "-U", "langfuse", "-i", pipIndexUrl],
-      { stdio: "inherit" }
-    );
-  } catch (e) {
-    throw new Error(`Failed to install langfuse in venv: ${venvPython} -m pip install -U langfuse -i ${pipIndexUrl}`);
-  }
+      { stdio: "inherit" }
+    );
+  } catch (e) {
+    if (process.platform !== "win32") {
+      return installLangfuseWithSystemPython({ pythonCmd, pipIndexUrl });
+    }
+    throw new Error(`Failed to install langfuse in venv: ${venvPython} -m pip install -U langfuse -i ${pipIndexUrl}`);
+  }
 
   return venvPython;
 }

package/scripts/langfuse-setup.mjs

@@ -343,13 +343,54 @@ function createAgentLauncher({ baseDir, target, executable }) {
   return launcher;
 }
 
-function pythonExecutableInVenv(venvDir) {
-  return process.platform === "win32"
-    ? path.join(venvDir, "Scripts", "python.exe")
-    : path.join(venvDir, "bin", "python");
-}
-
-async function createHookLauncher({ hooksDir, hookPython, pyPath }) {
+function pythonExecutableInVenv(venvDir) {
+  return process.platform === "win32"
+    ? path.join(venvDir, "Scripts", "python.exe")
+    : path.join(venvDir, "bin", "python");
+}
+
+function pythonCanImport(pythonCmd, moduleName) {
+  try {
+    execFileSync(pythonCmd, ["-c", `import ${moduleName}`], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function runPipInstallWithFallback({ pythonCmd, pipIndexUrl }) {
+  const attempts = [
+    { command: pythonCmd, args: ["-m", "pip", "install", "--user", "-U", "langfuse", "-i", pipIndexUrl] },
+    { command: "pip3", args: ["install", "--user", "-U", "langfuse", "-i", pipIndexUrl] },
+    { command: "pip", args: ["install", "--user", "-U", "langfuse", "-i", pipIndexUrl] }
+  ];
+
+  const errors = [];
+  for (const attempt of attempts) {
+    try {
+      console.log(`Trying Python package install: ${attempt.command} ${attempt.args.join(" ")}`);
+      execFileSync(attempt.command, attempt.args, { stdio: "inherit" });
+      return;
+    } catch (error) {
+      errors.push(`${attempt.command}: ${error?.message || error}`);
+    }
+  }
+
+  throw new Error(
+    `Failed to install langfuse with system Python/pip. Tried python -m pip, pip3, and pip. Last errors: ${errors.join(" | ")}`
+  );
+}
+
+function installLangfuseWithSystemPython({ pythonCmd, pipIndexUrl }) {
+  console.log("Python venv is unavailable; falling back to system Python user install for langfuse.");
+  runPipInstallWithFallback({ pythonCmd, pipIndexUrl });
+  if (!pythonCanImport(pythonCmd, "langfuse")) {
+    throw new Error("langfuse was installed with pip, but python3 still cannot import it. Install python3-venv and rerun setup, for example: sudo apt install python3-venv");
+  }
+  return pythonCmd;
+}
+
+async function createHookLauncher({ hooksDir, hookPython, pyPath }) {
   if (process.platform === "win32") {
     const launcher = path.join(hooksDir, "run-langfuse-hook.cmd");
     const content = [
@@ -379,14 +420,14 @@ function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.
 
   if (!fs.existsSync(venvPython)) {
     console.log(`Creating Python virtual environment: ${venvDir}`);
-    try {
-      execFileSync(pythonCmd, ["-m", "venv", venvDir], { stdio: "inherit" });
-    } catch (e) {
-      if (process.platform !== "win32") {
-        throw new Error("Failed to create Python venv. Please install python3-venv first, for example: sudo apt install python3-venv");
-      }
-      throw new Error("Failed to create Python venv. Please confirm Python venv support is available.");
-    }
+    try {
+      execFileSync(pythonCmd, ["-m", "venv", venvDir], { stdio: "inherit" });
+    } catch (e) {
+      if (process.platform !== "win32") {
+        return installLangfuseWithSystemPython({ pythonCmd, pipIndexUrl });
+      }
+      throw new Error("Failed to create Python venv. Please confirm Python venv support is available.");
+    }
   }
 
   console.log("Installing/updating Python package in venv: langfuse");
@@ -394,11 +435,14 @@ function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.
     execFileSync(
       venvPython,
       ["-m", "pip", "install", "-U", "langfuse", "-i", pipIndexUrl],
-      { stdio: "inherit" }
-    );
-  } catch (e) {
-    throw new Error(`Failed to install langfuse in venv: ${venvPython} -m pip install -U langfuse -i ${pipIndexUrl}`);
-  }
+      { stdio: "inherit" }
+    );
+  } catch (e) {
+    if (process.platform !== "win32") {
+      return installLangfuseWithSystemPython({ pythonCmd, pipIndexUrl });
+    }
+    throw new Error(`Failed to install langfuse in venv: ${venvPython} -m pip install -U langfuse -i ${pipIndexUrl}`);
+  }
 
   return venvPython;
 }

package/scripts/opencode-langfuse-check.mjs

@@ -61,6 +61,7 @@ function main() {
   const userConfigPath = path.join(home, ".config", "opencode-plugin-langfuse", "config.json");
   const windowsLauncherPath = path.join(opencodeDir, "launch-opencode-langfuse.cmd");
   const unixLauncherPath = path.join(opencodeDir, "launch-opencode-langfuse.sh");
+  const opencodeCommandShimPath = path.join(opencodeDir, "bin", process.platform === "win32" ? "opencode.cmd" : "opencode");
 
   const results = [];
 
@@ -134,6 +135,14 @@ function main() {
     "Run setup again and enter userId when prompted."
   );
 
+  addResult(
+    results,
+    "opencode command shim",
+    fs.existsSync(opencodeCommandShimPath),
+    opencodeCommandShimPath,
+    "Run setup again after installing OpenCode so the direct opencode command can load Langfuse and auto-update checks."
+  );
+
   if (process.platform === "win32") {
     addResult(
       results,

package/scripts/opencode-langfuse-setup.mjs

@@ -512,12 +512,10 @@ function getPatchedLangfuseDistIndexJs() {
     "  if (userId) spanProcessors.push(createUserIdSpanProcessor(userId));",
     "",
     "  const sdk = new NodeSDK({ spanProcessors });",
-    "  // Defer SDK start to avoid blocking Opencode launch",
-    "  setImmediate(() => {",
-    '    try { sdk.start(); }',
-    '    catch (err) { log("warn", `OTEL SDK start failed: ${err?.message ?? err}`); }',
+    "  const sdkStartPromise = Promise.resolve().then(() => sdk.start()).catch((err) => {",
+    '    log("warn", `OTEL SDK start failed: ${err?.message ?? err}`);',
     "  });",
-    "  const metricsTracer = trace.getTracer('oh-langfuse-opencode-metrics');",
+    "  const getMetricsTracer = () => trace.getTracer('oh-langfuse-opencode-metrics');",
     "  const knownSkillNames = await collectKnownSkillNames();",
     "  const startupSkillUsages = detectOpencodeSkillUsages(process.argv.join('\\n'), knownSkillNames);",
     "  const messageTextById = new Map();",
@@ -534,21 +532,23 @@ function getPatchedLangfuseDistIndexJs() {
     '  if (userId) log("info", `LANGFUSE userId configured -> ${userId}`);',
     '  if (knownSkillNames.length) log("info", `OpenCode skills discovered -> ${knownSkillNames.length}`);',
     "",
-    "  let shutdownStarted = false;",
-    "  const flush = async (reason) => {",
-    "    try {",
-    '      log("info", `Flushing OTEL spans on ${reason}`);',
-    "      await processor.forceFlush();",
+    "  let shutdownStarted = false;",
+    "  const flush = async (reason) => {",
+    "    try {",
+    '      log("info", `Flushing OTEL spans on ${reason}`);',
+    "      await sdkStartPromise;",
+    "      await processor.forceFlush();",
     "    } catch (error) {",
     '      log("warn", `OTEL forceFlush failed on ${reason}: ${error?.message ?? error}`);',
     "    }",
     "  };",
     "  const shutdown = async (reason) => {",
-    "    if (shutdownStarted) return;",
-    "    shutdownStarted = true;",
-    "    try {",
-    '      log("info", `Shutting down OTEL SDK on ${reason}`);',
-    "      await sdk.shutdown();",
+    "    if (shutdownStarted) return;",
+    "    shutdownStarted = true;",
+    "    try {",
+    '      log("info", `Shutting down OTEL SDK on ${reason}`);',
+    "      await sdkStartPromise;",
+    "      await sdk.shutdown();",
     "    } catch (error) {",
     '      log("warn", `OTEL shutdown failed on ${reason}: ${error?.message ?? error}`);',
     "    }",
@@ -586,7 +586,7 @@ function getPatchedLangfuseDistIndexJs() {
     "    }",
     "    set.add(activity.toolCallId || `${kind}:${set.size + 1}`);",
     "  };",
-    "  const recordInteractionMetric = (event) => {",
+    "  const recordInteractionMetric = async (event) => {",
     "    const payload = eventPayload(event);",
     "    const part = eventPart(event);",
     "    const partType = part?.type ?? '';",
@@ -617,7 +617,8 @@ 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);",
-    "    const span = metricsTracer.startSpan('Agent Turn');",
+    "    await sdkStartPromise;",
+    "    const span = getMetricsTracer().startSpan('Agent Turn');",
     "    const text = messageTextById.get(messageId) || '';",
     "    const skillUsages = dedupeSkillUsages([...(skillUsagesByMessageId.get(messageId) ?? []), ...(skillUsagesBySessionId.get(sessionId) ?? [])]);",
     "    const interactionId = `opencode:${userId || \"unknown\"}:${sessionId || \"unknown\"}:${messageId}`;",
@@ -673,9 +674,9 @@ function getPatchedLangfuseDistIndexJs() {
     '        log("warn", "OpenTelemetry experimental feature is disabled in Opencode config - tracing disabled");',
     "      }",
     "    },",
-    "    event: async ({ event }) => {",
-    "      const eventType = pickEventString(event?.name, event?.type, eventPayload(event)?.name, eventPayload(event)?.type);",
-    "      recordInteractionMetric(event);",
+    "    event: async ({ event }) => {",
+    "      const eventType = pickEventString(event?.name, event?.type, eventPayload(event)?.name, eventPayload(event)?.type);",
+    "      await recordInteractionMetric(event);",
     '      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);",
     "      }",
@@ -973,24 +974,28 @@ function npmInstallLooksLikeMissingVersion(result) {
   return text.includes("etarget") || text.includes("notarget") || text.includes("no matching version found");
 }
 
-function isOfficialNpmRegistry(registry) {
-  return /^https?:\/\/registry\.npmjs\.org\/?$/i.test(String(registry || "").trim());
-}
-
-async function runNpmInstallOrThrow({ opencodeDir, pkgName = "opencode-plugin-langfuse", npmRegistry = "" }) {
-  const npmArgs = ["install", pkgName, "--prefix", opencodeDir, "--package-lock=false", "--no-save", "--audit=false", "--fund=false"];
-  if (npmRegistry) npmArgs.push("--registry", npmRegistry);
-  const cliJs = getNpmCliJsPath();
-  console.log(`使用 npm：${fs.existsSync(cliJs) ? `node ${cliJs}` : getNpmExecutable()}`);
-  console.log("Installing OpenCode Langfuse plugin. This can take a few minutes on slow networks...");
-  let r = await runNpmInstallCapture(npmArgs);
-  if (!r.error && r.status !== 0 && npmInstallLooksLikeMissingVersion(r) && !isOfficialNpmRegistry(npmRegistry)) {
-    console.error("");
-    console.error("npm registry appears to be missing a package version. Retrying with https://registry.npmjs.org/ ...");
-    const retryArgs = ["install", pkgName, "--prefix", opencodeDir, "--package-lock=false", "--no-save", "--audit=false", "--fund=false", "--registry", "https://registry.npmjs.org/"];
-    r = await runNpmInstallCapture(retryArgs);
-    if (!r.error && r.status === 0) return;
-  }
+function isOfficialNpmRegistry(registry) {
+  return /^https?:\/\/registry\.npmjs\.org\/?$/i.test(String(registry || "").trim());
+}
+
+const OFFICIAL_NPM_REGISTRY = "https://registry.npmjs.org/";
+
+async function runNpmInstallOrThrow({ opencodeDir, pkgName = "opencode-plugin-langfuse", npmRegistry = "" }) {
+  const npmArgs = ["install", pkgName, "--prefix", opencodeDir, "--package-lock=false", "--no-save", "--audit=false", "--fund=false"];
+  const effectiveRegistry = npmRegistry || OFFICIAL_NPM_REGISTRY;
+  npmArgs.push("--registry", effectiveRegistry);
+  const cliJs = getNpmCliJsPath();
+  console.log(`使用 npm：${fs.existsSync(cliJs) ? `node ${cliJs}` : getNpmExecutable()}`);
+  console.log(`使用 npm registry：${effectiveRegistry}`);
+  console.log("Installing OpenCode Langfuse plugin. This can take a few minutes on slow networks...");
+  let r = await runNpmInstallCapture(npmArgs);
+  if (!r.error && r.status !== 0 && npmInstallLooksLikeMissingVersion(r) && !isOfficialNpmRegistry(effectiveRegistry)) {
+    console.error("");
+    console.error(`npm registry appears to be missing a package version. Retrying with ${OFFICIAL_NPM_REGISTRY} ...`);
+    const retryArgs = ["install", pkgName, "--prefix", opencodeDir, "--package-lock=false", "--no-save", "--audit=false", "--fund=false", "--registry", OFFICIAL_NPM_REGISTRY];
+    r = await runNpmInstallCapture(retryArgs);
+    if (!r.error && r.status === 0) return;
+  }
   if (!r.error && r.status === 0) return;
   printNpmDiagnostics();
   const npmLabel = fs.existsSync(cliJs) ? `node ${cliJs}` : getNpmExecutable();
@@ -1105,7 +1110,7 @@ async function main() {
     throw new Error("缺少参数：--userId=你的工号");
   }
   assertValidUserId(userId);
-  const npmRegistry = args.npmRegistry || process.env.OPENCODE_NPM_REGISTRY || process.env.NPM_CONFIG_REGISTRY || "";
+  const npmRegistry = args.npmRegistry || process.env.OPENCODE_NPM_REGISTRY || "";
 
   const home = os.homedir();
   const opencodeDir = path.join(home, ".config", "opencode");