oh-langfuse 0.1.17 → 0.1.18

package/README.md

@@ -9,7 +9,7 @@ Claude Code、OpenCode 和 Codex。它提供终端安装向导、直接 setup/ch
 本仓是 AI Coding 工具链中的 Langfuse 能力包，负责：
 
 - 检查 Node.js、npm、Python、pip、OpenCode CLI 等本地依赖；
-- 收集 Langfuse 用户标识，通常是员工号，例如 `h00613222`；
+- 收集 Langfuse 用户标识，必须匹配 `^[a-z](?:\d{8}|wx\d{7})$`，例如 `h00613222` 或 `hwx1234567`；
 - 安装或更新 hook 脚本、插件文件、Python 虚拟环境和用户级配置；
 - 校验 Claude Code、OpenCode、Codex 的 Langfuse 配置是否生效。
 

package/bin/cli.js

@@ -8,9 +8,11 @@ import { spawnSync } from "node:child_process";
 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_SECRET_KEY = "sk-lf-0269b85d-bfdc-442c-bfa3-e737954e3315";
+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_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})$";
 
 const colorEnabled = process.stdout.isTTY && process.env.NO_COLOR !== "1";
 const ansi = (code) => (colorEnabled ? `\x1b[${code}m` : "");
@@ -81,9 +83,21 @@ function mask(v) {
   return `${v.slice(0, 4)}...${v.slice(-4)}`;
 }
 
