@ynhcj/xiaoyi-channel 0.0.48-beta → 0.0.49-beta

package/dist/src/channel.js

@@ -22,7 +22,7 @@ import { searchAlarmTool } from "./tools/search-alarm-tool.js";
 import { modifyAlarmTool } from "./tools/modify-alarm-tool.js";
 import { deleteAlarmTool } from "./tools/delete-alarm-tool.js";
 import { sendFileToUserTool } from "./tools/send-file-to-user-tool.js";
-// import { xiaoyiCollectionTool } from "./tools/xiaoyi-collection-tool.js"; // 暂时取消注册
+import { xiaoyiCollectionTool } from "./tools/xiaoyi-collection-tool.js";
 import { viewPushResultTool } from "./tools/view-push-result-tool.js";
 import { imageReadingTool } from "./tools/image-reading-tool.js";
 /**
@@ -64,7 +64,7 @@ export const xyPlugin = {
     },
     outbound: xyOutbound,
     onboarding: xyOnboardingAdapter,
-    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool],
+    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, xiaoyiCollectionTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool],
     messaging: {
         normalizeTarget: (raw) => {
             const trimmed = raw.trim();

package/dist/src/tools/image-reading-tool.js

@@ -75,6 +75,10 @@ async function processImageInput(imageInput, uploadService) {
         const localPath = await downloadRemoteFile(imageInput);
         logger.log(`[IMAGE_READING_TOOL] 📤 Uploading downloaded file to OBS...`);
         const imageUrl = await uploadService.uploadFileAndGetUrl(localPath, "TEMPORARY_MATERIAL_DOC");
+        if (!imageUrl) {
+            logger.error(`[IMAGE_READING_TOOL] ❌ Failed to get URL after upload`);
+            throw new Error("图片上传失败：无法获取图片访问地址");
+        }
         logger.log(`[IMAGE_READING_TOOL] ✅ Uploaded to OBS: ${imageUrl}`);
         return { imageUrl, localPath };
     }
@@ -83,6 +87,10 @@ async function processImageInput(imageInput, uploadService) {
     if (isLocal) {
         logger.log(`[IMAGE_READING_TOOL] 📁 Input is local file, uploading...`);
         const imageUrl = await uploadService.uploadFileAndGetUrl(imageInput, "TEMPORARY_MATERIAL_DOC");
+        if (!imageUrl) {
+            logger.error(`[IMAGE_READING_TOOL] ❌ Failed to get URL after upload`);
+            throw new Error("图片上传失败：无法获取图片访问地址");
+        }
         logger.log(`[IMAGE_READING_TOOL] ✅ Uploaded to OBS: ${imageUrl}`);
         return { imageUrl };
     }
@@ -347,7 +355,21 @@ d. 返回图像理解的文本描述内容`,
                 }
             }
             logger.error(`[IMAGE_READING_TOOL] ❌ Execution failed:`, error);
-            throw error;
+            const errorMessage = error instanceof Error ? error.message : "图片分析失败";
+            // Return error result instead of throwing
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: JSON.stringify({
+                            error: errorMessage,
+                            prompt,
+                            imageSource: params.localUrl ? "local" : "remote",
+                            success: false,
+                        }),
+                    },
+                ],
+            };
         }
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.48-beta",
+  "version": "0.0.49-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",