autoglm.js 0.0.9 → 0.0.11

package/dist/index.mjs

@@ -350,7 +350,7 @@ const SYSTEM_PROMPT_ZH = `今天的日期是: ${formatted_date}
 - do(action="Wait", duration="x seconds")
     等待页面加载，x为需要等待多少秒。
 - finish(message="xxx")
-    finish是结束任务的操作，表示准确完整完成任务，message是终止信息。
+    finish是结束任务的操作，表示准确完整完成任务，message参数是任务完成后的总结信息，必须简洁明了地说明执行结果。
 
 必须遵循的规则：
 1. 在执行任何操作前，先检查当前app是否是目标app，如果不是，先执行 Launch。
@@ -1202,10 +1202,14 @@ function getActionType(node) {
 */
 function parseAction(actionStr) {
 	if (actionStr.startsWith("finish(")) {
-		const match = actionStr.match(/finish\(message=(.*)\)/);
-		return {
+		const match = actionStr.match(/finish\(message=(.*)\)/s);
+		if (match) return {
+			_metadata: "finish",
+			message: parseQuotedString(match[1].trim())
+		};
+		else return {
 			_metadata: "finish",
-			message: match ? match[1].trim() : void 0
+			message: void 0
 		};
 	}
 	if (actionStr.startsWith("do(")) {
@@ -1624,6 +1628,13 @@ var ModelClient = class {
 	}
 };
 
+//#endregion
+//#region src/utils/finishMessage.ts
+function getFinishMessage(result) {
+	const actionMessage = result?.action?._metadata === "finish" ? result.action.message : void 0;
+	return result?.message || actionMessage || result?.thinking || "Task completed";
+}
+
 //#endregion
 //#region src/agent/index.ts
 var PhoneAgent = class {
@@ -1738,18 +1749,14 @@ var PhoneAgent = class {
 			const result = await this.actionHandler.execute(action, screenshot.width, screenshot.height);
 			this.context.push(MessageBuilder.createAssistantMessage(`<think>${response.thinking}</think><answer>${response.action}</answer>`));
 			const finished = action._metadata === "finish" || result.should_finish;
-			if (finished) {
-				const actionMessage$1 = action._metadata === "finish" ? action.message : void 0;
-				const message = result.message || actionMessage$1 || "Task completed";
-				this.ctx.emit(EventType.TASK_COMPLETE, message);
-			}
-			const actionMessage = action._metadata === "finish" ? action.message : void 0;
+			const message = getFinishMessage(result);
+			if (finished) this.ctx.emit(EventType.TASK_COMPLETE, message);
 			return {
 				success: result.success,
 				finished,
 				action,
 				thinking: response.thinking,
-				message: result.message || actionMessage
+				message
 			};
 		} catch (error) {
 			return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "autoglm.js",
   "type": "module",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "private": false,
   "description": "AutoGLM.js is a JavaScript library for Open-AutoGLM",
   "author": "FliPPeDround <flippedround@qq.com>",
@@ -48,8 +48,8 @@
     "unzipper": "^0.12.3"
   },
   "optionalDependencies": {
-    "@autoglm.js/platform-tools-darwin": "36.0.0",
     "@autoglm.js/adb-keyboard": "0.0.1",
+    "@autoglm.js/platform-tools-darwin": "36.0.0",
     "@autoglm.js/platform-tools-linux": "36.0.0",
     "@autoglm.js/platform-tools-windows": "36.0.0"
   },