@beeos-ai/device-agent 0.12.7 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-runtime/adapters/base.d.ts +2 -0
- package/dist/agent-runtime/adapters/base.js +1 -0
- package/dist/agent-runtime/adapters/base.js.map +1 -1
- package/dist/agent-runtime/adapters/openai.js +39 -17
- package/dist/agent-runtime/adapters/openai.js.map +1 -1
- package/dist/agent-runtime/advanced/app-card.d.ts +23 -0
- package/dist/agent-runtime/advanced/app-card.js +99 -0
- package/dist/agent-runtime/advanced/app-card.js.map +1 -0
- package/dist/agent-runtime/advanced/knowledge.d.ts +15 -0
- package/dist/agent-runtime/advanced/knowledge.js +85 -0
- package/dist/agent-runtime/advanced/knowledge.js.map +1 -0
- package/dist/agent-runtime/advanced/subgoal-verifier.d.ts +37 -0
- package/dist/agent-runtime/advanced/subgoal-verifier.js +190 -0
- package/dist/agent-runtime/advanced/subgoal-verifier.js.map +1 -0
- package/dist/agent-runtime/advanced/task-state.d.ts +20 -0
- package/dist/agent-runtime/advanced/task-state.js +60 -0
- package/dist/agent-runtime/advanced/task-state.js.map +1 -0
- package/dist/agent-runtime/agent-runner.d.ts +16 -27
- package/dist/agent-runtime/agent-runner.js +19 -132
- package/dist/agent-runtime/agent-runner.js.map +1 -1
- package/dist/agent-runtime/core.d.ts +8 -0
- package/dist/agent-runtime/core.js +24 -2
- package/dist/agent-runtime/core.js.map +1 -1
- package/dist/agent-runtime/execution-mode.d.ts +28 -0
- package/dist/agent-runtime/execution-mode.js +51 -0
- package/dist/agent-runtime/execution-mode.js.map +1 -0
- package/dist/agent-runtime/factory.d.ts +6 -4
- package/dist/agent-runtime/factory.js +4 -4
- package/dist/agent-runtime/factory.js.map +1 -1
- package/dist/agent-runtime/index.d.ts +9 -2
- package/dist/agent-runtime/index.js +7 -0
- package/dist/agent-runtime/index.js.map +1 -1
- package/dist/agent-runtime/models/base.d.ts +2 -0
- package/dist/agent-runtime/models/client.d.ts +1 -0
- package/dist/agent-runtime/models/client.js +90 -1
- package/dist/agent-runtime/models/client.js.map +1 -1
- package/dist/agent-runtime/models/runtime-registry.d.ts +28 -0
- package/dist/agent-runtime/models/runtime-registry.js +59 -0
- package/dist/agent-runtime/models/runtime-registry.js.map +1 -0
- package/dist/agent-runtime/models/vlm/autoglm.js +14 -9
- package/dist/agent-runtime/models/vlm/autoglm.js.map +1 -1
- package/dist/agent-runtime/models/vlm/base.d.ts +15 -1
- package/dist/agent-runtime/models/vlm/base.js +31 -10
- package/dist/agent-runtime/models/vlm/base.js.map +1 -1
- package/dist/agent-runtime/models/vlm/general.d.ts +7 -1
- package/dist/agent-runtime/models/vlm/general.js +43 -9
- package/dist/agent-runtime/models/vlm/general.js.map +1 -1
- package/dist/agent-runtime/models/vlm/guiowl.js +4 -13
- package/dist/agent-runtime/models/vlm/guiowl.js.map +1 -1
- package/dist/agent-runtime/models/vlm/index.d.ts +1 -0
- package/dist/agent-runtime/models/vlm/index.js +1 -0
- package/dist/agent-runtime/models/vlm/index.js.map +1 -1
- package/dist/agent-runtime/models/vlm/maiui.js +4 -6
- package/dist/agent-runtime/models/vlm/maiui.js.map +1 -1
- package/dist/agent-runtime/models/vlm/qwen38.d.ts +1 -0
- package/dist/agent-runtime/models/vlm/qwen38.js +241 -0
- package/dist/agent-runtime/models/vlm/qwen38.js.map +1 -0
- package/dist/agent-runtime/models/vlm/qwenvl.js +4 -6
- package/dist/agent-runtime/models/vlm/qwenvl.js.map +1 -1
- package/dist/agent-runtime/models/vlm/shared/tool-call.d.ts +6 -2
- package/dist/agent-runtime/models/vlm/shared/tool-call.js +91 -17
- package/dist/agent-runtime/models/vlm/shared/tool-call.js.map +1 -1
- package/dist/agent-runtime/modes/hybrid/index.d.ts +25 -13
- package/dist/agent-runtime/modes/hybrid/index.js +74 -28
- package/dist/agent-runtime/modes/hybrid/index.js.map +1 -1
- package/dist/agent-runtime/modes/hybrid/planner/base.d.ts +4 -0
- package/dist/agent-runtime/modes/hybrid/planner/base.js.map +1 -1
- package/dist/agent-runtime/modes/hybrid/planner/llm-planner.js +2 -0
- package/dist/agent-runtime/modes/hybrid/planner/llm-planner.js.map +1 -1
- package/dist/agent-runtime/modes/hybrid/planner/noop-planner.d.ts +1 -1
- package/dist/agent-runtime/modes/hybrid/planner/noop-planner.js +1 -1
- package/dist/agent-runtime/modes/hybrid/planner/prompts.d.ts +2 -0
- package/dist/agent-runtime/modes/hybrid/planner/prompts.js +8 -0
- package/dist/agent-runtime/modes/hybrid/planner/prompts.js.map +1 -1
- package/dist/agent-runtime/modes/orchestrator/index.d.ts +6 -0
- package/dist/agent-runtime/modes/orchestrator/index.js +4 -0
- package/dist/agent-runtime/modes/orchestrator/index.js.map +1 -1
- package/dist/agent-runtime/observation-mode.d.ts +2 -0
- package/dist/agent-runtime/observation-mode.js +2 -0
- package/dist/agent-runtime/observation-mode.js.map +1 -1
- package/dist/agent-runtime/plan-executor.d.ts +8 -2
- package/dist/agent-runtime/plan-executor.js +109 -14
- package/dist/agent-runtime/plan-executor.js.map +1 -1
- package/dist/agent-runtime/reflectors/policy.d.ts +2 -5
- package/dist/agent-runtime/reflectors/policy.js +6 -14
- package/dist/agent-runtime/reflectors/policy.js.map +1 -1
- package/dist/agent-runtime/reflectors/trajectory-reflector.d.ts +3 -4
- package/dist/agent-runtime/reflectors/trajectory-reflector.js +4 -4
- package/dist/agent-runtime/reflectors/trajectory-reflector.js.map +1 -1
- package/dist/agent-runtime/skills/replay.js +1 -0
- package/dist/agent-runtime/skills/replay.js.map +1 -1
- package/dist/agent-runtime/vlm.d.ts +2 -3
- package/dist/agent-runtime/vlm.js +2 -3
- package/dist/agent-runtime/vlm.js.map +1 -1
- package/dist/api.js +1 -0
- package/dist/api.js.map +1 -1
- package/dist/app/agent-host.js +3 -3
- package/dist/app/agent-host.js.map +1 -1
- package/dist/app/multi-device-host.d.ts +2 -2
- package/dist/app/multi-device-host.js +1 -1
- package/dist/app/session-manager.d.ts +20 -3
- package/dist/app/session-manager.js +33 -4
- package/dist/app/session-manager.js.map +1 -1
- package/dist/bootstrap.d.ts +2 -8
- package/dist/bootstrap.js +61 -103
- package/dist/bootstrap.js.map +1 -1
- package/dist/config/loader.d.ts +2 -9
- package/dist/config/loader.js +32 -34
- package/dist/config/loader.js.map +1 -1
- package/dist/config/schema.d.ts +5 -29
- package/dist/config/schema.js +8 -42
- package/dist/config/schema.js.map +1 -1
- package/dist/device/apps.js +51 -1
- package/dist/device/apps.js.map +1 -1
- package/dist/fleet/adapters/process/in-process-manager.d.ts +1 -1
- package/dist/fleet/adapters/process/node-process-manager.d.ts +7 -0
- package/dist/fleet/adapters/process/node-process-manager.js +29 -8
- package/dist/fleet/adapters/process/node-process-manager.js.map +1 -1
- package/dist/inbound/acp/handlers/session.d.ts +4 -1
- package/dist/inbound/acp/handlers/session.js +24 -10
- package/dist/inbound/acp/handlers/session.js.map +1 -1
- package/dist/inbound/cli/benchmark-command.d.ts +17 -0
- package/dist/inbound/cli/benchmark-command.js +158 -0
- package/dist/inbound/cli/benchmark-command.js.map +1 -0
- package/dist/inbound/cli/fleet-command.d.ts +12 -1
- package/dist/inbound/cli/fleet-command.js +38 -9
- package/dist/inbound/cli/fleet-command.js.map +1 -1
- package/dist/inbound/cli/main.d.ts +2 -6
- package/dist/inbound/cli/main.js +49 -33
- package/dist/inbound/cli/main.js.map +1 -1
- package/dist/inbound/cli/run-artifacts.d.ts +61 -0
- package/dist/inbound/cli/run-artifacts.js +247 -0
- package/dist/inbound/cli/run-artifacts.js.map +1 -0
- package/dist/inbound/cli/run-command.d.ts +23 -20
- package/dist/inbound/cli/run-command.js +157 -159
- package/dist/inbound/cli/run-command.js.map +1 -1
- package/dist/index.d.ts +9 -3
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/plugins/http-debug/early-health.d.ts +11 -0
- package/dist/plugins/http-debug/early-health.js +51 -0
- package/dist/plugins/http-debug/early-health.js.map +1 -0
- package/dist/plugins/http-debug/index.js +2 -0
- package/dist/plugins/http-debug/index.js.map +1 -1
- package/dist/plugins/message-bus/inbound.js +7 -6
- package/dist/plugins/message-bus/inbound.js.map +1 -1
- package/dist/ports/agent-core.d.ts +13 -13
- package/dist/ports/agent-host.d.ts +4 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maiui.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/maiui.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"maiui.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/maiui.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,241 @@
|
|
|
1
|
+
import { invalidModelOutput, ModelAdapter, registerAdapter } from "./base.js";
|
|
2
|
+
import { parseToolCall } from "./shared/tool-call.js";
|
|
3
|
+
const POINT_SCHEMA = {
|
|
4
|
+
type: "array",
|
|
5
|
+
items: { type: "integer", minimum: 0, maximum: 999 },
|
|
6
|
+
minItems: 2,
|
|
7
|
+
maxItems: 2,
|
|
8
|
+
};
|
|
9
|
+
const ALLOWED_ACTIONS = [
|
|
10
|
+
"click",
|
|
11
|
+
"tap",
|
|
12
|
+
"left_click",
|
|
13
|
+
"double_tap",
|
|
14
|
+
"double_click",
|
|
15
|
+
"doubleclick",
|
|
16
|
+
"long_press",
|
|
17
|
+
"swipe",
|
|
18
|
+
"drag",
|
|
19
|
+
"scroll",
|
|
20
|
+
"type",
|
|
21
|
+
"input_text",
|
|
22
|
+
"system_button",
|
|
23
|
+
"keyboard_enter",
|
|
24
|
+
"back",
|
|
25
|
+
"navigate_back",
|
|
26
|
+
"home",
|
|
27
|
+
"navigate_home",
|
|
28
|
+
"open_app",
|
|
29
|
+
"launch_app",
|
|
30
|
+
"wait",
|
|
31
|
+
"answer",
|
|
32
|
+
"terminate",
|
|
33
|
+
];
|
|
34
|
+
const MOBILE_USE_TOOL = {
|
|
35
|
+
type: "function",
|
|
36
|
+
function: {
|
|
37
|
+
name: "mobile_use",
|
|
38
|
+
description: "Execute exactly one atomic action on the current Android device.",
|
|
39
|
+
parameters: {
|
|
40
|
+
type: "object",
|
|
41
|
+
additionalProperties: false,
|
|
42
|
+
properties: {
|
|
43
|
+
action: {
|
|
44
|
+
type: "string",
|
|
45
|
+
enum: [
|
|
46
|
+
"click",
|
|
47
|
+
"double_tap",
|
|
48
|
+
"long_press",
|
|
49
|
+
"swipe",
|
|
50
|
+
"drag",
|
|
51
|
+
"scroll",
|
|
52
|
+
"type",
|
|
53
|
+
"system_button",
|
|
54
|
+
"open_app",
|
|
55
|
+
"wait",
|
|
56
|
+
"answer",
|
|
57
|
+
"terminate",
|
|
58
|
+
],
|
|
59
|
+
},
|
|
60
|
+
coordinate: {
|
|
61
|
+
...POINT_SCHEMA,
|
|
62
|
+
description: "Required for click, double_tap and long_press; may anchor scroll.",
|
|
63
|
+
},
|
|
64
|
+
coordinate2: { ...POINT_SCHEMA, description: "Required swipe or drag end point." },
|
|
65
|
+
start_coordinate: { ...POINT_SCHEMA, description: "Alternative swipe or drag start point." },
|
|
66
|
+
end_coordinate: { ...POINT_SCHEMA, description: "Alternative swipe or drag end point." },
|
|
67
|
+
text: { type: "string", description: "Required for type and answer." },
|
|
68
|
+
app_name: { type: "string", description: "Required for open_app." },
|
|
69
|
+
button: { type: "string", enum: ["Back", "Home", "Menu", "Enter"] },
|
|
70
|
+
direction: { type: "string", enum: ["up", "down", "left", "right"] },
|
|
71
|
+
amount: { type: "number", minimum: 0.1, maximum: 5 },
|
|
72
|
+
time: { type: "number", minimum: 0, maximum: 30 },
|
|
73
|
+
status: {
|
|
74
|
+
type: "string",
|
|
75
|
+
enum: ["success", "failure"],
|
|
76
|
+
description: "Required for terminate.",
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
required: ["action"],
|
|
80
|
+
},
|
|
81
|
+
},
|
|
82
|
+
};
|
|
83
|
+
const SYSTEM_PROMPT_EN = `You control an Android phone using the mobile_use tool.
|
|
84
|
+
Inspect the latest screenshot or UI hierarchy and call mobile_use exactly once per turn.
|
|
85
|
+
Coordinates are normalized integers from 0 to 999, with (0,0) at the top-left.
|
|
86
|
+
Use only the actions declared by the tool. Never emit desktop actions such as left_click.
|
|
87
|
+
Before repeating an action, verify from the latest observation whether the previous action worked.
|
|
88
|
+
Use answer when the user requested information. Use terminate when the task is complete or cannot be completed safely.`;
|
|
89
|
+
const SYSTEM_PROMPT_CN = `你通过 mobile_use 工具控制 Android 手机。
|
|
90
|
+
每一轮检查最新截图或 UI 结构,并且只调用一次 mobile_use。
|
|
91
|
+
坐标是 0 到 999 的归一化整数,左上角为 (0,0)。
|
|
92
|
+
只能使用工具声明的动作,不要输出 left_click 等桌面动作。
|
|
93
|
+
重复动作前,先根据最新观察确认上一步是否生效。
|
|
94
|
+
用户要求获取信息时使用 answer;任务完成或无法安全完成时使用 terminate。`;
|
|
95
|
+
class Qwen38Adapter extends ModelAdapter {
|
|
96
|
+
name = "qwen38";
|
|
97
|
+
patterns = [/(?:^|[\/_-])qwen3\.8(?:$|[\/_-])/];
|
|
98
|
+
observationProfile = {
|
|
99
|
+
defaultMode: "vision",
|
|
100
|
+
supportedModes: ["vision", "xml", "hybrid"],
|
|
101
|
+
};
|
|
102
|
+
requestProfile = {
|
|
103
|
+
tools: [MOBILE_USE_TOOL],
|
|
104
|
+
toolChoice: "required",
|
|
105
|
+
parallelToolCalls: false,
|
|
106
|
+
};
|
|
107
|
+
actionHistory = [];
|
|
108
|
+
buildMessages(task, screenInfo, _context, isFirst, lang) {
|
|
109
|
+
if (isFirst)
|
|
110
|
+
this.actionHistory = [];
|
|
111
|
+
const content = [{
|
|
112
|
+
type: "text",
|
|
113
|
+
text: buildUserPrompt(task, screenInfo, this.actionHistory, lang),
|
|
114
|
+
}];
|
|
115
|
+
if (screenInfo.imageRef) {
|
|
116
|
+
content.push({ type: "image_url", image_url: { url: screenInfo.imageRef.url } });
|
|
117
|
+
}
|
|
118
|
+
return [
|
|
119
|
+
{ role: "system", content: lang === "cn" ? SYSTEM_PROMPT_CN : SYSTEM_PROMPT_EN },
|
|
120
|
+
{ role: "user", content },
|
|
121
|
+
];
|
|
122
|
+
}
|
|
123
|
+
parseResponse(raw) {
|
|
124
|
+
const marker = raw.indexOf("<tool_call>");
|
|
125
|
+
const thinking = (marker >= 0 ? raw.slice(0, marker) : raw).trim();
|
|
126
|
+
const parsed = parseToolCall(raw, thinking, {
|
|
127
|
+
expectedToolName: "mobile_use",
|
|
128
|
+
allowedActions: ALLOWED_ACTIONS,
|
|
129
|
+
})
|
|
130
|
+
?? invalidModelOutput(this.name, "expected one valid mobile_use tool call");
|
|
131
|
+
validateAction(parsed);
|
|
132
|
+
return parsed;
|
|
133
|
+
}
|
|
134
|
+
updateContext(_context, _response, parsed) {
|
|
135
|
+
if (!parsed.shouldFinish)
|
|
136
|
+
this.actionHistory.push(actionSummary(parsed));
|
|
137
|
+
return [];
|
|
138
|
+
}
|
|
139
|
+
clearHistory() {
|
|
140
|
+
this.actionHistory = [];
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
registerAdapter(() => new Qwen38Adapter());
|
|
144
|
+
function buildUserPrompt(task, screenInfo, history, lang) {
|
|
145
|
+
const lines = lang === "cn"
|
|
146
|
+
? [`任务:${task}`, `当前应用:${screenInfo.currentApp || "未知"}`]
|
|
147
|
+
: [`Task: ${task}`, `Current app: ${screenInfo.currentApp || "unknown"}`];
|
|
148
|
+
if (history.length > 0) {
|
|
149
|
+
lines.push(lang === "cn" ? "已执行动作:" : "Actions already executed:");
|
|
150
|
+
history.forEach((action, index) => lines.push(`${index + 1}. ${action}`));
|
|
151
|
+
}
|
|
152
|
+
if (screenInfo.uiXml) {
|
|
153
|
+
lines.push(lang === "cn" ? "UI 结构:" : "UI hierarchy:", screenInfo.uiXml);
|
|
154
|
+
}
|
|
155
|
+
return lines.join("\n");
|
|
156
|
+
}
|
|
157
|
+
function validateAction(parsed) {
|
|
158
|
+
const p = parsed.params;
|
|
159
|
+
const point = (x, y, label) => {
|
|
160
|
+
if (!isCoordinate(x) || !isCoordinate(y)) {
|
|
161
|
+
invalidModelOutput("qwen38", `${label} coordinates must be integers in [0, 999]`);
|
|
162
|
+
}
|
|
163
|
+
};
|
|
164
|
+
switch (parsed.actionType) {
|
|
165
|
+
case "tap":
|
|
166
|
+
case "double_tap":
|
|
167
|
+
point(p.x, p.y, parsed.actionType);
|
|
168
|
+
break;
|
|
169
|
+
case "long_press":
|
|
170
|
+
point(p.x, p.y, parsed.actionType);
|
|
171
|
+
if (typeof p.duration_ms !== "number"
|
|
172
|
+
|| !Number.isFinite(p.duration_ms)
|
|
173
|
+
|| p.duration_ms < 0
|
|
174
|
+
|| p.duration_ms > 30_000) {
|
|
175
|
+
invalidModelOutput("qwen38", "long_press time must be in [0, 30]");
|
|
176
|
+
}
|
|
177
|
+
break;
|
|
178
|
+
case "swipe":
|
|
179
|
+
point(p.start_x, p.start_y, "swipe start");
|
|
180
|
+
point(p.end_x, p.end_y, "swipe end");
|
|
181
|
+
break;
|
|
182
|
+
case "scroll":
|
|
183
|
+
point(p.x, p.y, "scroll");
|
|
184
|
+
if (!["up", "down", "left", "right"].includes(String(p.direction))) {
|
|
185
|
+
invalidModelOutput("qwen38", "scroll direction is invalid");
|
|
186
|
+
}
|
|
187
|
+
if (typeof p.amount !== "number"
|
|
188
|
+
|| !Number.isFinite(p.amount)
|
|
189
|
+
|| p.amount < 0.1
|
|
190
|
+
|| p.amount > 5) {
|
|
191
|
+
invalidModelOutput("qwen38", "scroll amount must be in [0.1, 5]");
|
|
192
|
+
}
|
|
193
|
+
break;
|
|
194
|
+
case "type":
|
|
195
|
+
if (typeof p.text !== "string" || p.text.length === 0) {
|
|
196
|
+
invalidModelOutput("qwen38", "type requires non-empty text");
|
|
197
|
+
}
|
|
198
|
+
break;
|
|
199
|
+
case "open_app":
|
|
200
|
+
if (typeof p.app_name !== "string" || p.app_name.trim().length === 0) {
|
|
201
|
+
invalidModelOutput("qwen38", "open_app requires app_name");
|
|
202
|
+
}
|
|
203
|
+
break;
|
|
204
|
+
case "wait": {
|
|
205
|
+
const seconds = p.duration_seconds;
|
|
206
|
+
if (typeof seconds !== "number" || !Number.isFinite(seconds) || seconds < 0 || seconds > 30) {
|
|
207
|
+
invalidModelOutput("qwen38", "wait time must be in [0, 30]");
|
|
208
|
+
}
|
|
209
|
+
break;
|
|
210
|
+
}
|
|
211
|
+
case "press_back":
|
|
212
|
+
case "press_home":
|
|
213
|
+
case "press_key":
|
|
214
|
+
case "finish":
|
|
215
|
+
case "fail":
|
|
216
|
+
break;
|
|
217
|
+
default:
|
|
218
|
+
invalidModelOutput("qwen38", `unsupported action: ${parsed.actionType}`);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
function isCoordinate(value) {
|
|
222
|
+
return typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 999;
|
|
223
|
+
}
|
|
224
|
+
function actionSummary(parsed) {
|
|
225
|
+
const p = parsed.params;
|
|
226
|
+
if (parsed.actionType === "tap")
|
|
227
|
+
return `click(${p.x},${p.y})`;
|
|
228
|
+
if (parsed.actionType === "double_tap")
|
|
229
|
+
return `double_tap(${p.x},${p.y})`;
|
|
230
|
+
if (parsed.actionType === "long_press")
|
|
231
|
+
return `long_press(${p.x},${p.y})`;
|
|
232
|
+
if (parsed.actionType === "swipe") {
|
|
233
|
+
return `swipe(${p.start_x},${p.start_y}->${p.end_x},${p.end_y})`;
|
|
234
|
+
}
|
|
235
|
+
if (parsed.actionType === "type")
|
|
236
|
+
return `type(${JSON.stringify(String(p.text).slice(0, 80))})`;
|
|
237
|
+
if (parsed.actionType === "open_app")
|
|
238
|
+
return `open_app(${p.app_name})`;
|
|
239
|
+
return parsed.actionType;
|
|
240
|
+
}
|
|
241
|
+
//# sourceMappingURL=qwen38.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"qwen38.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/qwen38.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ModelAdapter, registerAdapter } from "./base.js";
|
|
1
|
+
import { invalidModelOutput, ModelAdapter, registerAdapter } from "./base.js";
|
|
2
2
|
import { parseToolCall } from "./shared/tool-call.js";
|
|
3
3
|
// Qwen-VL adapter
|
|
4
4
|
// Aligned with ClawGUI prompts_qwenvl.py (PHONE_USE_QWEN_CN / PHONE_USE_QWEN_EN)
|
|
@@ -152,7 +152,8 @@ class QwenVLAdapter extends ModelAdapter {
|
|
|
152
152
|
const thoughtM = raw.match(/^Thought\s*[::]\s*(.+?)(?=\nAction\s*[::]|\n<tool_call>|$)/ms);
|
|
153
153
|
const thinking = thoughtM ? thoughtM[1].trim() : extractThinkTag(raw);
|
|
154
154
|
const toolBlock = raw.includes("<tool_call>") ? raw : `<tool_call>${raw}</tool_call>`;
|
|
155
|
-
return parseToolCall(toolBlock, thinking)
|
|
155
|
+
return parseToolCall(toolBlock, thinking)
|
|
156
|
+
?? invalidModelOutput(this.name, "expected a valid <tool_call> JSON action");
|
|
156
157
|
}
|
|
157
158
|
updateContext(_context, response, parsed) {
|
|
158
159
|
if (!parsed.shouldFinish) {
|
|
@@ -168,7 +169,7 @@ class QwenVLAdapter extends ModelAdapter {
|
|
|
168
169
|
this.actionHistory = [];
|
|
169
170
|
}
|
|
170
171
|
}
|
|
171
|
-
registerAdapter(new QwenVLAdapter());
|
|
172
|
+
registerAdapter(() => new QwenVLAdapter());
|
|
172
173
|
// ── Helpers ──────────────────────────────────────────────────────────────────
|
|
173
174
|
function buildUserQuery(task, history) {
|
|
174
175
|
// Mirrors ClawGUI build_qwenvl_user_query exactly:
|
|
@@ -186,9 +187,6 @@ function extractThinkTag(raw) {
|
|
|
186
187
|
const m = raw.match(/<think(?:ing)?>([\s\S]*?)<\/think(?:ing)?>/i);
|
|
187
188
|
return m ? m[1].trim() : "";
|
|
188
189
|
}
|
|
189
|
-
function wait(thinking) {
|
|
190
|
-
return { actionType: "wait", params: { duration_seconds: 2 }, thinking, coordSystem: "0-1000", shouldFinish: false, finishMessage: null };
|
|
191
|
-
}
|
|
192
190
|
function actionSummary(parsed) {
|
|
193
191
|
const { actionType: t, params: p } = parsed;
|
|
194
192
|
if (t === "tap")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qwenvl.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/qwenvl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"qwenvl.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/qwenvl.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,9 @@
|
|
|
2
2
|
* Shared <tool_call> parser used by QwenVL, MAIUI, and GUIOwl adapters.
|
|
3
3
|
*/
|
|
4
4
|
import type { ParsedAction } from "../../../../types.js";
|
|
5
|
-
export
|
|
6
|
-
|
|
5
|
+
export interface ToolCallParseOptions {
|
|
6
|
+
expectedToolName?: string;
|
|
7
|
+
allowedActions?: readonly string[];
|
|
8
|
+
}
|
|
9
|
+
export declare function parseToolCall(block: string, thinking: string, options?: ToolCallParseOptions): ParsedAction | null;
|
|
10
|
+
export declare function argsToAction(args: Record<string, unknown>, thinking: string): ParsedAction | null;
|
|
@@ -1,29 +1,87 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Shared <tool_call> parser used by QwenVL, MAIUI, and GUIOwl adapters.
|
|
3
3
|
*/
|
|
4
|
-
|
|
4
|
+
const ACTION_ALIASES = {
|
|
5
|
+
left_click: "click",
|
|
6
|
+
double_click: "double_tap",
|
|
7
|
+
doubleclick: "double_tap",
|
|
8
|
+
input_text: "type",
|
|
9
|
+
keyboard_enter: "enter",
|
|
10
|
+
navigate_back: "back",
|
|
11
|
+
navigate_home: "home",
|
|
12
|
+
launch_app: "open_app",
|
|
13
|
+
};
|
|
14
|
+
export function parseToolCall(block, thinking, options = {}) {
|
|
5
15
|
const m = block.match(/<tool_call>\s*([\s\S]*?)(?:<\/tool_call>|$)/);
|
|
6
16
|
if (!m)
|
|
7
17
|
return null;
|
|
8
18
|
let raw = m[1].trim().replace(/\\n/g, "");
|
|
9
19
|
// Strip partial closing tag at end
|
|
10
20
|
raw = raw.replace(/<\/?tool_call[^>]*$/, "").trim();
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
21
|
+
for (const candidate of jsonObjectCandidates(raw)) {
|
|
22
|
+
let data;
|
|
23
|
+
try {
|
|
24
|
+
data = JSON.parse(candidate);
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
const envelope = data && typeof data === "object" ? data : undefined;
|
|
30
|
+
if (options.expectedToolName && envelope?.name !== options.expectedToolName)
|
|
31
|
+
continue;
|
|
32
|
+
const args = envelope && "arguments" in envelope
|
|
33
|
+
? envelope.arguments
|
|
34
|
+
: envelope;
|
|
35
|
+
if (!args || typeof args !== "object" || Array.isArray(args))
|
|
36
|
+
continue;
|
|
37
|
+
if (options.allowedActions) {
|
|
38
|
+
const action = typeof args.action === "string" ? args.action.trim().toLowerCase() : "";
|
|
39
|
+
if (!options.allowedActions.includes(action))
|
|
40
|
+
continue;
|
|
41
|
+
}
|
|
42
|
+
const parsed = argsToAction(args, thinking);
|
|
43
|
+
if (parsed)
|
|
44
|
+
return parsed;
|
|
14
45
|
}
|
|
15
|
-
|
|
16
|
-
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
function jsonObjectCandidates(raw) {
|
|
49
|
+
const candidates = [raw];
|
|
50
|
+
let depth = 0;
|
|
51
|
+
let start = -1;
|
|
52
|
+
let inString = false;
|
|
53
|
+
let escaped = false;
|
|
54
|
+
for (let i = 0; i < raw.length; i += 1) {
|
|
55
|
+
const char = raw[i];
|
|
56
|
+
if (inString) {
|
|
57
|
+
if (escaped)
|
|
58
|
+
escaped = false;
|
|
59
|
+
else if (char === "\\")
|
|
60
|
+
escaped = true;
|
|
61
|
+
else if (char === '"')
|
|
62
|
+
inString = false;
|
|
63
|
+
continue;
|
|
64
|
+
}
|
|
65
|
+
if (char === '"')
|
|
66
|
+
inString = true;
|
|
67
|
+
else if (char === "{") {
|
|
68
|
+
if (depth === 0)
|
|
69
|
+
start = i;
|
|
70
|
+
depth += 1;
|
|
71
|
+
}
|
|
72
|
+
else if (char === "}" && depth > 0) {
|
|
73
|
+
depth -= 1;
|
|
74
|
+
if (depth === 0 && start >= 0)
|
|
75
|
+
candidates.push(raw.slice(start, i + 1));
|
|
76
|
+
}
|
|
17
77
|
}
|
|
18
|
-
|
|
19
|
-
? data.arguments
|
|
20
|
-
: data;
|
|
21
|
-
if (!args || typeof args !== "object")
|
|
22
|
-
return null;
|
|
23
|
-
return argsToAction(args, thinking);
|
|
78
|
+
return [...new Set(candidates)];
|
|
24
79
|
}
|
|
25
80
|
export function argsToAction(args, thinking) {
|
|
26
|
-
|
|
81
|
+
if (typeof args.action !== "string" || !args.action.trim())
|
|
82
|
+
return null;
|
|
83
|
+
const rawAction = args.action.trim().toLowerCase();
|
|
84
|
+
const action = ACTION_ALIASES[rawAction] ?? rawAction;
|
|
27
85
|
const coord = args.coordinate;
|
|
28
86
|
// GUI-Owl / GUI-Plus uses `coordinate2` for swipe endpoint;
|
|
29
87
|
// older adapters used `end_coordinate`.
|
|
@@ -32,12 +90,13 @@ export function argsToAction(args, thinking) {
|
|
|
32
90
|
const FINISH_ACTIONS = new Set(["terminate", "answer", "finish", "finished"]);
|
|
33
91
|
if (FINISH_ACTIONS.has(action)) {
|
|
34
92
|
const msg = String(args.text ?? args.message ?? args.content ?? args.status ?? "completed");
|
|
35
|
-
|
|
93
|
+
const failed = action === "terminate" && String(args.status ?? "").toLowerCase() === "failure";
|
|
94
|
+
return done(failed ? "fail" : "finish", { message: msg }, thinking, true, msg);
|
|
36
95
|
}
|
|
37
96
|
if ((action === "tap" || action === "click") && coord) {
|
|
38
97
|
return done("tap", { x: coord[0], y: coord[1] }, thinking);
|
|
39
98
|
}
|
|
40
|
-
if (
|
|
99
|
+
if (action === "double_tap" && coord) {
|
|
41
100
|
return done("double_tap", { x: coord[0], y: coord[1] }, thinking);
|
|
42
101
|
}
|
|
43
102
|
if (action === "long_press" && coord) {
|
|
@@ -67,6 +126,18 @@ export function argsToAction(args, thinking) {
|
|
|
67
126
|
return done("swipe", { start_x: sc[0], start_y: sc[1], end_x: ec[0], end_y: ec[1] }, thinking);
|
|
68
127
|
}
|
|
69
128
|
}
|
|
129
|
+
if (action === "scroll") {
|
|
130
|
+
const point = coord ?? [500, 500];
|
|
131
|
+
const direction = String(args.direction ?? "down");
|
|
132
|
+
if (!["up", "down", "left", "right"].includes(direction))
|
|
133
|
+
return null;
|
|
134
|
+
return done("scroll", {
|
|
135
|
+
x: point[0],
|
|
136
|
+
y: point[1],
|
|
137
|
+
direction,
|
|
138
|
+
amount: Number(args.amount ?? 1),
|
|
139
|
+
}, thinking);
|
|
140
|
+
}
|
|
70
141
|
if (action === "type") {
|
|
71
142
|
return done("type", { text: String(args.text ?? "") }, thinking);
|
|
72
143
|
}
|
|
@@ -89,7 +160,10 @@ export function argsToAction(args, thinking) {
|
|
|
89
160
|
return done("press_key", { key: "KEYCODE_ENTER" }, thinking);
|
|
90
161
|
if (btn === "MENU")
|
|
91
162
|
return done("press_key", { key: "KEYCODE_MENU" }, thinking);
|
|
92
|
-
return
|
|
163
|
+
return null;
|
|
164
|
+
}
|
|
165
|
+
if (action === "enter") {
|
|
166
|
+
return done("press_key", { key: "KEYCODE_ENTER" }, thinking);
|
|
93
167
|
}
|
|
94
168
|
if (action === "key") {
|
|
95
169
|
// ADB keyevent syntax (e.g. "volume_up" → KEYCODE_VOLUME_UP)
|
|
@@ -104,7 +178,7 @@ export function argsToAction(args, thinking) {
|
|
|
104
178
|
const time = Number(args.time ?? args.duration_seconds ?? 2);
|
|
105
179
|
return done("wait", { duration_seconds: time }, thinking);
|
|
106
180
|
}
|
|
107
|
-
return
|
|
181
|
+
return null;
|
|
108
182
|
}
|
|
109
183
|
function done(actionType, params, thinking, shouldFinish = false, finishMessage = null) {
|
|
110
184
|
return { actionType, params, thinking, coordSystem: "0-1000", shouldFinish, finishMessage };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-call.js","sourceRoot":"","sources":["../../../../../src/agent-runtime/models/vlm/shared/tool-call.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"tool-call.js","sourceRoot":"","sources":["../../../../../src/agent-runtime/models/vlm/shared/tool-call.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
2
|
+
* DefaultAgentCore — wraps AgentRunner behind IAgentCore.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* The sole production agent core. Product execution modes select ReAct or
|
|
5
|
+
* Plan-Act per task; startup flags do not select a second architecture.
|
|
6
|
+
* Implements the IAgentCore port so
|
|
6
7
|
* SessionManager / AgentHost keep working without protocol changes.
|
|
7
8
|
*
|
|
8
9
|
* Translation contract (IAgentCore → AgentRunner):
|
|
@@ -15,24 +16,33 @@
|
|
|
15
16
|
* - `opts.onStep` → mapped onto the legacy `VlmStep` shape
|
|
16
17
|
*/
|
|
17
18
|
import type { AgentCoreRunOptions, AgentCoreRunResult, IAgentCore } from "../../../ports/agent-core.js";
|
|
18
|
-
import { type
|
|
19
|
+
import { type ReflectorPolicy } from "../../index.js";
|
|
19
20
|
import type { IModelAdapter } from "../../adapters/base.js";
|
|
20
21
|
import type { ObservationMode } from "../../observation-mode.js";
|
|
21
22
|
import type { IPlanner } from "./planner/base.js";
|
|
22
23
|
import type { IMcpRuntime } from "../../../mcp-client/runtime.js";
|
|
23
24
|
import type { Observation } from "@beeos-ai/device-common";
|
|
25
|
+
import type { ISubgoalVerifier } from "../../advanced/subgoal-verifier.js";
|
|
24
26
|
export interface AgentRunnerCoreOptions {
|
|
25
27
|
mcpProvider: () => IMcpRuntime;
|
|
26
28
|
/** Already-built adapter (typically `OpenAIAdapter` wrapping AutoGLMPhone). */
|
|
27
29
|
adapter: IModelAdapter;
|
|
30
|
+
/** Resolves model overrides using runtime-owned endpoint credentials. */
|
|
31
|
+
modelResolver?: {
|
|
32
|
+
resolve(modelName?: string): IModelAdapter;
|
|
33
|
+
};
|
|
28
34
|
/** Text adapter used only for explicit XML observation turns. */
|
|
29
35
|
xmlAdapter?: IModelAdapter;
|
|
30
36
|
/** Optional planner. When omitted the runner is pure ReAct. */
|
|
31
37
|
planner?: IPlanner;
|
|
32
38
|
/** Planner paired with `xmlAdapter`; defaults to `planner` when omitted. */
|
|
33
39
|
xmlPlanner?: IPlanner;
|
|
34
|
-
/**
|
|
35
|
-
|
|
40
|
+
/** Strategy model reserved for Advanced mode; defaults to the normal planner. */
|
|
41
|
+
advancedPlanner?: IPlanner;
|
|
42
|
+
/** Model used by Advanced trajectory reflection for visual turns. */
|
|
43
|
+
advancedReflectorModelName?: string;
|
|
44
|
+
/** Model used by Advanced trajectory reflection for XML turns. */
|
|
45
|
+
advancedXmlReflectorModelName?: string;
|
|
36
46
|
/** Default observation env. Defaults to `"mobile"`. */
|
|
37
47
|
env?: Observation["env"];
|
|
38
48
|
/** Observation source policy. Defaults to the active model adapter profile. */
|
|
@@ -45,21 +55,23 @@ export interface AgentRunnerCoreOptions {
|
|
|
45
55
|
providerTag?: string;
|
|
46
56
|
/**
|
|
47
57
|
* Reflector policy threaded into every per-task {@link AgentRunner}. When
|
|
48
|
-
* omitted the runner falls back to {@link buildReflectorPolicyFromEnv}
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
* should pass a policy with those injected so the reflector reuses the same
|
|
52
|
-
* endpoint instead of 401-ing against api.openai.com.
|
|
58
|
+
* omitted the runner falls back to {@link buildReflectorPolicyFromEnv}.
|
|
59
|
+
* Callers that have planner/VLM credentials should inject them so an
|
|
60
|
+
* explicitly enabled reflector reuses the configured endpoint.
|
|
53
61
|
*/
|
|
54
62
|
reflectorPolicy?: ReflectorPolicy;
|
|
63
|
+
/** Independent post-subgoal verifier, used only by Advanced mode. */
|
|
64
|
+
advancedVerifier?: ISubgoalVerifier;
|
|
55
65
|
}
|
|
56
66
|
export declare class AgentRunnerCore implements IAgentCore {
|
|
57
67
|
private readonly opts;
|
|
58
|
-
private
|
|
59
|
-
private
|
|
68
|
+
private readonly defaultModel;
|
|
69
|
+
private readonly defaultProvider;
|
|
70
|
+
private advancedSkillStore?;
|
|
60
71
|
constructor(opts: AgentRunnerCoreOptions);
|
|
61
72
|
get modelName(): string;
|
|
62
73
|
get providerName(): string | undefined;
|
|
63
74
|
run(opts: AgentCoreRunOptions): Promise<AgentCoreRunResult>;
|
|
64
75
|
setModel(provider: string, model: string): Promise<void>;
|
|
76
|
+
private getAdvancedSkillStore;
|
|
65
77
|
}
|