autoglm.js 0.0.8 → 0.0.10

package/dist/index.mjs

@@ -1209,6 +1209,12 @@ function parseAction(actionStr) {
 		};
 	}
 	if (actionStr.startsWith("do(")) {
+		const typeMatch = actionStr.match(/do\(action="Type",\s*text=(.*)\)/s);
+		if (typeMatch) return {
+			_metadata: "do",
+			action: "Type",
+			text: parseQuotedString(typeMatch[1].trim()).trim()
+		};
 		const ast = parse(actionStr, { ecmaVersion: "latest" });
 		if (ast.body[0].type !== "DoWhileStatement") throw new Error(`Invalid action format: ${actionStr}`);
 		const expression = ast.body[0].body.expression;
@@ -1231,15 +1237,6 @@ function parseAction(actionStr) {
 				element
 			};
 		}
-		if (actionType === "Type") {
-			const text = getText(expression);
-			if (!text) throw new Error(`Invalid Type action parameters: ${actionStr}`);
-			return {
-				_metadata: "do",
-				action: "Type",
-				text: text.trim()
-			};
-		}
 		if (actionType === "Swipe") {
 			const start = getElements(expression, 1);
 			const end = getElements(expression, 2);
@@ -1298,6 +1295,17 @@ function parseAction(actionStr) {
 	}
 	throw new Error(`Unknown action format: ${actionStr}`);
 }
+/**
+* Parse a quoted string that may contain newlines and escape sequences.
+* Handles both single and double quotes.
+*/
+function parseQuotedString(str) {
+	if (!str) return "";
+	const firstChar = str[0];
+	const lastChar = str[str.length - 1];
+	if (firstChar === "\"" && lastChar === "\"" || firstChar === "'" && lastChar === "'") return str.slice(1, -1);
+	return str;
+}
 
 //#endregion
 //#region src/adb/types.ts
@@ -1616,6 +1624,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 {
@@ -1730,18 +1745,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.8",
+  "version": "0.0.10",
   "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-windows": "36.0.0",
+    "@autoglm.js/platform-tools-darwin": "36.0.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",