@vibe-lark/larkpal 0.1.63 → 0.1.64

package/dist/main.mjs

@@ -6,7 +6,7 @@ import * as path$2 from "node:path";
 import path, { basename, dirname, extname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import "dotenv/config";
-import { access, lstat, mkdir, open, readFile, readdir, readlink, rename, rm, stat, symlink, unlink, writeFile } from "node:fs/promises";
+import { access, copyFile, lstat, mkdir, open, readFile, readdir, readlink, rename, rm, stat, symlink, unlink, writeFile } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
 import { execFileSync, spawn } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
@@ -18,10 +18,10 @@ import { createCipheriv, createDecipheriv, createHmac, randomBytes } from "crypt
 import path$1 from "path";
 import os from "os";
 import { EventEmitter } from "node:events";
+import { pipeline } from "node:stream/promises";
+import { PassThrough, Readable, Transform } from "node:stream";
 import express, { Router } from "express";
 import Busboy from "busboy";
-import { PassThrough, Readable, Transform } from "node:stream";
-import { pipeline } from "node:stream/promises";
 import { EventEmitter as EventEmitter$1 } from "events";
 import cron from "node-cron";
 import * as Lark from "@larksuiteoapi/node-sdk";
@@ -2619,6 +2619,165 @@ function getLarkpalMcpServerCommand() {
 	};
 }
 //#endregion
