bfi-cli 0.1.106 → 0.1.108

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,7 +121,10 @@ var PmRemote = class {
 function messageOf(e) {
 	return e instanceof Error ? e.message : String(e);
 }
-const DEFAULT_MAX_MB = 100;
+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));
 }
@@ -124,24 +151,38 @@ async function resolveLocalFile(filePath, roots = resolveUploadRoots(), maxBytes
 		size: info.size
 	};
 }
-function absoluteUploadUrl(uploadUrl, origin = PM_ORIGIN) {
-	return new URL(uploadUrl, origin).toString();
+function absoluteUploadUrl(uploadUrl, origin = PM_ORIGIN, pmUrl = process.env.BFI_PM_URL || "https://bfi.yyuap.com/bfi-api/bficli/api/v1/mcp/mcp") {
+	const url = new URL(uploadUrl, origin);
+	try {
+		const base = new URL(pmUrl);
+		const idx = base.pathname.indexOf("/bficli/api/");
+		const prefix = idx > 0 ? base.pathname.slice(0, idx) : "";
+		if (prefix && url.pathname.startsWith("/bficli/") && !url.pathname.startsWith(prefix + "/")) url.pathname = prefix + url.pathname;
+	} catch {}
+	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",
@@ -174,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" },
@@ -231,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,
@@ -249,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.106",
+  "version": "0.1.108",
   "description": "用友大业财BFI统一命令行工具，支持技能，技能包，元数据，UI元数据等",
   "type": "module",
   "bin": {