@vibe-lark/larkpal 0.1.77 → 0.1.78

package/dist/main.mjs

@@ -251,88 +251,98 @@ function getWorkspaceChatHistoryRoot(workspaceRoot = resolveWorkspaceRoot()) {
 * 以及确保会话工作目录结构完整。
 */
 const logger$10 = larkLogger("config/defaults");
-const DEFAULT_SETTINGS = {
-	permissions: {
-		allow: [
-			"Bash(*)",
-			"Read(*)",
-			"Write(*)",
-			"Edit(*)",
-			"MultiEdit(*)",
-			"Glob(*)",
-			"Grep(*)",
-			"LS(*)",
-			"TodoWrite(*)",
-			"WebFetch(*)",
-			"WebSearch(*)"
-		],
-		deny: [
-			"Write(//.claude/CLAUDE.md)",
-			"Edit(//.claude/CLAUDE.md)",
-			"Write(//.claude/settings.json)",
-			"Edit(//.claude/settings.json)",
-			"Read(//.lark-cli/**)",
-			"Read(//.config/lark/**)",
-			"Read(//.larkpal/credentials.json)",
-			"Read(//.env)",
-			"Read(//.env.*)",
-			"Bash(cat ~/.lark-cli:*)",
-			"Bash(cat ~/.config/lark:*)",
-			"Bash(cat ~/.larkpal/credentials:*)",
-			"Bash(head ~/.lark-cli:*)",
-			"Bash(head ~/.config/lark:*)",
-			"Bash(tail ~/.lark-cli:*)",
-			"Bash(tail ~/.config/lark:*)",
-			"Bash(less ~/.lark-cli:*)",
-			"Bash(less ~/.config/lark:*)",
-			"Bash(more ~/.lark-cli:*)",
-			"Bash(more ~/.config/lark:*)",
-			"Bash(env:*)",
-			"Bash(printenv:*)",
-			"Bash(export -p:*)",
-			"Bash(echo $LARK_APP_SECRET:*)",
-			"Bash(echo $ANTHROPIC_API_KEY:*)"
-		]
-	},
-	hooks: {
-		SessionStart: [{ hooks: [{
-			type: "http",
-			url: "http://localhost:3000/hooks/session-start",
-			timeout: 5
-		}] }],
-		Stop: [{ hooks: [{
-			type: "http",
-			url: "http://localhost:3000/hooks/stop",
-			timeout: 5
-		}] }],
-		PreToolUse: [{
-			matcher: "Read",
-			hooks: [{
+function createDefaultSettings() {
+	const hookBaseUrl = getClaudeHookBaseUrl();
+	return {
+		permissions: {
+			allow: [
+				"Bash(*)",
+				"Read(*)",
+				"Write(*)",
+				"Edit(*)",
+				"MultiEdit(*)",
+				"Glob(*)",
+				"Grep(*)",
+				"LS(*)",
+				"TodoWrite(*)",
+				"WebFetch(*)",
+				"WebSearch(*)"
+			],
+			deny: [
+				"Write(//.claude/CLAUDE.md)",
+				"Edit(//.claude/CLAUDE.md)",
+				"Write(//.claude/settings.json)",
+				"Edit(//.claude/settings.json)",
+				"Read(//.lark-cli/**)",
+				"Read(//.config/lark/**)",
+				"Read(//.larkpal/credentials.json)",
+				"Read(//.env)",
+				"Read(//.env.*)",
+				"Bash(cat ~/.lark-cli:*)",
+				"Bash(cat ~/.config/lark:*)",
+				"Bash(cat ~/.larkpal/credentials:*)",
+				"Bash(head ~/.lark-cli:*)",
+				"Bash(head ~/.config/lark:*)",
+				"Bash(tail ~/.lark-cli:*)",
+				"Bash(tail ~/.config/lark:*)",
+				"Bash(less ~/.lark-cli:*)",
+				"Bash(less ~/.config/lark:*)",
+				"Bash(more ~/.lark-cli:*)",
+				"Bash(more ~/.config/lark:*)",
+				"Bash(env:*)",
+				"Bash(printenv:*)",
+				"Bash(export -p:*)",
+				"Bash(echo $LARK_APP_SECRET:*)",
+				"Bash(echo $ANTHROPIC_API_KEY:*)"
+			]
+		},
+		hooks: {
+			SessionStart: [{ hooks: [{
 				type: "http",
-				url: "http://localhost:3000/hooks/pre-tool-use",
+				url: `${hookBaseUrl}/hooks/session-start`,
 				timeout: 5
-			}]
-		}],
-		PostToolUse: [{
-			matcher: "Read",
-			hooks: [{
+			}] }],
+			Stop: [{ hooks: [{
 				type: "http",
-				url: "http://localhost:3000/hooks/post-tool-use",
+				url: `${hookBaseUrl}/hooks/stop`,
 				timeout: 5
-			}]
-		}],
-		SessionEnd: [{ hooks: [{
-			type: "http",
-			url: "http://localhost:3000/hooks/session-end",
-			timeout: 5
-		}] }],
-		Notification: [{ hooks: [{
-			type: "http",
-			url: "http://localhost:3000/hooks/notification",
-			timeout: 5
-		}] }]
-	}
-};
+			}] }],
+			PreToolUse: [{
+				matcher: "Read",
+				hooks: [{
+					type: "http",
+					url: `${hookBaseUrl}/hooks/pre-tool-use`,
+					timeout: 5
+				}]
+			}],
+			PostToolUse: [{
+				matcher: "Read",
+				hooks: [{
+					type: "http",
+					url: `${hookBaseUrl}/hooks/post-tool-use`,
+					timeout: 5
+				}]
+			}],
+			SessionEnd: [{ hooks: [{
+				type: "http",
+				url: `${hookBaseUrl}/hooks/session-end`,
+				timeout: 5
+			}] }],
+			Notification: [{ hooks: [{
+				type: "http",
+				url: `${hookBaseUrl}/hooks/notification`,
+				timeout: 5
+			}] }]
+		}
+	};
+}
+function getClaudeHookBaseUrl() {
+	const explicit = process.env.LARKPAL_CC_HOOK_BASE_URL?.trim();
+	if (explicit) return explicit.replace(/\/+$/, "");
+	const port = process.env.LARKPAL_GATEWAY_PORT || "3000";
+	const rawHost = process.env.LARKPAL_GATEWAY_HOST || "localhost";
+	return `http://${rawHost === "0.0.0.0" || rawHost === "::" ? "127.0.0.1" : rawHost}:${port}`;
+}
 const DEFAULT_CLAUDE_MD = `# LarkPal
 
 你是一个运行在飞书中的 AI 协作伙伴。这是你的初始状态。
@@ -430,7 +440,7 @@ async function ensureDefaults() {
 	const claudeMdPath = join(claudeDir, "CLAUDE.md");
 	await mkdir(claudeDir, { recursive: true });
 	logger$10.info("确保 ~/.claude 目录存在", { path: claudeDir });
-	await writeFile(settingsPath, JSON.stringify(DEFAULT_SETTINGS, null, 2), "utf-8");
+	await writeFile(settingsPath, JSON.stringify(createDefaultSettings(), null, 2), "utf-8");
 	logger$10.info("settings.json 已同步（强制覆盖）", { path: settingsPath });
 	if (await fileExists(claudeMdPath)) logger$10.info("CLAUDE.md 已存在，跳过生成", { path: claudeMdPath });
 	else {
@@ -878,7 +888,7 @@ var CCStreamParser = class extends EventEmitter {
 					toolUseId: block?.id
 				});
 				if (block?.type === "tool_use" && block.name) {
-					this.recordToolUse(block.name, block.id);
+					if (!this.recordToolUse(block.name, block.id, block.input)) break;
 					log$37.info("工具调用开始", {
 						toolName: block.name,
 						displayName: getToolDisplayName(block.name),
@@ -926,7 +936,7 @@ var CCStreamParser = class extends EventEmitter {
 		});
 		if (Array.isArray(content)) {
 			for (const block of content) if (block.type === "tool_use" && block.name) {
-				this.recordToolUse(block.name, block.id);
+				if (!this.recordToolUse(block.name, block.id, block.input)) continue;
 				log$37.info("从 assistant 消息提取工具调用", {
 					toolName: block.name,
 					displayName: getToolDisplayName(block.name),
@@ -960,15 +970,19 @@ var CCStreamParser = class extends EventEmitter {
 		if (msg.subtype !== "init" || !Array.isArray(msg.tools)) return;
 		this.declaredTools = new Set(msg.tools);
 	}
-	recordToolUse(toolName, toolUseId) {
+	recordToolUse(toolName, toolUseId, toolInput) {
 		if (toolUseId) this.toolNamesById.set(toolUseId, toolName);
 		if (this.declaredTools && !this.declaredTools.has(toolName)) {
-			log$37.warn("模型请求了未声明工具", {
+			const availableTools = [...this.declaredTools];
+			log$37.warn("模型请求了未声明工具，已抑制正常 toolUseStart", {
 				toolName,
-				toolUseId
+				toolUseId,
+				availableTools
 			});
-			this.emit("unknownToolUse", toolName, toolUseId);
+			this.emit("unknownToolUse", toolName, toolUseId, toolInput, availableTools);
+			return false;
 		}
+		return true;
 	}
 	buildToolResultSummary(item, toolUseResult) {
 		const serializedContent = serializeToolResultContent(item.content);
@@ -1133,30 +1147,64 @@ async function sanitizeTranscriptEntry(entry, artifactRoot) {
 	let artifacts = 0;
 	const message = asObject$1(entry.message);
 	const content = message ? message.content : void 0;
-	if (!Array.isArray(content)) return {
+	const toolUseResult = asObject$1(entry.toolUseResult);
+	let firstArtifactUri;
+	if (Array.isArray(content)) for (let i = 0; i < content.length; i++) {
+		const block = asObject$1(content[i]);
+		if (!block) continue;
+		if (block.type === "tool_result") {
+			const toolUseId = typeof block.tool_use_id === "string" ? block.tool_use_id : void 0;
+			const replacement = await sanitizeToolResultContent(block.content, artifactRoot, toolUseId);
+			if (!replacement) continue;
+			block.content = replacement.content;
+			sanitizedImageBlocks += replacement.imageBlocks;
+			artifacts += replacement.artifacts;
+			firstArtifactUri ??= replacement.metadata[0]?.artifactUri;
+			continue;
+		}
+		if (isBase64ImageBlock(block)) {
+			const artifact = await writeImageArtifact(artifactRoot, block, void 0, i);
+			content[i] = {
+				type: "text",
+				text: buildReplacementText([artifact])
+			};
+			sanitizedImageBlocks++;
+			artifacts++;
+			firstArtifactUri ??= artifact.artifactUri;
+		}
+	}
+	const toolUseResultReplacement = await sanitizeToolUseResult(toolUseResult, artifactRoot, firstArtifactUri);
+	if (toolUseResultReplacement) {
+		sanitizedImageBlocks += toolUseResultReplacement.sanitizedImageBlocks;
+		artifacts += toolUseResultReplacement.artifacts;
+	}
+	return {
 		sanitizedImageBlocks,
 		artifacts
 	};
-	for (const block of content) {
-		const toolResult = asObject$1(block);
-		if (!toolResult || toolResult.type !== "tool_result") continue;
-		const toolUseId = typeof toolResult.tool_use_id === "string" ? toolResult.tool_use_id : void 0;
-		const replacement = await sanitizeToolResultContent(toolResult.content, artifactRoot, toolUseId);
-		if (!replacement) continue;
-		toolResult.content = replacement.content;
-		sanitizedImageBlocks += replacement.imageBlocks;
-		artifacts += replacement.artifacts;
-		const toolUseResult = asObject$1(entry.toolUseResult);
-		if (toolUseResult?.type === "image") {
-			const file = asObject$1(toolUseResult.file);
-			if (file && typeof file.base64 === "string") {
-				file.artifactUri = replacement.metadata[0]?.artifactUri;
-				file.base64 = "[redacted by LarkPal: image artifact externalized]";
-			}
-		}
+}
+async function sanitizeToolUseResult(toolUseResult, artifactRoot, existingArtifactUri) {
+	if (toolUseResult?.type !== "image") return null;
+	const file = asObject$1(toolUseResult.file);
+	if (!file || typeof file.base64 !== "string") return null;
+	let artifactUri = existingArtifactUri;
+	let artifacts = 0;
+	if (!artifactUri) {
+		artifactUri = (await writeImageArtifact(artifactRoot, {
+			type: "image",
+			source: {
+				type: "base64",
+				media_type: typeof file.type === "string" ? file.type : void 0,
+				data: file.base64
+			},
+			filePath: typeof file.filePath === "string" ? file.filePath : void 0
+		}, void 0, 0)).artifactUri;
+		artifacts = 1;
 	}
+	file.artifactUri = artifactUri;
+	file.base64 = "[redacted by LarkPal: image artifact externalized]";
 	return {
-		sanitizedImageBlocks,
+		sanitizedImageBlocks: 1,
 		artifacts
 	};
 }
@@ -1235,7 +1283,7 @@ function formatDimensions(block) {
 	return `${width}x${height}`;
 }
 function mightContainImagePayload(line) {
-	return line.includes("\"tool_result\"") && line.includes("\"type\":\"image\"") && line.includes("\"base64\"");
+	return line.includes("\"base64\"") && (line.includes("\"image\"") || line.includes("\"source\""));
 }
 function asObject$1(value) {
 	return typeof value === "object" && value != null ? value : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-lark/larkpal",
-  "version": "0.1.77",
+  "version": "0.1.78",
   "description": "LarkPal - Lark/Feishu bot service",
   "type": "module",
   "main": "./dist/main.mjs",