+//#region src/gateway/artifact-store.ts
+const DEFAULT_ARTIFACT_TTL_MS = 4320 * 60 * 1e3;
+const DEFAULT_MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
+var ArtifactUploadError = class extends Error {
+	constructor(message, statusCode = 400) {
+		super(message);
+		this.statusCode = statusCode;
+		this.name = "ArtifactUploadError";
+	}
+};
+var GatewayArtifactStore = class {
+	rootDir;
+	maxUploadBytes;
+	ttlMs;
+	constructor(params) {
+		const workspaceRoot = params?.workspaceRoot || resolveWorkspaceRoot();
+		this.rootDir = join(workspaceRoot, ".artifacts");
+		this.maxUploadBytes = params?.maxUploadBytes ?? readPositiveIntEnv("LARKPAL_ARTIFACT_MAX_UPLOAD_BYTES", DEFAULT_MAX_UPLOAD_BYTES);
+		this.ttlMs = params?.ttlMs ?? readPositiveIntEnv("LARKPAL_ARTIFACT_TTL_MS", DEFAULT_ARTIFACT_TTL_MS);
+	}
+	async create(input) {
+		validateContextId(input.sessionId, "sessionId");
+		validateContextId(input.owner.tenantKey, "tenantKey");
+		const artifactId = `art_${v4().replace(/-/g, "")}`;
+		const createdAtMs = Date.now();
+		const createdAt = new Date(createdAtMs).toISOString();
+		const expiresAt = new Date(createdAtMs + this.ttlMs).toISOString();
+		const artifactDir = this.getArtifactDir(input.owner.tenantKey, input.sessionId, artifactId);
+		const blobPath = join(artifactDir, "blob");
+		const tmpBlobPath = join(artifactDir, `.blob.${process.pid}.${Date.now()}.tmp`);
+		await mkdir(artifactDir, { recursive: true });
+		const hash = createHash("sha256");
+		let size = 0;
+		const metering = new Transform({ transform: (chunk, _encoding, callback) => {
+			size += chunk.length;
+			if (size > this.maxUploadBytes) {
+				callback(new ArtifactUploadError(`Artifact exceeds max upload size ${this.maxUploadBytes} bytes`, 413));
+				return;
+			}
+			hash.update(chunk);
+			callback(null, chunk);
+		} });
+		try {
+			await pipeline(input.stream, metering, createWriteStream(tmpBlobPath));
+			await rename(tmpBlobPath, blobPath);
+		} catch (err) {
+			await rm(artifactDir, {
+				recursive: true,
+				force: true
+			}).catch(() => void 0);
+			throw err;
+		}
+		const metadata = {
+			artifactId,
+			sessionId: input.sessionId,
+			tenantKey: input.owner.tenantKey,
+			userId: input.owner.userId,
+			openId: input.owner.openId,
+			kind: "workspace-file",
+			uri: `artifact://${artifactId}`,
+			fileName: sanitizeFileName(input.fileName),
+			mimeType: normalizeMimeType(input.mimeType),
+			size,
+			contentHash: `sha256:${hash.digest("hex")}`,
+			createdAt,
+			expiresAt,
+			metadata: input.metadata,
+			blobPath
+		};
+		await writeJson(join(artifactDir, "meta.json"), metadata);
+		return toPublicRef(metadata);
+	}
+	async list(params) {
+		validateContextId(params.sessionId, "sessionId");
+		validateContextId(params.owner.tenantKey, "tenantKey");
+		const sessionDir = this.getSessionDir(params.owner.tenantKey, params.sessionId);
+		let entries;
+		try {
+			entries = await readdir(sessionDir);
+		} catch {
+			return [];
+		}
+		const results = [];
+		for (const entry of entries) {
+			if (!entry.startsWith("art_")) continue;
+			const metadata = await readArtifactMetadata(join(sessionDir, entry, "meta.json"));
+			if (!metadata) continue;
+			if (!isOwnedBy(metadata, params.owner, params.sessionId)) continue;
+			if (Date.parse(metadata.expiresAt) <= Date.now()) continue;
+			results.push(toPublicRef(metadata));
+		}
+		return results.sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+	}
+	async statBlob(ref, owner) {
+		const metadata = await readArtifactMetadata(this.getMetadataPath(owner.tenantKey, ref.sessionId, ref.artifactId));
+		if (!metadata || !isOwnedBy(metadata, owner, ref.sessionId)) return null;
+		const blobStat = await stat(metadata.blobPath).catch(() => null);
+		return blobStat ? {
+			path: metadata.blobPath,
+			size: blobStat.size
+		} : null;
+	}
+	async resolveBlob(params) {
+		validateContextId(params.sessionId, "sessionId");
+		validateContextId(params.owner.tenantKey, "tenantKey");
+		validateContextId(params.artifactId, "artifactId");
+		const metadata = await readArtifactMetadata(this.getMetadataPath(params.owner.tenantKey, params.sessionId, params.artifactId));
+		if (!metadata || !isOwnedBy(metadata, params.owner, params.sessionId)) return null;
+		if (Date.parse(metadata.expiresAt) <= Date.now()) return null;
+		if (!await stat(metadata.blobPath).catch(() => null)) return null;
+		return {
+			ref: toPublicRef(metadata),
+			blobPath: metadata.blobPath
+		};
+	}
+	getSessionDir(tenantKey, sessionId) {
+		return join(this.rootDir, tenantKey, sessionId);
+	}
+	getArtifactDir(tenantKey, sessionId, artifactId) {
+		return join(this.getSessionDir(tenantKey, sessionId), artifactId);
+	}
+	getMetadataPath(tenantKey, sessionId, artifactId) {
+		return join(this.getArtifactDir(tenantKey, sessionId, artifactId), "meta.json");
+	}
+};
+function readPositiveIntEnv(name, fallback) {
+	const raw = process.env[name];
+	if (!raw) return fallback;
+	const parsed = Number.parseInt(raw, 10);
+	return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+function validateContextId(value, fieldName) {
+	if (!/^[A-Za-z0-9_.:-]{1,200}$/.test(value)) throw new ArtifactUploadError(`Invalid ${fieldName}`, 400);
+}
+function sanitizeFileName(fileName) {
+	return fileName.replace(/[\\/\0\r\n]/g, "_").trim() || "upload.bin";
+}
+function normalizeMimeType(mimeType) {
+	return mimeType?.trim() || "application/octet-stream";
+}
+function toPublicRef(metadata) {
+	const { tenantKey: _tenantKey, userId: _userId, openId: _openId, blobPath: _blobPath, ...ref } = metadata;
+	return ref;
+}
+function isOwnedBy(metadata, owner, sessionId) {
+	return metadata.tenantKey === owner.tenantKey && metadata.userId === owner.userId && metadata.openId === owner.openId && metadata.sessionId === sessionId;
+}
+async function readArtifactMetadata(filePath) {
+	try {
+		return JSON.parse(await readFile(filePath, "utf-8"));
+	} catch {
+		return null;
+	}
+}
+async function writeJson(filePath, data) {
+	await mkdir(dirname(filePath), { recursive: true });
+	await writeFile(filePath, JSON.stringify(data, null, 2), "utf-8");
+}
+//#endregion
 //#region src/runtime/larkpal-agent-factory.ts
 /**
 * LarkpalAgent RuntimeAdapter 工厂
@@ -2766,6 +2925,7 @@ async function createLarkpalAgentAdapter() {
 	});
 	const { LarkpalAgentAdapter, ToolRegistry } = await import("@vibe-lark/larkpal-agent");
 	const registry = new ToolRegistry();
+	const visualMaxBatchSize = parseInt(process.env.LARKPAL_AGENT_VISUAL_MAX_BATCH_SIZE || "3", 10);
 	const adapter = new LarkpalAgentAdapter({
 		llm,
 		systemPrompt,
@@ -2774,8 +2934,9 @@ async function createLarkpalAgentAdapter() {
 		registry,
 		scenarioManifestDirs,
 		scenarioProviderConfig,
+		artifactResolvers: [createGatewayArtifactResolver()],
 		visualRuntime: {
-			maxBatchSize: parseInt(process.env.LARKPAL_AGENT_VISUAL_MAX_BATCH_SIZE || "3", 10),
+			maxBatchSize: visualMaxBatchSize,
 			allowedDirs: [process.env.LARK_CLI_WORKDIR || "/tmp/ai-knowledge-lark-cli", "/tmp"].filter(Boolean)
 		}
 	});
@@ -2799,6 +2960,51 @@ async function createLarkpalAgentAdapter() {
 	else log$31.warn("未配置 LARKPAL_AGENT_MCP_SERVER_URL，Agent 无远程工具可用");
 	return wrapLarkpalAgentAdapter(adapter);
 }
+function createGatewayArtifactResolver(params) {
+	const store = params?.store || new GatewayArtifactStore();
+	return {
+		name: "larkpal-gateway-artifact-store",
+		canResolve(artifact) {
+			return getArtifactId(artifact) !== void 0;
+		},
+		async resolve(artifact, context) {
+			const artifactId = getArtifactId(artifact);
+			const tenantKey = context.tenantKey || context.authHeaders?.["x-tenant-key"];
+			const userId = context.userId || context.authHeaders?.["x-user-id"];
+			const openId = context.authHeaders?.["x-open-id"] || userId;
+			if (!artifactId || !tenantKey || !userId || !openId) return void 0;
+			const resolved = await store.resolveBlob({
+				sessionId: context.sessionId,
+				artifactId,
+				owner: {
+					tenantKey,
+					userId,
+					openId
+				}
+			});
+			if (!resolved) return void 0;
+			const targetDir = join(context.cwd, "source-artifacts", artifactId);
+			const fileName = sanitizeWorkspaceFileName(resolved.ref.fileName || artifact.fileName || artifactId);
+			const targetPath = join(targetDir, fileName);
+			await mkdir(targetDir, { recursive: true });
+			await copyFile(resolved.blobPath, targetPath);
+			return {
+				artifactId,
+				kind: "workspace-file",
+				path: targetPath,
+				fileName,
+				mimeType: resolved.ref.mimeType ?? artifact.mimeType,
+				size: resolved.ref.size ?? artifact.size,
+				contentHash: resolved.ref.contentHash ?? artifact.contentHash,
+				source: artifact,
+				refs: {
+					uri: resolved.ref.uri,
+					gatewayArtifactId: resolved.ref.artifactId
+				}
+			};
+		}
+	};
+}
 function wrapLarkpalAgentAdapter(adapter) {
 	return {
 		get name() {
@@ -2877,6 +3083,17 @@ function mergeSourceArtifacts(existing, imageArtifacts) {
 	if (Array.isArray(existing)) return [...existing, ...imageArtifacts];
 	return [existing, ...imageArtifacts];
 }
+function getArtifactId(artifact) {
+	const artifactId = typeof artifact.artifactId === "string" ? artifact.artifactId.trim() : "";
+	if (artifactId.startsWith("art_")) return artifactId;
+	const uri = typeof artifact.uri === "string" ? artifact.uri.trim() : "";
+	if (!uri.startsWith("artifact://")) return void 0;
+	const idFromUri = uri.slice(11).split(/[/?#]/, 1)[0]?.trim();
+	return idFromUri?.startsWith("art_") ? idFromUri : void 0;
+}
+function sanitizeWorkspaceFileName(fileName) {
+	return basename(fileName).replace(/[\\/\0\r\n]/g, "_").trim() || "artifact.bin";
+}
 //#endregion
 //#region src/routing/session-router.ts
 /**
@@ -3216,6 +3433,7 @@ const MAX_SUMMARY_STRING_LENGTH = 200;
 const PROTECTED_CONTEXT_HEADERS = new Set([
 	"x-tenant-key",
 	"x-user-id",
+	"x-open-id",
 	"x-session-id",
 	"x-conversation-id",
 	"x-trace-id",
@@ -3258,6 +3476,7 @@ function buildAgentRuntimeConfig(input) {
 	const authHeaders = buildAuthHeaders({
 		tenantKey,
 		userId,
+		openId: input.identity?.openId,
 		sessionId,
 		conversationId,
 		traceId,
@@ -3420,6 +3639,7 @@ function buildAuthHeaders(params) {
 	const headers = {
 		"x-tenant-key": params.tenantKey,
 		"x-user-id": params.userId,
+		...params.openId ? { "x-open-id": params.openId } : {},
 		"x-session-id": params.sessionId,
 		"x-conversation-id": params.conversationId,
 		"x-trace-id": params.traceId,
@@ -4999,152 +5219,6 @@ async function sendCallback(callbackUrl, taskId, status, result, error) {
 	}
 }
 //#endregion
-//#region src/gateway/artifact-store.ts
-const DEFAULT_ARTIFACT_TTL_MS = 4320 * 60 * 1e3;
-const DEFAULT_MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
-var ArtifactUploadError = class extends Error {
-	constructor(message, statusCode = 400) {
-		super(message);
-		this.statusCode = statusCode;
-		this.name = "ArtifactUploadError";
-	}
-};
-var GatewayArtifactStore = class {
-	rootDir;
-	maxUploadBytes;
-	ttlMs;
-	constructor(params) {
-		const workspaceRoot = params?.workspaceRoot || resolveWorkspaceRoot();
-		this.rootDir = join(workspaceRoot, ".artifacts");
-		this.maxUploadBytes = params?.maxUploadBytes ?? readPositiveIntEnv("LARKPAL_ARTIFACT_MAX_UPLOAD_BYTES", DEFAULT_MAX_UPLOAD_BYTES);
-		this.ttlMs = params?.ttlMs ?? readPositiveIntEnv("LARKPAL_ARTIFACT_TTL_MS", DEFAULT_ARTIFACT_TTL_MS);
-	}
-	async create(input) {
-		validateContextId(input.sessionId, "sessionId");
-		validateContextId(input.owner.tenantKey, "tenantKey");
-		const artifactId = `art_${v4().replace(/-/g, "")}`;
-		const createdAtMs = Date.now();
-		const createdAt = new Date(createdAtMs).toISOString();
-		const expiresAt = new Date(createdAtMs + this.ttlMs).toISOString();
-		const artifactDir = this.getArtifactDir(input.owner.tenantKey, input.sessionId, artifactId);
-		const blobPath = join(artifactDir, "blob");
-		const tmpBlobPath = join(artifactDir, `.blob.${process.pid}.${Date.now()}.tmp`);
-		await mkdir(artifactDir, { recursive: true });
-		const hash = createHash("sha256");
-		let size = 0;
-		const metering = new Transform({ transform: (chunk, _encoding, callback) => {
-			size += chunk.length;
-			if (size > this.maxUploadBytes) {
-				callback(new ArtifactUploadError(`Artifact exceeds max upload size ${this.maxUploadBytes} bytes`, 413));
-				return;
-			}
-			hash.update(chunk);
-			callback(null, chunk);
-		} });
-		try {
-			await pipeline(input.stream, metering, createWriteStream(tmpBlobPath));
-			await rename(tmpBlobPath, blobPath);
-		} catch (err) {
-			await rm(artifactDir, {
-				recursive: true,
-				force: true
-			}).catch(() => void 0);
-			throw err;
-		}
-		const metadata = {
-			artifactId,
-			sessionId: input.sessionId,
-			tenantKey: input.owner.tenantKey,
-			userId: input.owner.userId,
-			openId: input.owner.openId,
-			kind: "workspace-file",
-			uri: `artifact://${artifactId}`,
-			fileName: sanitizeFileName(input.fileName),
-			mimeType: normalizeMimeType(input.mimeType),
-			size,
-			contentHash: `sha256:${hash.digest("hex")}`,
-			createdAt,
-			expiresAt,
-			metadata: input.metadata,
-			blobPath
-		};
-		await writeJson(join(artifactDir, "meta.json"), metadata);
-		return toPublicRef(metadata);
-	}
-	async list(params) {
-		validateContextId(params.sessionId, "sessionId");
-		validateContextId(params.owner.tenantKey, "tenantKey");
-		const sessionDir = this.getSessionDir(params.owner.tenantKey, params.sessionId);
-		let entries;
-		try {
-			entries = await readdir(sessionDir);
-		} catch {
-			return [];
-		}
-		const results = [];
-		for (const entry of entries) {
-			if (!entry.startsWith("art_")) continue;
-			const metadata = await readArtifactMetadata(join(sessionDir, entry, "meta.json"));
-			if (!metadata) continue;
-			if (!isOwnedBy(metadata, params.owner, params.sessionId)) continue;
-			if (Date.parse(metadata.expiresAt) <= Date.now()) continue;
-			results.push(toPublicRef(metadata));
-		}
-		return results.sort((a, b) => a.createdAt.localeCompare(b.createdAt));
-	}
-	async statBlob(ref, owner) {
-		const metadata = await readArtifactMetadata(this.getMetadataPath(owner.tenantKey, ref.sessionId, ref.artifactId));
-		if (!metadata || !isOwnedBy(metadata, owner, ref.sessionId)) return null;
-		const blobStat = await stat(metadata.blobPath).catch(() => null);
-		return blobStat ? {
-			path: metadata.blobPath,
-			size: blobStat.size
-		} : null;
-	}
-	getSessionDir(tenantKey, sessionId) {
-		return join(this.rootDir, tenantKey, sessionId);
-	}
-	getArtifactDir(tenantKey, sessionId, artifactId) {
-		return join(this.getSessionDir(tenantKey, sessionId), artifactId);
-	}
-	getMetadataPath(tenantKey, sessionId, artifactId) {
-		return join(this.getArtifactDir(tenantKey, sessionId, artifactId), "meta.json");
-	}
-};
-function readPositiveIntEnv(name, fallback) {
-	const raw = process.env[name];
-	if (!raw) return fallback;
-	const parsed = Number.parseInt(raw, 10);
-	return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
-}
-function validateContextId(value, fieldName) {
-	if (!/^[A-Za-z0-9_.:-]{1,200}$/.test(value)) throw new ArtifactUploadError(`Invalid ${fieldName}`, 400);
-}
-function sanitizeFileName(fileName) {
-	return fileName.replace(/[\\/\0\r\n]/g, "_").trim() || "upload.bin";
-}
-function normalizeMimeType(mimeType) {
-	return mimeType?.trim() || "application/octet-stream";
-}
-function toPublicRef(metadata) {
-	const { tenantKey: _tenantKey, userId: _userId, openId: _openId, blobPath: _blobPath, ...ref } = metadata;
-	return ref;
-}
-function isOwnedBy(metadata, owner, sessionId) {
-	return metadata.tenantKey === owner.tenantKey && metadata.userId === owner.userId && metadata.openId === owner.openId && metadata.sessionId === sessionId;
-}
-async function readArtifactMetadata(filePath) {
-	try {
-		return JSON.parse(await readFile(filePath, "utf-8"));
-	} catch {
-		return null;
-	}
-}
-async function writeJson(filePath, data) {
-	await mkdir(dirname(filePath), { recursive: true });
-	await writeFile(filePath, JSON.stringify(data, null, 2), "utf-8");
-}
-//#endregion
 //#region src/gateway/artifact-handler.ts
 const log$28 = larkLogger("gateway/artifacts");
 function createArtifactRouter(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-lark/larkpal",
-  "version": "0.1.63",
+  "version": "0.1.64",
   "description": "LarkPal - Lark/Feishu bot service",
   "type": "module",
   "main": "./dist/main.mjs",
@@ -21,9 +21,22 @@
     "registry": "https://registry.npmjs.org",
     "access": "public"
   },
+  "packageManager": "pnpm@10.32.1",
   "engines": {
     "node": ">=22"
   },
+  "scripts": {
+    "start": "node --env-file=.env bin/larkpal.js",
+    "build": "tsdown",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "lint": "eslint src/",
+    "lint:fix": "eslint src/ --fix",
+    "sit:larkpal-agent": "node scripts/sit/larkpal-agent-0.1.9-sit.mjs",
+    "typecheck": "tsc --noEmit",
+    "format": "prettier --write src/**/*.ts",
+    "format:check": "prettier --check src/**/*.ts"
+  },
   "dependencies": {
     "@larksuiteoapi/node-sdk": "^1.60.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
@@ -38,7 +51,7 @@
     "zod": "^4.3.6"
   },
   "optionalDependencies": {
-    "@vibe-lark/larkpal-agent": "^0.2.12"
+    "@vibe-lark/larkpal-agent": "^0.2.19"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
@@ -56,17 +69,5 @@
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.32.1",
     "vitest": "^4.1.1"
-  },
-  "scripts": {
-    "start": "node --env-file=.env bin/larkpal.js",
-    "build": "tsdown",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "lint": "eslint src/",
-    "lint:fix": "eslint src/ --fix",
-    "sit:larkpal-agent": "node scripts/sit/larkpal-agent-0.1.9-sit.mjs",
-    "typecheck": "tsc --noEmit",
-    "format": "prettier --write src/**/*.ts",
-    "format:check": "prettier --check src/**/*.ts"
   }
-}
+}