@beeos-ai/device-agent 0.12.7 → 0.13.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 +32 -16
- 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 +1 -0
- 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 +83 -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 +8 -1
- package/dist/agent-runtime/models/vlm/base.js +30 -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/maiui.js +4 -6
- package/dist/agent-runtime/models/vlm/maiui.js.map +1 -1
- 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 +1 -1
- package/dist/agent-runtime/models/vlm/shared/tool-call.js +66 -15
- 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/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 +30 -31
- package/dist/config/loader.js.map +1 -1
- package/dist/config/schema.d.ts +3 -27
- package/dist/config/schema.js +6 -41
- 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 +20 -5
- 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 +12 -8
- 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 +24 -28
- 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 +20 -19
- package/dist/inbound/cli/run-command.js +150 -155
- 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 +3 -1
- 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
|
@@ -9,25 +9,45 @@ export class ModelAdapter {
|
|
|
9
9
|
}
|
|
10
10
|
clearHistory() { }
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
export class ModelOutputInvalidError extends Error {
|
|
13
|
+
adapterName;
|
|
14
|
+
code = "MODEL_OUTPUT_INVALID";
|
|
15
|
+
constructor(adapterName, reason) {
|
|
16
|
+
super(`${adapterName} model output invalid: ${reason}`);
|
|
17
|
+
this.adapterName = adapterName;
|
|
18
|
+
this.name = "ModelOutputInvalidError";
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
export function invalidModelOutput(adapterName, reason) {
|
|
22
|
+
throw new ModelOutputInvalidError(adapterName, reason);
|
|
23
|
+
}
|
|
13
24
|
const registry = new Map();
|
|
14
|
-
export function registerAdapter(
|
|
15
|
-
|
|
25
|
+
export function registerAdapter(factory) {
|
|
26
|
+
const probe = factory();
|
|
27
|
+
registry.set(probe.name, {
|
|
28
|
+
patterns: [...probe.patterns],
|
|
29
|
+
factory,
|
|
30
|
+
});
|
|
16
31
|
}
|
|
17
32
|
export function detectAdapter(modelName) {
|
|
18
33
|
const lower = modelName.toLowerCase();
|
|
19
|
-
for (const
|
|
20
|
-
if (
|
|
21
|
-
return
|
|
34
|
+
for (const registration of registry.values()) {
|
|
35
|
+
if (registration.patterns.some((pattern) => pattern.test(lower))) {
|
|
36
|
+
return registration.factory();
|
|
37
|
+
}
|
|
22
38
|
}
|
|
23
39
|
// Unknown models use the generic screenshot + UI-hierarchy contract.
|
|
24
40
|
// Known mobile adapters keep their model-specific pure-vision prompts.
|
|
25
|
-
|
|
41
|
+
const fallback = registry.get("general") ?? [...registry.values()][0];
|
|
42
|
+
if (!fallback)
|
|
43
|
+
throw new Error("No model adapters registered");
|
|
44
|
+
return fallback.factory();
|
|
26
45
|
}
|
|
27
46
|
export function getAdapter(name) {
|
|
28
|
-
const
|
|
29
|
-
if (!
|
|
47
|
+
const registration = registry.get(name.toLowerCase());
|
|
48
|
+
if (!registration) {
|
|
30
49
|
throw new Error(`No adapter for "${name}". Available: ${[...registry.keys()].join(", ")}`);
|
|
31
|
-
|
|
50
|
+
}
|
|
51
|
+
return registration.factory();
|
|
32
52
|
}
|
|
33
53
|
//# sourceMappingURL=base.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/base.ts"],"names":[],"mappings":"AAIA,MAAM,OAAgB,YAAY;IAGvB,kBAAkB,GAAuB;QAChD,WAAW,EAAE,QAAQ;QACrB,cAAc,EAAE,CAAC,QAAQ,CAAC;KAC3B,CAAC;IAYF,aAAa,CAAC,OAAkB,EAAE,QAAuB,EAAE,MAAoB;QAC7E,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,YAAY,KAAU,CAAC;CACxB;AAED
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/base.ts"],"names":[],"mappings":"AAIA,MAAM,OAAgB,YAAY;IAGvB,kBAAkB,GAAuB;QAChD,WAAW,EAAE,QAAQ;QACrB,cAAc,EAAE,CAAC,QAAQ,CAAC;KAC3B,CAAC;IAYF,aAAa,CAAC,OAAkB,EAAE,QAAuB,EAAE,MAAoB;QAC7E,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAClE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,YAAY,KAAU,CAAC;CACxB;AAED,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAIrC;IAHF,IAAI,GAAG,sBAAsB,CAAC;IAEvC,YACW,WAAmB,EAC5B,MAAc;QAEd,KAAK,CAAC,GAAG,WAAW,0BAA0B,MAAM,EAAE,CAAC,CAAC;QAH/C,gBAAW,GAAX,WAAW,CAAQ;QAI5B,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAED,MAAM,UAAU,kBAAkB,CAAC,WAAmB,EAAE,MAAc;IACpE,MAAM,IAAI,uBAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACzD,CAAC;AAWD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA6B,CAAC;AAEtD,MAAM,UAAU,eAAe,CAAC,OAA4B;IAC1D,MAAM,KAAK,GAAG,OAAO,EAAE,CAAC;IACxB,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,QAAQ,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC;QAC7B,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,SAAiB;IAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACtC,KAAK,MAAM,YAAY,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;QAC7C,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACjE,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IACD,qEAAqE;IACrE,uEAAuE;IACvE,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,IAAI,CAAC,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC/D,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IACtD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,iBAAiB,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7F,CAAC;IACD,OAAO,YAAY,CAAC,OAAO,EAAE,CAAC;AAChC,CAAC"}
|
|
@@ -8,4 +8,10 @@
|
|
|
8
8
|
*
|
|
9
9
|
* Use via `--adapter general` or any model whose name contains "general".
|
|
10
10
|
*/
|
|
11
|
-
|
|
11
|
+
/**
|
|
12
|
+
* UIAutomator reports physical-pixel bounds, while GeneralAdapter actions use
|
|
13
|
+
* the model's 0-999 coordinate frame. Normalizing at the prompt boundary keeps
|
|
14
|
+
* XML-only models from copying physical coordinates that AgentLoop would then
|
|
15
|
+
* scale a second time.
|
|
16
|
+
*/
|
|
17
|
+
export declare function normalizeUiXmlBounds(xml: string, width: number, height: number): string;
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*
|
|
9
9
|
* Use via `--adapter general` or any model whose name contains "general".
|
|
10
10
|
*/
|
|
11
|
-
import { ModelAdapter, registerAdapter } from "./base.js";
|
|
11
|
+
import { invalidModelOutput, ModelAdapter, registerAdapter } from "./base.js";
|
|
12
12
|
// ── System prompt ────────────────────────────────────────────────────────────
|
|
13
13
|
function renderSystemPrompt() {
|
|
14
14
|
return `你是一个智能体分析专家,可以根据操作历史和当前状态图执行一系列操作来完成任务。
|
|
@@ -102,15 +102,16 @@ class GeneralAdapter extends ModelAdapter {
|
|
|
102
102
|
return context;
|
|
103
103
|
}
|
|
104
104
|
}
|
|
105
|
-
registerAdapter(new GeneralAdapter());
|
|
105
|
+
registerAdapter(() => new GeneralAdapter());
|
|
106
106
|
// ── Helpers ──────────────────────────────────────────────────────────────────
|
|
107
107
|
function buildUserMsg(task, screenInfo, lang, isFirst) {
|
|
108
108
|
const appInfo = JSON.stringify({ current_app: screenInfo.currentApp });
|
|
109
109
|
let text = isFirst ? `${task}\n\n${appInfo}` : `** Screen Info **\n\n${appInfo}`;
|
|
110
110
|
if (screenInfo.uiXml) {
|
|
111
|
+
const normalizedXml = normalizeUiXmlBounds(screenInfo.uiXml, screenInfo.width, screenInfo.height);
|
|
111
112
|
text += lang === "cn"
|
|
112
|
-
? `\n\n** UI 结构 (XML) **\n${
|
|
113
|
-
: `\n\n** UI Hierarchy (XML) **\n${
|
|
113
|
+
? `\n\n** UI 结构 (XML,bounds 已归一化到 0-999 坐标系) **\n${normalizedXml}`
|
|
114
|
+
: `\n\n** UI Hierarchy (XML; bounds normalized to 0-999 coordinates) **\n${normalizedXml}`;
|
|
114
115
|
}
|
|
115
116
|
const content = [];
|
|
116
117
|
if (screenInfo.imageRef) {
|
|
@@ -119,6 +120,23 @@ function buildUserMsg(task, screenInfo, lang, isFirst) {
|
|
|
119
120
|
content.push({ type: "text", text });
|
|
120
121
|
return { role: "user", content };
|
|
121
122
|
}
|
|
123
|
+
/**
|
|
124
|
+
* UIAutomator reports physical-pixel bounds, while GeneralAdapter actions use
|
|
125
|
+
* the model's 0-999 coordinate frame. Normalizing at the prompt boundary keeps
|
|
126
|
+
* XML-only models from copying physical coordinates that AgentLoop would then
|
|
127
|
+
* scale a second time.
|
|
128
|
+
*/
|
|
129
|
+
export function normalizeUiXmlBounds(xml, width, height) {
|
|
130
|
+
if (!(width > 0) || !(height > 0))
|
|
131
|
+
return xml;
|
|
132
|
+
const scale = (value, axisSize) => {
|
|
133
|
+
const numeric = Number(value);
|
|
134
|
+
if (!Number.isFinite(numeric))
|
|
135
|
+
return 0;
|
|
136
|
+
return Math.max(0, Math.min(999, Math.round((numeric / axisSize) * 999)));
|
|
137
|
+
};
|
|
138
|
+
return xml.replace(/bounds="\[(-?\d+),(-?\d+)\]\[(-?\d+),(-?\d+)\]"/g, (_match, x1, y1, x2, y2) => `bounds="[${scale(x1, width)},${scale(y1, height)}][${scale(x2, width)},${scale(y2, height)}]"`);
|
|
139
|
+
}
|
|
122
140
|
function splitThinkingAction(raw) {
|
|
123
141
|
// Preferred format: Thought: ...\nAnswer: ...
|
|
124
142
|
const answerIdx = raw.search(/^Action:/m);
|
|
@@ -153,12 +171,12 @@ function parseAction(actionStr, thinking) {
|
|
|
153
171
|
}
|
|
154
172
|
if (s.startsWith("do("))
|
|
155
173
|
return parseDoAction(s, thinking);
|
|
156
|
-
return
|
|
174
|
+
return invalidModelOutput("general", "expected finish(...) or do(...)");
|
|
157
175
|
}
|
|
158
176
|
function parseDoAction(s, thinking) {
|
|
159
177
|
const namePart = s.match(/do\(\s*action\s*=\s*"([^"]+)"/);
|
|
160
178
|
if (!namePart)
|
|
161
|
-
return
|
|
179
|
+
return invalidModelOutput("general", "do(...) is missing action name");
|
|
162
180
|
const rawName = namePart[1];
|
|
163
181
|
if (rawName === "Type" || rawName === "Type_Name") {
|
|
164
182
|
const textM = s.match(/text\s*=\s*(["'])([\s\S]*?)\1(?:\s*[,)])/);
|
|
@@ -185,6 +203,9 @@ function parseDoAction(s, thinking) {
|
|
|
185
203
|
const [ex, ey] = endM ? parseNums(endM[1]) : [500, 700];
|
|
186
204
|
return { actionType: "swipe", params: { start_x: sx, start_y: sy, end_x: ex, end_y: ey }, thinking, coordSystem: "0-1000", shouldFinish: false, finishMessage: null };
|
|
187
205
|
}
|
|
206
|
+
if (norm === "scroll") {
|
|
207
|
+
return parseScrollAction(s, thinking, "general");
|
|
208
|
+
}
|
|
188
209
|
if (norm === "open_app") {
|
|
189
210
|
const appM = s.match(/app\s*=\s*"([^"]+)"/);
|
|
190
211
|
return { actionType: "open_app", params: { app_name: appM?.[1] ?? "" }, thinking, coordSystem: "0-1000", shouldFinish: false, finishMessage: null };
|
|
@@ -202,7 +223,7 @@ function parseDoAction(s, thinking) {
|
|
|
202
223
|
if (norm === "press_back" || norm === "press_home") {
|
|
203
224
|
return { actionType: norm, params: {}, thinking, coordSystem: "0-1000", shouldFinish: false, finishMessage: null };
|
|
204
225
|
}
|
|
205
|
-
return
|
|
226
|
+
return invalidModelOutput("general", `unsupported or malformed action: ${rawName}`);
|
|
206
227
|
}
|
|
207
228
|
function normalizeAction(name) {
|
|
208
229
|
const MAP = {
|
|
@@ -222,8 +243,21 @@ function normalizeAction(name) {
|
|
|
222
243
|
function parseNums(s) {
|
|
223
244
|
return s.split(",").map((n) => parseFloat(n.trim())).filter((n) => !isNaN(n));
|
|
224
245
|
}
|
|
225
|
-
function
|
|
226
|
-
|
|
246
|
+
function parseScrollAction(s, thinking, adapterName) {
|
|
247
|
+
const direction = s.match(/direction\s*=\s*["'](up|down|left|right)["']/i)?.[1].toLowerCase();
|
|
248
|
+
if (!direction)
|
|
249
|
+
return invalidModelOutput(adapterName, "scroll is missing a valid direction");
|
|
250
|
+
const point = s.match(/(?:element|coordinate)\s*=\s*\[([^\]]+)\]/)?.[1];
|
|
251
|
+
const [x = 500, y = 500] = point ? parseNums(point) : [];
|
|
252
|
+
const amount = Number(s.match(/amount\s*=\s*([\d.]+)/)?.[1] ?? 1);
|
|
253
|
+
return {
|
|
254
|
+
actionType: "scroll",
|
|
255
|
+
params: { x, y, direction, amount },
|
|
256
|
+
thinking,
|
|
257
|
+
coordSystem: "0-1000",
|
|
258
|
+
shouldFinish: false,
|
|
259
|
+
finishMessage: null,
|
|
260
|
+
};
|
|
227
261
|
}
|
|
228
262
|
function toActionStr(parsed) {
|
|
229
263
|
const { actionType: t, params: p } = parsed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/general.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/general.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
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
4
4
|
// GUI-Owl / GUI-Plus adapter
|
|
@@ -206,7 +206,8 @@ class GUIOwlAdapter extends ModelAdapter {
|
|
|
206
206
|
// Extract the "Action: ..." line as thinking/description for history
|
|
207
207
|
const actionLineMatch = raw.match(/^\s*Action:\s*(.+?)$/m);
|
|
208
208
|
const description = actionLineMatch ? actionLineMatch[1].trim().replace(/^"|"$/g, "") : "";
|
|
209
|
-
const parsed = parseToolCall(raw, description)
|
|
209
|
+
const parsed = parseToolCall(raw, description)
|
|
210
|
+
?? invalidModelOutput(this.name, "expected a valid <tool_call> JSON action");
|
|
210
211
|
// Coordinates come back 0-999; handler treats "0-1000" the same bucket.
|
|
211
212
|
parsed.coordSystem = "0-1000";
|
|
212
213
|
return parsed;
|
|
@@ -224,17 +225,7 @@ class GUIOwlAdapter extends ModelAdapter {
|
|
|
224
225
|
this.actionHistory = [];
|
|
225
226
|
}
|
|
226
227
|
}
|
|
227
|
-
registerAdapter(new GUIOwlAdapter());
|
|
228
|
-
function fallbackWait(thinking) {
|
|
229
|
-
return {
|
|
230
|
-
actionType: "wait",
|
|
231
|
-
params: { duration_seconds: 2 },
|
|
232
|
-
thinking,
|
|
233
|
-
coordSystem: "0-1000",
|
|
234
|
-
shouldFinish: false,
|
|
235
|
-
finishMessage: null,
|
|
236
|
-
};
|
|
237
|
-
}
|
|
228
|
+
registerAdapter(() => new GUIOwlAdapter());
|
|
238
229
|
function actionSummary(parsed) {
|
|
239
230
|
const { actionType: t, params: p } = parsed;
|
|
240
231
|
if (t === "tap")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guiowl.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/guiowl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"guiowl.js","sourceRoot":"","sources":["../../../../src/agent-runtime/models/vlm/guiowl.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
|
// MAIUI adapter
|
|
4
4
|
// Aligned with ClawGUI prompts_maiui.py (MAI_MOBILE_SYS_PROMPT_CN / MAI_MOBILE_SYS_PROMPT_EN)
|
|
@@ -105,14 +105,15 @@ class MAIUIAdapter extends ModelAdapter {
|
|
|
105
105
|
const thinking = extractThinking(raw);
|
|
106
106
|
const cleaned = raw.replace(/<thinking>[\s\S]*?<\/thinking>/gi, "").trim();
|
|
107
107
|
const toolBlock = cleaned.includes("<tool_call>") ? cleaned : `<tool_call>${cleaned}</tool_call>`;
|
|
108
|
-
return parseToolCall(toolBlock, thinking)
|
|
108
|
+
return parseToolCall(toolBlock, thinking)
|
|
109
|
+
?? invalidModelOutput(this.name, "expected a valid <tool_call> JSON action");
|
|
109
110
|
}
|
|
110
111
|
updateContext(context, response, _parsed) {
|
|
111
112
|
context.push({ role: "assistant", content: response.rawContent });
|
|
112
113
|
return pruneImages(context, MAX_IMAGES);
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
|
-
registerAdapter(new MAIUIAdapter());
|
|
116
|
+
registerAdapter(() => new MAIUIAdapter());
|
|
116
117
|
// ── Helpers ──────────────────────────────────────────────────────────────────
|
|
117
118
|
function extractThinking(raw) {
|
|
118
119
|
const m = raw.match(/<thinking>([\s\S]*?)<\/thinking>/i);
|
|
@@ -138,7 +139,4 @@ function pruneImages(context, keepCount) {
|
|
|
138
139
|
}
|
|
139
140
|
return context;
|
|
140
141
|
}
|
|
141
|
-
function wait(thinking) {
|
|
142
|
-
return { actionType: "wait", params: { duration_seconds: 2 }, thinking, coordSystem: "0-1000", shouldFinish: false, finishMessage: null };
|
|
143
|
-
}
|
|
144
142
|
//# sourceMappingURL=maiui.js.map
|
|
@@ -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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"}
|
|
@@ -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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"}
|
|
@@ -3,4 +3,4 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import type { ParsedAction } from "../../../../types.js";
|
|
5
5
|
export declare function parseToolCall(block: string, thinking: string): ParsedAction | null;
|
|
6
|
-
export declare function argsToAction(args: Record<string, unknown>, thinking: string): ParsedAction;
|
|
6
|
+
export declare function argsToAction(args: Record<string, unknown>, thinking: string): ParsedAction | null;
|
|
@@ -8,22 +8,61 @@ export function parseToolCall(block, thinking) {
|
|
|
8
8
|
let raw = m[1].trim().replace(/\\n/g, "");
|
|
9
9
|
// Strip partial closing tag at end
|
|
10
10
|
raw = raw.replace(/<\/?tool_call[^>]*$/, "").trim();
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
11
|
+
for (const candidate of jsonObjectCandidates(raw)) {
|
|
12
|
+
let data;
|
|
13
|
+
try {
|
|
14
|
+
data = JSON.parse(candidate);
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
continue;
|
|
18
|
+
}
|
|
19
|
+
const args = (data && typeof data === "object" && "arguments" in data)
|
|
20
|
+
? data.arguments
|
|
21
|
+
: data;
|
|
22
|
+
if (!args || typeof args !== "object" || Array.isArray(args))
|
|
23
|
+
continue;
|
|
24
|
+
const parsed = argsToAction(args, thinking);
|
|
25
|
+
if (parsed)
|
|
26
|
+
return parsed;
|
|
27
|
+
}
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
function jsonObjectCandidates(raw) {
|
|
31
|
+
const candidates = [raw];
|
|
32
|
+
let depth = 0;
|
|
33
|
+
let start = -1;
|
|
34
|
+
let inString = false;
|
|
35
|
+
let escaped = false;
|
|
36
|
+
for (let i = 0; i < raw.length; i += 1) {
|
|
37
|
+
const char = raw[i];
|
|
38
|
+
if (inString) {
|
|
39
|
+
if (escaped)
|
|
40
|
+
escaped = false;
|
|
41
|
+
else if (char === "\\")
|
|
42
|
+
escaped = true;
|
|
43
|
+
else if (char === '"')
|
|
44
|
+
inString = false;
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
if (char === '"')
|
|
48
|
+
inString = true;
|
|
49
|
+
else if (char === "{") {
|
|
50
|
+
if (depth === 0)
|
|
51
|
+
start = i;
|
|
52
|
+
depth += 1;
|
|
53
|
+
}
|
|
54
|
+
else if (char === "}" && depth > 0) {
|
|
55
|
+
depth -= 1;
|
|
56
|
+
if (depth === 0 && start >= 0)
|
|
57
|
+
candidates.push(raw.slice(start, i + 1));
|
|
58
|
+
}
|
|
17
59
|
}
|
|
18
|
-
|
|
19
|
-
? data.arguments
|
|
20
|
-
: data;
|
|
21
|
-
if (!args || typeof args !== "object")
|
|
22
|
-
return null;
|
|
23
|
-
return argsToAction(args, thinking);
|
|
60
|
+
return [...new Set(candidates)];
|
|
24
61
|
}
|
|
25
62
|
export function argsToAction(args, thinking) {
|
|
26
|
-
|
|
63
|
+
if (typeof args.action !== "string" || !args.action.trim())
|
|
64
|
+
return null;
|
|
65
|
+
const action = args.action;
|
|
27
66
|
const coord = args.coordinate;
|
|
28
67
|
// GUI-Owl / GUI-Plus uses `coordinate2` for swipe endpoint;
|
|
29
68
|
// older adapters used `end_coordinate`.
|
|
@@ -67,6 +106,18 @@ export function argsToAction(args, thinking) {
|
|
|
67
106
|
return done("swipe", { start_x: sc[0], start_y: sc[1], end_x: ec[0], end_y: ec[1] }, thinking);
|
|
68
107
|
}
|
|
69
108
|
}
|
|
109
|
+
if (action === "scroll") {
|
|
110
|
+
const point = coord ?? [500, 500];
|
|
111
|
+
const direction = String(args.direction ?? "down");
|
|
112
|
+
if (!["up", "down", "left", "right"].includes(direction))
|
|
113
|
+
return null;
|
|
114
|
+
return done("scroll", {
|
|
115
|
+
x: point[0],
|
|
116
|
+
y: point[1],
|
|
117
|
+
direction,
|
|
118
|
+
amount: Number(args.amount ?? 1),
|
|
119
|
+
}, thinking);
|
|
120
|
+
}
|
|
70
121
|
if (action === "type") {
|
|
71
122
|
return done("type", { text: String(args.text ?? "") }, thinking);
|
|
72
123
|
}
|
|
@@ -89,7 +140,7 @@ export function argsToAction(args, thinking) {
|
|
|
89
140
|
return done("press_key", { key: "KEYCODE_ENTER" }, thinking);
|
|
90
141
|
if (btn === "MENU")
|
|
91
142
|
return done("press_key", { key: "KEYCODE_MENU" }, thinking);
|
|
92
|
-
return
|
|
143
|
+
return null;
|
|
93
144
|
}
|
|
94
145
|
if (action === "key") {
|
|
95
146
|
// ADB keyevent syntax (e.g. "volume_up" → KEYCODE_VOLUME_UP)
|
|
@@ -104,7 +155,7 @@ export function argsToAction(args, thinking) {
|
|
|
104
155
|
const time = Number(args.time ?? args.duration_seconds ?? 2);
|
|
105
156
|
return done("wait", { duration_seconds: time }, thinking);
|
|
106
157
|
}
|
|
107
|
-
return
|
|
158
|
+
return null;
|
|
108
159
|
}
|
|
109
160
|
function done(actionType, params, thinking, shouldFinish = false, finishMessage = null) {
|
|
110
161
|
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;AAIH,MAAM,UAAU,aAAa,CAAC,KAAa,EAAE,QAAgB;IAC3D,MAAM,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACrE,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAEpB,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1C,mCAAmC;IACnC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAEpD,IAAI,IAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-call.js","sourceRoot":"","sources":["../../../../../src/agent-runtime/models/vlm/shared/tool-call.ts"],"names":[],"mappings":"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"}
|