oh-langfuse 0.1.77 → 0.1.79

package/bin/cli.js

@@ -9,8 +9,12 @@ import { resolveOpencodeCli } from "../scripts/resolve-opencode-cli.mjs";
 const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 const scriptsDir = path.join(rootDir, "scripts");
 
-const DEFAULT_LANGFUSE_BASE_URL = "http://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 USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
 const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
@@ -115,13 +119,18 @@ function mask(v) {
   return `${v.slice(0, 4)}...${v.slice(-4)}`;
 }
 
-function hasValue(v) {
-  return typeof v === "string" && v.trim().length > 0;
-}
-
-function normalizeUserId(v) {
-  return String(v || "").trim();
-}
+function hasValue(v) {
+  return typeof v === "string" && v.trim().length > 0;
+}
+
+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 isValidUserId(v) {
   return USER_ID_PATTERN.test(normalizeUserId(v));
@@ -506,18 +515,18 @@ async function askMultiChoice(rl, label, choices, options = {}) {
     .map((idx) => choices[idx].value);
 }
 
-function langfuseConfig(overrides = {}) {
-  const config = {
-    baseUrl: envDefault("LANGFUSE_BASEURL", envDefault("LANGFUSE_HOST", DEFAULT_LANGFUSE_BASE_URL)),
-    publicKey: envDefault("LANGFUSE_PUBLIC_KEY", DEFAULT_LANGFUSE_PUBLIC_KEY),
-    secretKey: envDefault("LANGFUSE_SECRET_KEY", DEFAULT_LANGFUSE_SECRET_KEY),
-    userId: ""
-  };
-  for (const [key, value] of Object.entries(overrides)) {
-    if (hasValue(value)) config[key] = value;
-  }
-  return config;
-}
+function langfuseConfig(overrides = {}) {
+  const config = {
+    baseUrl: normalizeLegacyBaseUrl(envDefault("LANGFUSE_BASEURL", envDefault("LANGFUSE_HOST", DEFAULT_LANGFUSE_BASE_URL))),
+    publicKey: envDefault("LANGFUSE_PUBLIC_KEY", DEFAULT_LANGFUSE_PUBLIC_KEY),
+    secretKey: envDefault("LANGFUSE_SECRET_KEY", DEFAULT_LANGFUSE_SECRET_KEY),
+    userId: ""
+  };
+  for (const [key, value] of Object.entries(overrides)) {
+    if (hasValue(value)) config[key] = key === "baseUrl" ? normalizeLegacyBaseUrl(value) : value;
+  }
+  return config;
+}
 
 async function collectLangfuseConfig(rl, { requireUserId = false, overrides = {} } = {}) {
   const config = langfuseConfig(overrides);

package/codex_langfuse_notify.py

@@ -238,12 +238,25 @@ def collect_repo_context(cwd: Optional[str], cwd_source: str = "unavailable") ->
         return context
     context["git_root"] = root
 
-    ok_remote, remote, remote_error = run_git_command(cwd_text, ["config", "--get", "remote.origin.url"])
-    if ok_remote and remote:
-        remote_context = sanitize_git_remote(remote)
+    remote_context: Dict[str, str] = {}
+    remote_error = ""
+    for remote_name in ("origin", "gitcode", "upstream"):
+        ok_remote, remote, remote_error = run_git_command(cwd_text, ["config", "--get", f"remote.{remote_name}.url"])
+        if ok_remote and remote:
+            remote_context = sanitize_git_remote(remote)
+            if remote_context.get("git_remote"):
+                break
+            remote_context = {}
+    if not remote_context.get("git_remote"):
+        ok_list, remotes_raw, list_error = run_git_command(cwd_text, ["remote"])
+        if ok_list and remotes_raw:
+            first_remote = remotes_raw.splitlines()[0].strip() if remotes_raw.strip() else ""
+            if first_remote:
+                ok_remote, remote, remote_error = run_git_command(cwd_text, ["config", "--get", f"remote.{first_remote}.url"])
+                if ok_remote and remote:
+                    remote_context = sanitize_git_remote(remote)
+    if remote_context.get("git_remote"):
         context.update(remote_context)
-        if not remote_context["git_remote"]:
-            context["git_context_error"] = "remote_parse_failed"
     elif remote_error in ("timeout", "git_unavailable"):
         context["git_context_available"] = False
         context["git_context_error"] = remote_error
@@ -1503,7 +1516,7 @@ def main() -> int:
         or os.environ.get("LANGFUSE_BASEURL")
         or os.environ.get("LANGFUSE_HOST")
         or config.get("baseUrl")
-        or "https://cloud.langfuse.com"
+        or "https://metrics.openharmonyinsight.cn"
     )
     user_id = (
         find_value(payload, ("user_id", "userId", "username", "userName"))

package/langfuse_hook.py

@@ -228,12 +228,25 @@ def collect_repo_context(cwd: Optional[str], cwd_source: str = "unavailable") ->
         return context
     context["git_root"] = root
 
-    ok_remote, remote, remote_error = run_git_command(cwd_text, ["config", "--get", "remote.origin.url"])
-    if ok_remote and remote:
-        remote_context = sanitize_git_remote(remote)
+    remote_context: Dict[str, str] = {}
+    remote_error = ""
+    for remote_name in ("origin", "gitcode", "upstream"):
+        ok_remote, remote, remote_error = run_git_command(cwd_text, ["config", "--get", f"remote.{remote_name}.url"])
+        if ok_remote and remote:
+            remote_context = sanitize_git_remote(remote)
+            if remote_context.get("git_remote"):
+                break
+            remote_context = {}
+    if not remote_context.get("git_remote"):
+        ok_list, remotes_raw, list_error = run_git_command(cwd_text, ["remote"])
+        if ok_list and remotes_raw:
+            first_remote = remotes_raw.splitlines()[0].strip() if remotes_raw.strip() else ""
+            if first_remote:
+                ok_remote, remote, remote_error = run_git_command(cwd_text, ["config", "--get", f"remote.{first_remote}.url"])
+                if ok_remote and remote:
+                    remote_context = sanitize_git_remote(remote)
+    if remote_context.get("git_remote"):
         context.update(remote_context)
-        if not remote_context["git_remote"]:
-            context["git_context_error"] = "remote_parse_failed"
     elif remote_error in ("timeout", "git_unavailable"):
         context["git_context_available"] = False
         context["git_context_error"] = remote_error
@@ -1170,7 +1183,7 @@ def main() -> int:
 
     public_key = os.environ.get("CC_LANGFUSE_PUBLIC_KEY") or os.environ.get("LANGFUSE_PUBLIC_KEY")
     secret_key = os.environ.get("CC_LANGFUSE_SECRET_KEY") or os.environ.get("LANGFUSE_SECRET_KEY")
-    host = os.environ.get("CC_LANGFUSE_BASE_URL") or os.environ.get("LANGFUSE_BASEURL") or "https://cloud.langfuse.com"
+    host = os.environ.get("CC_LANGFUSE_BASE_URL") or os.environ.get("LANGFUSE_BASEURL") or "https://metrics.openharmonyinsight.cn"
 
     if not public_key or not secret_key:
         warn("Missing Langfuse public/secret key in hook environment; exiting.")

package/package.json

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

package/scripts/codex-langfuse-setup.mjs

@@ -7,13 +7,23 @@ import { fileURLToPath } from "node:url";
 import { defaultWindowsNpmCliCandidates, listSystemCliCandidates } from "./cli-detection-utils.mjs";
 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})$";