-function hasValue(v) {
-  return typeof v === "string" && v.trim().length > 0;
-}
+function hasValue(v) {
+  return typeof v === "string" && v.trim().length > 0;
+}
+
+function normalizeUserId(v) {
+  return String(v || "").trim();
+}
+
+function isValidUserId(v) {
+  return USER_ID_PATTERN.test(normalizeUserId(v));
+}
+
+function userIdValidationMessage() {
+  return `User ID must match ${USER_ID_PATTERN_TEXT}, for example h00613222 or hwx1234567.`;
+}
 
 function scriptPath(name) {
   return path.join(scriptsDir, name);
@@ -249,17 +263,25 @@ function runNodeScript(name, args = [], { dryRun = false } = {}) {
   return r.status ?? (r.error ? 1 : 0);
 }
 
-async function askText(rl, label, { defaultValue = "", required = false } = {}) {
-  while (true) {
-    const suffix = defaultValue ? paint(` ${defaultValue}`, t.muted) : "";
-    const answer = (await rl.question(`${paint(label, t.cyan)}${suffix}\n${paint(">", t.teal)} `)).trim();
-    const value = answer || defaultValue;
-    if (!required || hasValue(value)) return value;
-    console.log(paint("This value is required.", t.red));
-  }
-}
-
-async function askYesNo(rl, label, { defaultValue = true } = {}) {
+async function askText(rl, label, { defaultValue = "", required = false, validate = null, invalidMessage = "" } = {}) {
+  while (true) {
+    const suffix = defaultValue ? paint(` ${defaultValue}`, t.muted) : "";
+    const answer = (await rl.question(`${paint(label, t.cyan)}${suffix}\n${paint(">", t.teal)} `)).trim();
+    const value = answer || defaultValue;
+    if (required && !hasValue(value)) {
+      console.log(paint("This value is required.", t.red));
+      continue;
+    }
+    if (validate && hasValue(value) && !validate(value)) {
+      console.log(paint(invalidMessage || "Invalid value.", t.red));
+      continue;
+    }
+    if (!required || hasValue(value)) return value;
+    console.log(paint("This value is required.", t.red));
+  }
+}
+
+async function askYesNo(rl, label, { defaultValue = false } = {}) {
   const hint = defaultValue ? "Y/n" : "y/N";
   while (true) {
     const answer = (await rl.question(`${paint(label, t.cyan)} ${paint(`(${hint})`, t.muted)} `)).trim().toLowerCase();
@@ -456,7 +478,7 @@ function langfuseConfig(overrides = {}) {
     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: envDefault("LANGFUSE_USER_ID", envDefault("CC_USER_ID", ""))
+    userId: ""
   };
   for (const [key, value] of Object.entries(overrides)) {
     if (hasValue(value)) config[key] = value;
@@ -471,10 +493,18 @@ async function collectLangfuseConfig(rl, { requireUserId = false, overrides = {}
     labelValue("Public Key", config.publicKey, t.blue),
     labelValue("Secret Key", "configured", t.teal)
   ]);
-  if (requireUserId && hasValue(config.userId)) return config;
+  if (hasValue(config.userId)) {
+    config.userId = normalizeUserId(config.userId);
+    if (!isValidUserId(config.userId)) {
+      throw new Error(userIdValidationMessage());
+    }
+    if (requireUserId) return config;
+  }
   config.userId = await askText(rl, "User ID / employee number, for example h00613222", {
-    defaultValue: requireUserId ? "" : config.userId,
-    required: requireUserId
+    defaultValue: "",
+    required: requireUserId,
+    validate: isValidUserId,
+    invalidMessage: userIdValidationMessage()
   });
   return config;
 }
@@ -504,7 +534,7 @@ async function confirmAction(rl, title, rows, options) {
   renderSection(title, rows);
   if (options.dryRun || options.yes) return true;
   console.log("");
-  return await askYesNo(rl, "Continue with these changes", { defaultValue: true });
+  return await askYesNo(rl, "Continue with these changes", { defaultValue: false });
 }
 
 async function setupClaude(rl, options) {
@@ -687,7 +717,7 @@ async function setupLangfuseMenu(rl, options) {
     rl,
     "Select Langfuse setup targets",
     [
-      { label: "Claude Code Langfuse", value: "claude", selected: true, description: "Install the Langfuse Stop hook and connect Claude transcripts." },
+      { label: "Claude Code Langfuse", value: "claude", selected: false, description: "Install the Langfuse Stop hook and connect Claude transcripts." },
       { label: "OpenCode Langfuse", value: "opencode", selected: false, description: "Install the Langfuse plugin and enable OpenTelemetry." },
       { label: "Codex Langfuse", value: "codex", selected: false, description: "Install the Codex notify hook and connect session JSONL events." }
     ],

package/package.json

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

package/scripts/codex-langfuse-setup.mjs

@@ -2,8 +2,21 @@ 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 { fileURLToPath } from "node:url";
+import { execFileSync } from "node:child_process";
+import { fileURLToPath } from "node: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();
+}
+
+function assertValidUserId(userId) {
+  if (!USER_ID_PATTERN.test(normalizeUserId(userId))) {
+    throw new Error(`工号格式不正确：--userId 必须匹配 ${USER_ID_PATTERN_TEXT}，例如 h00613222 或 hwx1234567`);
+  }
+}
 
 function parseArgs(argv) {
   const args = {};
@@ -136,10 +149,11 @@ async function main() {
     process.env.LANGFUSE_BASEURL ||
     process.env.LANGFUSE_HOST ||
     "http://120.46.221.227:3000";
-  const userId = args.userId || args.userid || "";
+  const userId = normalizeUserId(args.userId || args.userid || "");
   if (!userId || typeof userId !== "string") {
     throw new Error("缺少参数：--userId=你的工号");
   }
+  assertValidUserId(userId);
   const pipIndexUrl = args.pipIndexUrl || process.env.LANGFUSE_PIP_INDEX_URL || "https://pypi.tuna.tsinghua.edu.cn/simple";
 
   if (!publicKey || !secretKey) {

package/scripts/langfuse-setup.mjs

@@ -2,7 +2,20 @@ 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 } from "node:child_process";
+
+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();
+}
+
+function assertValidUserId(userId) {
+  if (!USER_ID_PATTERN.test(normalizeUserId(userId))) {
+    throw new Error(`工号格式不正确：--userId 必须匹配 ${USER_ID_PATTERN_TEXT}，例如 h00613222 或 hwx1234567`);
+  }
+}
 
 function parseArgs(argv) {
   const args = {};
@@ -158,10 +171,11 @@ function createOrUpdateLangfuseVenv({ baseDir, pipIndexUrl = "https://pypi.tuna.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
 
-  const userId = args.userId || args.userid;
+  const userId = normalizeUserId(args.userId || args.userid);
   if (!userId || typeof userId !== "string") {
     throw new Error("缺少参数：--userId=你的工号");
   }
+  assertValidUserId(userId);
 
   const langfuseHost =
     args.langfuseHost ||

package/scripts/opencode-langfuse-run.mjs

@@ -1,7 +1,20 @@
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { spawnSync } from "node:child_process";
-import { resolveOpencodeCli } from "./resolve-opencode-cli.mjs";
+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();
+}
+
+function assertValidUserId(userId) {
+  if (!USER_ID_PATTERN.test(normalizeUserId(userId))) {
+    throw new Error(`User ID must match ${USER_ID_PATTERN_TEXT}, for example h00613222 or hwx1234567.`);
+  }
+}
 
 function parseArgs(argv) {
   const args = {};
@@ -30,10 +43,11 @@ function main() {
   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 userId = args.userId || args.userid || "";
+  const userId = normalizeUserId(args.userId || args.userid || "");
   if (!userId) {
     throw new Error("Missing userId. Run with --userId=your-id.");
   }
+  assertValidUserId(userId);
 
   // 1) 先执行 setup：默认会写入 Windows 用户级 LANGFUSE_*（从桌面/开始菜单启动 OpenCode 也能读到）
   const scriptsDir = path.dirname(fileURLToPath(import.meta.url));

package/scripts/opencode-langfuse-setup.mjs

@@ -3,8 +3,21 @@ import path from "node:path";
 import os from "node:os";
 import { spawn, spawnSync } from "node:child_process";
 import { parseJsonRelaxed, stripBom } from "./json-utils.mjs";
-
-function parseArgs(argv) {
+
+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();
+}
+
+function assertValidUserId(userId) {
+  if (!USER_ID_PATTERN.test(normalizeUserId(userId))) {
+    throw new Error(`工号格式不正确：--userId 必须匹配 ${USER_ID_PATTERN_TEXT}，例如 h00613222 或 hwx1234567`);
+  }
+}
+
+function parseArgs(argv) {
   const args = {};
   for (const raw of argv) {
     if (!raw.startsWith("--")) continue;
@@ -448,10 +461,11 @@ async function main() {
     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 userId = args.userId || args.userid || "";
+  const userId = normalizeUserId(args.userId || args.userid || "");
   if (!userId || typeof userId !== "string") {
     throw new Error("缺少参数：--userId=你的工号");
   }
+  assertValidUserId(userId);
   const npmRegistry = args.npmRegistry || process.env.OPENCODE_NPM_REGISTRY || process.env.NPM_CONFIG_REGISTRY || "";
 
   const home = os.homedir();