autoglm.js 0.0.10 → 0.0.12

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。
@@ -1178,7 +1178,7 @@ var ActionHandler = class {
 		return {
 			success: false,
 			should_finish: true,
-			message: `Takeover requested but no callback provided: ${action.reason}`
+			message: action.reason
 		};
 	}
 };
@@ -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(")) {
@@ -1640,6 +1644,7 @@ var PhoneAgent = class {
 	context = [];
 	stepCount = 0;
 	abortController = null;
+	externalSignal;
 	isAborted = false;
 	constructor(context, confirmationCallback, takeoverCallback) {
 		this.ctx = context;
@@ -1672,9 +1677,7 @@ var PhoneAgent = class {
 		}
 		this.abortController = new AbortController();
 		this.isAborted = false;
-		if (signal) signal.addEventListener("abort", () => {
-			this.abort(signal.reason || "External signal aborted");
-		});
+		this.externalSignal = signal;
 		try {
 			this.reset();
 			let result = await this._executeStep(task, true);
@@ -1687,6 +1690,7 @@ var PhoneAgent = class {
 			throw new Error("Max steps reached");
 		} finally {
 			this.abortController = null;
+			this.externalSignal = void 0;
 		}
 	}
 	/**
@@ -1733,7 +1737,11 @@ var PhoneAgent = class {
 			this.context.push(MessageBuilder.createUserMessage(textContent, screenshot.base64Data));
 		}
 		try {
-			const response = await this.modelClient.request(this.context, { signal: this.abortController?.signal });
+			const signals = [new AbortController().signal];
+			if (this.abortController) signals.push(this.abortController.signal);
+			if (this.externalSignal) signals.push(this.externalSignal);
+			const combinedSignal = AbortSignal.any(signals);
+			const response = await this.modelClient.request(this.context, { signal: combinedSignal });
 			let action;
 			try {
 				action = parseAction(response.action);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "autoglm.js",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "private": false,
   "description": "AutoGLM.js is a JavaScript library for Open-AutoGLM",
   "author": "FliPPeDround <flippedround@qq.com>",
@@ -49,9 +49,9 @@
   },
   "optionalDependencies": {
     "@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",
-    "@autoglm.js/platform-tools-darwin": "36.0.0"
+    "@autoglm.js/platform-tools-windows": "36.0.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",