-
-function normalizeUserId(v) {
-  return String(v || "").trim();
-}
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+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 USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
+const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
+
+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))) {
@@ -463,13 +473,14 @@ 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 =
-    args.langfuseBaseUrl ||
-    args.langfuseHost ||
-    args.host ||
-    process.env.LANGFUSE_BASEURL ||
-    process.env.LANGFUSE_HOST ||
-    "http://120.46.221.227:3000";
+  const baseUrl = normalizeLegacyBaseUrl(
+    args.langfuseBaseUrl ||
+    args.langfuseHost ||
+    args.host ||
+    process.env.LANGFUSE_BASEURL ||
+    process.env.LANGFUSE_HOST ||
+    DEFAULT_LANGFUSE_BASE_URL
+  );
   const userId = normalizeUserId(args.userId || args.userid || "");
   if (!userId || typeof userId !== "string") {
     throw new Error("缺少参数：--userId=你的工号");

package/scripts/langfuse-setup.mjs

@@ -7,15 +7,25 @@ import { fileURLToPath } from "node:url";
 import { defaultWindowsNpmCliCandidates, listSystemCliCandidates } from "./cli-detection-utils.mjs";
 import { writeRuntimeInstallRecord } from "./runtime-state-utils.mjs";
 
-const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
-const packageJson = JSON.parse(fs.readFileSync(path.join(packageRoot, "package.json"), "utf8"));
-
-const USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
-const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
-
-function normalizeUserId(v) {
-  return String(v || "").trim();
-}
+const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
+const packageJson = JSON.parse(fs.readFileSync(path.join(packageRoot, "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 USER_ID_PATTERN = /^[a-z](?:\d{8}|wx\d{7})$/;
+const USER_ID_PATTERN_TEXT = "^[a-z](?:\\d{8}|wx\\d{7})$";
+
+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))) {
@@ -473,13 +483,14 @@ async function main() {
   }
   assertValidUserId(userId);
 
-  const langfuseHost =
-    args.langfuseBaseUrl ||
-    args.langfuseHost ||
-    args.host ||
-    process.env.LANGFUSE_BASEURL ||
-    process.env.LANGFUSE_HOST ||
-    "http://120.46.221.227:3000";
+  const langfuseHost = normalizeLegacyBaseUrl(
+    args.langfuseBaseUrl ||
+    args.langfuseHost ||
+    args.host ||
+    process.env.LANGFUSE_BASEURL ||
+    process.env.LANGFUSE_HOST ||
+    DEFAULT_LANGFUSE_BASE_URL
+  );
 
   const publicKey =
     args.publicKey || process.env.LANGFUSE_PUBLIC_KEY || "pk-lf-da0c90a7-6e93-4eb7-bb86-c1047c8d187d";

package/scripts/opencode-langfuse-run.mjs

@@ -3,12 +3,22 @@ import { fileURLToPath } from "node:url";
 import { spawnSync } from "node:child_process";
 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})$";
-
-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 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))) {
@@ -42,7 +52,7 @@ 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 = args.langfuseBaseUrl || process.env.LANGFUSE_BASEURL || "http://120.46.221.227:3000";
+  const baseUrl = normalizeLegacyBaseUrl(args.langfuseBaseUrl || process.env.LANGFUSE_BASEURL || DEFAULT_LANGFUSE_BASE_URL);
   const userId = normalizeUserId(args.userId || args.userid || "");
   if (!userId) {
     throw new Error("Missing userId. Run with --userId=your-id.");
@@ -54,9 +64,10 @@ function main() {
   const setupPath = path.join(scriptsDir, "opencode-langfuse-setup.mjs");
   const setupExtra = [];
   if (args["no-set-env"]) setupExtra.push("--no-set-env");
-  if (args["skip-plugin-install"]) setupExtra.push("--skip-plugin-install");
-  if (userId) setupExtra.push(`--userId=${userId}`);
-  runNodeScript(setupPath, setupExtra);
+  if (args["skip-plugin-install"]) setupExtra.push("--skip-plugin-install");
+  if (userId) setupExtra.push(`--userId=${userId}`);
+  setupExtra.push(`--langfuseBaseUrl=${baseUrl}`);
+  runNodeScript(setupPath, setupExtra);
 
   // 2) 直接带环境变量启动 opencode（本进程内有效）
   const cmdArg = args.cmd || "opencode";