bfi-cli 0.1.107 → 0.1.109

package/dist/cli.mjs

@@ -8714,6 +8714,31 @@ async function runInstall(args, globalOpts) {
 	console.log();
 }
 const YMC_DEFAULT_BASE = process.env.BFI_YMC_BASE || "https://bfi.yyuap.com/bfi-api/bficli/api/v2";
+function messageOf(parsed) {
+	const raw = parsed.msg ?? parsed.message;
+	if (typeof raw === "string") return raw;
+	if (raw === void 0 || raw === null) return "";
+	try {
+		return JSON.stringify(raw);
+	} catch {
+		return String(raw);
+	}
+}
+function describeApiError(parsed, status, raw = "") {
+	const prefix = status >= 400 ? `HTTP ${status} ` : "";
+	const detail = parsed.detail;
+	if (Array.isArray(detail) && detail.length > 0) return `${prefix}${detail.map((item) => {
+		if (!item || typeof item !== "object") return String(item);
+		const o = item;
+		const loc = Array.isArray(o.loc) ? o.loc.map(String).join(".") : "";
+		const msg = o.msg ?? o.message ?? o.type ?? "参数错误";
+		return loc ? `${loc}: ${String(msg)}` : String(msg);
+	}).join("; ")}`;
+	if (detail !== void 0 && detail !== null) return `${prefix}${typeof detail === "string" ? detail : JSON.stringify(detail)}`;
+	const msg = messageOf(parsed);
+	if (msg.trim()) return `${prefix}${msg}`;
+	return `${prefix}${raw.trim().slice(0, 200) || "服务端未返回错误信息"}`;
+}
 var YmcApi = class {
 	baseUrl;
 	token;
@@ -8732,12 +8757,12 @@ var YmcApi = class {
 		if (body !== void 0 && Object.keys(body).length > 0) console.log(JSON.stringify(body, null, 2));
 		process.exit(0);
 	}
-	async call(path, body = {}, timeoutMs = 9e4) {
+	async call(path, body = {}, timeoutMs = 12e4) {
 		if (this.dryRun) this._dryRunExit("POST", path, body);
 		const url = `${this.baseUrl}/${path.replace(/^\//, "")}`;
 		const payload = JSON.stringify(body);
 		const mod = url.startsWith("https://") ? https : http;
-		const raw = await new Promise((resolve, reject) => {
+		const { status, text: raw } = await new Promise((resolve, reject) => {
 			const req = mod.request(url, {
 				method: "POST",
 				headers: {
@@ -8750,7 +8775,10 @@ var YmcApi = class {
 			}, (res) => {
 				const chunks = [];
 				res.on("data", (c) => chunks.push(c));
-				res.on("end", () => resolve(Buffer.concat(chunks).toString("utf-8")));
+				res.on("end", () => resolve({
+					status: res.statusCode ?? 0,
+					text: Buffer.concat(chunks).toString("utf-8")
+				}));
 			});
 			req.on("timeout", () => {
 				req.destroy(/* @__PURE__ */ new Error(`请求超时（${timeoutMs}ms）`));
@@ -8763,12 +8791,13 @@ var YmcApi = class {
 		try {
 			parsed = JSON.parse(raw);
 		} catch {
-			throw new Error(`非 JSON 响应（HTTP）：${raw.slice(0, 200)}`);
+			throw new Error(`HTTP ${status} 非 JSON 响应：${raw.slice(0, 200)}`);
 		}
-		if (parsed.detail && parsed.code === void 0) throw new Error(String(parsed.detail));
+		if (parsed.detail !== void 0 && parsed.code === void 0) throw new Error(describeApiError(parsed, status, raw));
+		if (status >= 400 && parsed.code === void 0 && parsed.msg === void 0) throw new Error(describeApiError(parsed, status, raw));
 		return {
 			code: typeof parsed.code === "number" ? parsed.code : -1,
-			msg: String(parsed.msg ?? ""),
+			msg: messageOf(parsed),
 			data: parsed.data ?? null,
 			raw: parsed
 		};
@@ -8816,7 +8845,7 @@ var YmcApi = class {
 		if (this.dryRun) this._dryRunExit("GET", path);
 		const url = `${this.baseUrl}/${path.replace(/^\//, "")}`;
 		const mod = url.startsWith("https://") ? https : http;
-		const raw = await new Promise((resolve, reject) => {
+		const { status, text: raw } = await new Promise((resolve, reject) => {
 			const req = mod.request(url, {
 				method: "GET",
 				headers: {
@@ -8827,7 +8856,10 @@ var YmcApi = class {
 			}, (res) => {
 				const chunks = [];
 				res.on("data", (c) => chunks.push(c));
-				res.on("end", () => resolve(Buffer.concat(chunks).toString("utf-8")));
+				res.on("end", () => resolve({
+					status: res.statusCode ?? 0,
+					text: Buffer.concat(chunks).toString("utf-8")
+				}));
 			});
 			req.on("timeout", () => {
 				req.destroy(/* @__PURE__ */ new Error(`请求超时（${timeoutMs}ms）`));
@@ -8835,11 +8867,16 @@ var YmcApi = class {
 			req.on("error", reject);
 			req.end();
 		});
-		const parsed = JSON.parse(raw);
-		if (parsed.detail && parsed.code === void 0) throw new Error(String(parsed.detail));
+		let parsed;
+		try {
+			parsed = JSON.parse(raw);
+		} catch {
+			throw new Error(`HTTP ${status} 非 JSON 响应：${raw.slice(0, 200)}`);
+		}
+		if (parsed.detail !== void 0 && parsed.code === void 0) throw new Error(describeApiError(parsed, status, raw));
 		return {
 			code: typeof parsed.code === "number" ? parsed.code : -1,
-			msg: String(parsed.msg ?? ""),
+			msg: messageOf(parsed),
 			data: parsed.data ?? null,
 			raw: parsed
 		};
@@ -8921,7 +8958,6 @@ const F_ENV = [
 	"--env",
 	"--env-name"
 ];
-const F_TIME = ["-t", "--time"];
 const F_RANGE = [
 	"-t",
 	"--time",
@@ -8941,7 +8977,7 @@ const ALLOWED_FLAGS = {
 	],
 	"sls-grep": [
 		...F_ENV,
-		...F_TIME,
+		...F_RANGE,
 		"--group-by",
 		"--line",
 		"--app"
@@ -9091,15 +9127,6 @@ function requireEnv(args) {
 	}
 	return { env_name: env };
 }
-function timeOf(args, required = true) {
-	const t = opt(args, "-t", "--time");
-	const err = timeError(t);
-	if (err && required) {
-		console.error(err);
-		process.exit(1);
-	}
-	return t ? { time: t } : {};
-}
 function timeOpts(args) {
 	const out = {};
 	const t = opt(args, "-t", "--time");
@@ -9192,7 +9219,7 @@ async function runYmc(args, globalOpts) {
 				trace_id: id,
 				...requireEnv(rest),
 				...opt(rest, "--ts") ? { ts: Number(opt(rest, "--ts")) } : {}
-			}), jsonMode, (data) => {
+			}, 18e4), jsonMode, (data) => {
 				const d = data;
 				const lines = [];
 				const wc = d.warning_chain;
@@ -9277,7 +9304,7 @@ async function runYmc(args, globalOpts) {
 		case "sls-grep": {
 			const kw = positionals(rest)[0];
 			if (!kw) {
-				console.error("用法：bfi ymc sls-grep \"<关键词>\" -e <env> [-t time] [--app <appCode>] [--group-by applicationName|message|requestURL]");
+				console.error("用法：bfi ymc sls-grep \"<关键词>\" -e <env> [-t <time> | --start-time <s> --end-time <e>] [--app <appCode>] [--group-by applicationName|message|requestURL]");
 				console.error("例：bfi ymc sls-grep \"ClassCastException\" -e daily -t 3d");
 				console.error("⚠️ 关键词按「整值」匹配：类名/全限定异常名必须整串加引号");
 				console.error("   （\"java.lang.OutOfMemoryError\" 命中；简写 \"OutOfMemoryError\" 恒 0 且不报错）——sls-discipline §3");
@@ -9292,7 +9319,7 @@ async function runYmc(args, globalOpts) {
 			emit(await api.call("sls/raw", {
 				query,
 				...requireEnv(rest),
-				...timeOf(rest, false),
+				...timeOpts(rest),
 				line: Number(opt(rest, "--line") || 50)
 			}), jsonMode, aggSummary(`SLS 全文检索 "${kw}"`));
 			break;
@@ -9404,7 +9431,7 @@ async function runYmc(args, globalOpts) {
 			};
 			const app = opt(rest, "--app");
 			if (app) body.filters = { service_name: app };
-			emit(await api.call("kibana/stats", body), jsonMode, (data) => {
+			emit(await api.call("kibana/stats", body, 18e4), jsonMode, (data) => {
 				const d = data;
 				const a = d.aggs;
 				return `✓ URL 统计${app ? ` [${app}]` : "（⚠️ 未限定服务，共享路径为全平台混合）"}: QPS=${a.qps} avg=${a.avg_rt?.value ?? "-"} 慢请求Top=${Array.isArray(d.slow_top) ? d.slow_top.length : 0}`;
@@ -9429,7 +9456,7 @@ async function runYmc(args, globalOpts) {
 				console.error("用法：bfi ymc ingress --trace-id <id> | --uri </path> [-app <service_name>] -e <env> [-t time]");
 				process.exit(1);
 			}
-			emit(await api.call("kibana/search", body), jsonMode, rowsSummary("ingress 日志"));
+			emit(await api.call("kibana/search", body, 18e4), jsonMode, rowsSummary("ingress 日志"));
 			break;
 		}
 		case "dump-list": {
@@ -9721,7 +9748,7 @@ const HELP = {
     bfi ymc sls-raw 'applicationname: yonbip-scm-scmmp AND "unaudit" | SELECT traceid, time LIMIT 10' -e core3 -t 1d
   注意：业务关键词检索必须 applicationname: 限定目标服务（共享路径 URL 全平台都有）；
   traceid/spanid 检索例外（全局唯一）。非索引字段（logger/requesturl）不能进检索语法，只能在 SELECT 里引用。`,
-	"sls-grep": `bfi ymc sls-grep "<关键词>" -e <env> -t <time> [--app <appCode>] [--group-by <字段>] [--json]
+	"sls-grep": `bfi ymc sls-grep "<关键词>" -e <env> [-t <time> | --start-time <s> --end-time <e>] [--app <appCode>] [--group-by <字段>] [--json]
   SLS 全文检索聚合（每组计数精确不封顶；组数上限 500——实测 2026-09-17：计数不受限，仅组数受 SLS 默认 LIMIT 约束，服务端已放宽）。
   ⚠️ 关键词按「整值」匹配：类名/全限定异常名必须整串加引号
      （"java.lang.OutOfMemoryError" 命中；简写 "OutOfMemoryError" 恒 0 命中且不报错）——sls-discipline §3

package/dist/mcp-pm/main.mjs

@@ -3,6 +3,7 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { CallToolRequestSchema, CallToolResultSchema, ListToolsRequestSchema, ListToolsResultSchema } from "@modelcontextprotocol/sdk/types.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { openAsBlob } from "node:fs";
 import { readFile, realpath, stat } from "node:fs/promises";
 import path from "node:path";
 const PM_ORIGIN = "https://bfi.yyuap.com";
@@ -42,27 +43,50 @@ var PmRemote = class {
 	}
 	async listTools() {
 		try {
-			return (await (await this.ensure()).request({ method: "tools/list" }, ListToolsResultSchema)).tools;
+			return await this.listToolsOnce();
 		} catch (e) {
+			if (isSessionInvalid(e)) {
+				this.client = null;
+				try {
+					return await this.listToolsOnce();
+				} catch (e2) {
+					console.error(`[bfi-pm-mcp] 远端工具列表获取失败: ${messageOf(e2)}`);
+					this.client = null;
+					return [];
+				}
+			}
 			console.error(`[bfi-pm-mcp] 远端工具列表获取失败: ${messageOf(e)}`);
 			this.client = null;
 			return [];
 		}
 	}
 	async callTool(name, args) {
-		const client = await this.ensure();
 		try {
-			return await client.request({
-				method: "tools/call",
-				params: {
-					name,
-					arguments: args ?? {}
-				}
-			}, CallToolResultSchema);
+			return await this.callToolOnce(name, args);
 		} catch (e) {
+			if (isSessionInvalid(e)) {
+				this.client = null;
+				try {
+					return await this.callToolOnce(name, args);
+				} catch (e2) {
+					return this.handleRemoteFailure(e2);
+				}
+			}
 			return this.handleRemoteFailure(e);
 		}
 	}
+	async listToolsOnce() {
+		return (await (await this.ensure()).request({ method: "tools/list" }, ListToolsResultSchema)).tools;
+	}
+	async callToolOnce(name, args) {
+		return (await this.ensure()).request({
+			method: "tools/call",
+			params: {
+				name,
+				arguments: args ?? {}
+			}
+		}, CallToolResultSchema);
+	}
 	async ensure() {
 		if (this.client) return this.client;
 		if (!this.credentials) throw new PmError("unauthorized", credentialHint());
@@ -97,6 +121,9 @@ var PmRemote = class {
 function messageOf(e) {
 	return e instanceof Error ? e.message : String(e);
 }
+function isSessionInvalid(e) {
+	return /session not found|session expired|\b404\b/i.test(messageOf(e));
+}
 const DEFAULT_MAX_MB = 50;
 function resolveUploadRoots() {
 	return [...(process.env.BFI_UPLOAD_ROOTS || "").split(path.delimiter).map((s) => s.trim()).filter(Boolean), process.cwd()].map((p) => path.resolve(p));
@@ -135,20 +162,27 @@ function absoluteUploadUrl(uploadUrl, origin = PM_ORIGIN, pmUrl = process.env.BF
 	return url.toString();
 }
 async function uploadToTicket(url, file, fetchImpl = fetch) {
-	const data = await readFile(file.realPath);
+	if (file.size === 0) throw new Error("文件为空，无法上传");
 	const form = new FormData();
-	form.append("file", new Blob([new Uint8Array(data)]), file.name);
+	const blob = typeof openAsBlob === "function" ? await openAsBlob(file.realPath) : new Blob([new Uint8Array(await readFile(file.realPath))]);
+	form.append("file", blob, file.name);
+	const timeoutMs = Number(process.env.BFI_UPLOAD_TIMEOUT_MS || 12e4);
 	const resp = await fetchImpl(url, {
 		method: "POST",
-		body: form
+		body: form,
+		signal: AbortSignal.timeout(Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : 12e4)
 	});
 	const text = await resp.text();
 	if (!resp.ok) throw new Error(`附件上传失败 HTTP ${resp.status}: ${text.slice(0, 200)}`);
+	let parsed;
 	try {
-		return JSON.parse(text);
+		parsed = JSON.parse(text);
 	} catch {
 		throw new Error(`附件上传响应非 JSON: ${text.slice(0, 200)}`);
 	}
+	const code = parsed.code;
+	if (code !== void 0 && String(code) !== "0" && String(code) !== "200") throw new Error(`附件上传被拒绝（code=${String(code)}）: ${String(parsed.msg || text.slice(0, 200))}`);
+	return parsed;
 }
 const LOCAL_TOOLS = [{
 	name: "attachment_upload",
@@ -181,6 +215,15 @@ const LOCAL_TOOLS = [{
 				type: "string",
 				description: "评论正文"
 			},
+			entity_type: {
+				type: "string",
+				enum: [
+					"DEFECT",
+					"FEATURE",
+					"SUBTASK"
+				],
+				description: "单据类型，默认 DEFECT"
+			},
 			file_paths: {
 				type: "array",
 				items: { type: "string" },
@@ -238,8 +281,9 @@ function buildServer(remote, fetchImpl) {
 		const ticket = extractJson(await pm.callTool("get_upload_ticket", { file_name: (fileName || file.name).trim() }));
 		const uploadUrl = String(ticket.upload_url || "");
 		if (!uploadUrl) throw new PmError("ticket_failed", `签发 ticket 失败: ${JSON.stringify(ticket).slice(0, 200)}`);
-		const uploaded = await uploadToTicket(absoluteUploadUrl(uploadUrl), file, fetchImpl);
-		if (!uploaded.aid) throw new PmError("upload_failed", `上传响应缺少 aid: ${JSON.stringify(uploaded).slice(0, 200)}`);
+		const response = await uploadToTicket(absoluteUploadUrl(uploadUrl), file, fetchImpl);
+		const uploaded = response.data && typeof response.data === "object" ? response.data : response;
+		if (!uploaded.aid) throw new PmError("upload_failed", `上传响应缺少 aid: ${JSON.stringify(response).slice(0, 200)}`);
 		return {
 			...uploaded,
 			fileName: uploaded.fileName || file.name,
@@ -256,17 +300,36 @@ function buildServer(remote, fetchImpl) {
 				if (!input.object_id) throw new PmError("invalid_params", "object_id 不能为空");
 				if (!paths.length) throw new PmError("invalid_params", "file_paths 不能为空");
 				const uploads = [];
-				for (const p of paths) uploads.push(await uploadOne(p));
+				for (const p of paths) try {
+					uploads.push(await uploadOne(p));
+				} catch (e) {
+					return textResult({
+						ok: false,
+						error_kind: "upload_failed",
+						message: `第 ${uploads.length + 1} 个文件上传失败: ${e instanceof Error ? e.message : String(e)}`,
+						uploaded: uploads
+					}, true);
+				}
 				const aids = uploads.map((u) => String(u.aid));
-				return textResult({
-					ok: true,
-					uploads,
-					comment: extractJson(await pm.callTool("add_comment", {
-						object_id: String(input.object_id),
-						content: input.content ? String(input.content) : "",
-						attache_ids: aids
-					}))
-				});
+				try {
+					return textResult({
+						ok: true,
+						uploads,
+						comment: extractJson(await pm.callTool("add_comment", {
+							object_id: String(input.object_id),
+							content: input.content ? String(input.content) : "",
+							entity_type: input.entity_type ? String(input.entity_type) : "DEFECT",
+							attache_ids: aids
+						}))
+					});
+				} catch (e) {
+					return textResult({
+						ok: false,
+						error_kind: e instanceof PmError ? e.errorKind : "internal_error",
+						message: `附件已上传，但评论失败: ${e instanceof Error ? e.message : String(e)}`,
+						uploaded: uploads
+					}, true);
+				}
 			}
 			return await pm.callTool(name, input);
 		} catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfi-cli",
-  "version": "0.1.107",
+  "version": "0.1.109",
   "description": "用友大业财BFI统一命令行工具，支持技能，技能包，元数据，UI元数据等",
   "type": "module",
   "bin": {