@beeos-ai/device-agent 0.13.0 → 0.14.1
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/openai.js +7 -1
- package/dist/agent-runtime/adapters/openai.js.map +1 -1
- package/dist/agent-runtime/core.js +23 -2
- package/dist/agent-runtime/core.js.map +1 -1
- package/dist/agent-runtime/models/client.js +7 -0
- package/dist/agent-runtime/models/client.js.map +1 -1
- package/dist/agent-runtime/models/vlm/base.d.ts +7 -0
- package/dist/agent-runtime/models/vlm/base.js +1 -0
- package/dist/agent-runtime/models/vlm/base.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/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/shared/tool-call.d.ts +5 -1
- package/dist/agent-runtime/models/vlm/shared/tool-call.js +30 -7
- package/dist/agent-runtime/models/vlm/shared/tool-call.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/config/loader.js +2 -3
- package/dist/config/loader.js.map +1 -1
- package/dist/config/schema.d.ts +2 -2
- package/dist/config/schema.js +2 -1
- package/dist/config/schema.js.map +1 -1
- package/dist/inbound/acp/handlers/session.js +4 -5
- package/dist/inbound/acp/handlers/session.js.map +1 -1
- package/dist/inbound/cli/fleet-command.js +26 -1
- package/dist/inbound/cli/fleet-command.js.map +1 -1
- package/dist/inbound/cli/main.js +25 -5
- package/dist/inbound/cli/main.js.map +1 -1
- package/dist/inbound/cli/run-command.d.ts +3 -1
- package/dist/inbound/cli/run-command.js +7 -4
- package/dist/inbound/cli/run-command.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/plugins/message-bus/inbound.js +4 -5
- package/dist/plugins/message-bus/inbound.js.map +1 -1
- package/package.json +2 -2
|
@@ -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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"}
|
|
@@ -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
|
|
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;
|
|
6
10
|
export declare function argsToAction(args: Record<string, unknown>, thinking: string): ParsedAction | null;
|
|
@@ -1,7 +1,17 @@
|
|
|
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;
|
|
@@ -16,11 +26,19 @@ export function parseToolCall(block, thinking) {
|
|
|
16
26
|
catch {
|
|
17
27
|
continue;
|
|
18
28
|
}
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
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;
|
|
22
35
|
if (!args || typeof args !== "object" || Array.isArray(args))
|
|
23
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
|
+
}
|
|
24
42
|
const parsed = argsToAction(args, thinking);
|
|
25
43
|
if (parsed)
|
|
26
44
|
return parsed;
|
|
@@ -62,7 +80,8 @@ function jsonObjectCandidates(raw) {
|
|
|
62
80
|
export function argsToAction(args, thinking) {
|
|
63
81
|
if (typeof args.action !== "string" || !args.action.trim())
|
|
64
82
|
return null;
|
|
65
|
-
const
|
|
83
|
+
const rawAction = args.action.trim().toLowerCase();
|
|
84
|
+
const action = ACTION_ALIASES[rawAction] ?? rawAction;
|
|
66
85
|
const coord = args.coordinate;
|
|
67
86
|
// GUI-Owl / GUI-Plus uses `coordinate2` for swipe endpoint;
|
|
68
87
|
// older adapters used `end_coordinate`.
|
|
@@ -71,12 +90,13 @@ export function argsToAction(args, thinking) {
|
|
|
71
90
|
const FINISH_ACTIONS = new Set(["terminate", "answer", "finish", "finished"]);
|
|
72
91
|
if (FINISH_ACTIONS.has(action)) {
|
|
73
92
|
const msg = String(args.text ?? args.message ?? args.content ?? args.status ?? "completed");
|
|
74
|
-
|
|
93
|
+
const failed = action === "terminate" && String(args.status ?? "").toLowerCase() === "failure";
|
|
94
|
+
return done(failed ? "fail" : "finish", { message: msg }, thinking, true, msg);
|
|
75
95
|
}
|
|
76
96
|
if ((action === "tap" || action === "click") && coord) {
|
|
77
97
|
return done("tap", { x: coord[0], y: coord[1] }, thinking);
|
|
78
98
|
}
|
|
79
|
-
if (
|
|
99
|
+
if (action === "double_tap" && coord) {
|
|
80
100
|
return done("double_tap", { x: coord[0], y: coord[1] }, thinking);
|
|
81
101
|
}
|
|
82
102
|
if (action === "long_press" && coord) {
|
|
@@ -142,6 +162,9 @@ export function argsToAction(args, thinking) {
|
|
|
142
162
|
return done("press_key", { key: "KEYCODE_MENU" }, thinking);
|
|
143
163
|
return null;
|
|
144
164
|
}
|
|
165
|
+
if (action === "enter") {
|
|
166
|
+
return done("press_key", { key: "KEYCODE_ENTER" }, thinking);
|
|
167
|
+
}
|
|
145
168
|
if (action === "key") {
|
|
146
169
|
// ADB keyevent syntax (e.g. "volume_up" → KEYCODE_VOLUME_UP)
|
|
147
170
|
const key = String(args.text ?? args.key ?? "").trim();
|
|
@@ -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,5 +1,7 @@
|
|
|
1
1
|
export declare const OBSERVATION_MODES: readonly ["auto", "vision", "xml", "hybrid"];
|
|
2
2
|
export type ObservationMode = (typeof OBSERVATION_MODES)[number];
|
|
3
|
+
/** Public and legacy wire spellings accepted at runtime boundaries. */
|
|
4
|
+
export type ObservationModeInput = ObservationMode | "structure" | "a11y";
|
|
3
5
|
export type EffectiveObservationMode = Exclude<ObservationMode, "auto">;
|
|
4
6
|
export interface ObservationProfile {
|
|
5
7
|
defaultMode: EffectiveObservationMode;
|
|
@@ -3,6 +3,8 @@ export function parseObservationMode(value) {
|
|
|
3
3
|
if (typeof value !== "string")
|
|
4
4
|
return undefined;
|
|
5
5
|
const normalized = value.trim().toLowerCase();
|
|
6
|
+
if (normalized === "structure" || normalized === "a11y")
|
|
7
|
+
return "xml";
|
|
6
8
|
return OBSERVATION_MODES.find((mode) => mode === normalized);
|
|
7
9
|
}
|
|
8
10
|
export function resolveObservationMode(requested, source) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observation-mode.js","sourceRoot":"","sources":["../../src/agent-runtime/observation-mode.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"observation-mode.js","sourceRoot":"","sources":["../../src/agent-runtime/observation-mode.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAU,CAAC;AAkB9E,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,IAAI,UAAU,KAAK,WAAW,IAAI,UAAU,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IACtE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,SAA0B,EAC1B,MAAgC;IAEhC,MAAM,aAAa,GAA6B,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC5F,MAAM,OAAO,GAAG,MAAM,CAAC,kBAAkB,IAAI;QAC3C,WAAW,EAAE,aAAa;QAC1B,cAAc,EAAE,CAAC,aAAa,CAAC;KAChC,CAAC;IACF,MAAM,QAAQ,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACb,qBAAqB,QAAQ,wDAAwD,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzH,CAAC;IACJ,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
package/dist/config/loader.js
CHANGED
|
@@ -17,6 +17,7 @@ import * as fs from "node:fs";
|
|
|
17
17
|
import * as os from "node:os";
|
|
18
18
|
import * as path from "node:path";
|
|
19
19
|
import { Config, VLM_DEFAULTS, } from "./schema.js";
|
|
20
|
+
import { parseObservationMode } from "../agent-runtime/observation-mode.js";
|
|
20
21
|
export function loadConfig(flags = {}, env = process.env, opts = {}) {
|
|
21
22
|
const warn = opts.warn ?? (() => undefined);
|
|
22
23
|
const fileLayer = readFileLayer(flags.configFile, env);
|
|
@@ -267,9 +268,7 @@ function castMode(v) {
|
|
|
267
268
|
return undefined;
|
|
268
269
|
}
|
|
269
270
|
function castObservationMode(v) {
|
|
270
|
-
|
|
271
|
-
return v;
|
|
272
|
-
return undefined;
|
|
271
|
+
return parseObservationMode(v);
|
|
273
272
|
}
|
|
274
273
|
function castVlmImageTransport(v) {
|
|
275
274
|
if (v === undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"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"}
|
package/dist/config/schema.d.ts
CHANGED
|
@@ -103,12 +103,12 @@ export declare const Config: z.ZodObject<{
|
|
|
103
103
|
model: z.ZodDefault<z.ZodString>;
|
|
104
104
|
provider: z.ZodDefault<z.ZodString>;
|
|
105
105
|
}, z.core.$loose>>;
|
|
106
|
-
observationMode: z.ZodDefault<z.ZodEnum<{
|
|
106
|
+
observationMode: z.ZodDefault<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodEnum<{
|
|
107
107
|
auto: "auto";
|
|
108
108
|
vision: "vision";
|
|
109
109
|
xml: "xml";
|
|
110
110
|
hybrid: "hybrid";
|
|
111
|
-
}
|
|
111
|
+
}>>>;
|
|
112
112
|
plannerModel: z.ZodDefault<z.ZodString>;
|
|
113
113
|
plannerBaseUrl: z.ZodDefault<z.ZodString>;
|
|
114
114
|
plannerApiKey: z.ZodDefault<z.ZodString>;
|
package/dist/config/schema.js
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*
|
|
12
12
|
*/
|
|
13
13
|
import { z } from "zod";
|
|
14
|
+
import { parseObservationMode } from "../agent-runtime/observation-mode.js";
|
|
14
15
|
export const RuntimeMode = z.enum(["android", "desktop"]);
|
|
15
16
|
/**
|
|
16
17
|
* Per-LLM section. `provider` selects the adapter family
|
|
@@ -125,7 +126,7 @@ export const Config = z
|
|
|
125
126
|
*/
|
|
126
127
|
vlm: LlmSection.default(vlmDefaults),
|
|
127
128
|
/** Inputs collected for each VLM step; `auto` follows the adapter profile. */
|
|
128
|
-
observationMode: z.enum(["auto", "vision", "xml", "hybrid"]).default("auto"),
|
|
129
|
+
observationMode: z.preprocess((value) => parseObservationMode(value) ?? value, z.enum(["auto", "vision", "xml", "hybrid"])).default("auto"),
|
|
129
130
|
/**
|
|
130
131
|
* Optional model name for the planner (chat-only LLM). Empty (default)
|
|
131
132
|
* → reuse `vlm.model`. Maps from `--planner-model`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Thin pass-through to `SessionManager`. Field names use camelCase to match
|
|
5
5
|
* the web SDK (`acp-client.ts`).
|
|
6
6
|
*/
|
|
7
|
+
import { parseObservationMode } from "../../../agent-runtime/observation-mode.js";
|
|
7
8
|
export class AcpSessionHandlers {
|
|
8
9
|
sessions;
|
|
9
10
|
constructor(sessions) {
|
|
@@ -83,14 +84,12 @@ export class AcpSessionHandlers {
|
|
|
83
84
|
}
|
|
84
85
|
export function parseTurnExecutionOptions(params) {
|
|
85
86
|
const observation = params.observationMode ?? params.observation_mode;
|
|
87
|
+
const normalizedObservation = parseObservationMode(observation);
|
|
86
88
|
const execution = params.executionMode ?? params.execution_mode;
|
|
87
89
|
const model = params.modelOverrideId ?? params.model_override_id ?? params.model;
|
|
88
90
|
return {
|
|
89
|
-
...(
|
|
90
|
-
|
|
91
|
-
observation === "xml" ||
|
|
92
|
-
observation === "hybrid"
|
|
93
|
-
? { observationMode: observation }
|
|
91
|
+
...(normalizedObservation
|
|
92
|
+
? { observationMode: normalizedObservation }
|
|
94
93
|
: {}),
|
|
95
94
|
...(execution === "fast" || execution === "reasoning" || execution === "advanced"
|
|
96
95
|
? { executionMode: execution }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/inbound/acp/handlers/session.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/inbound/acp/handlers/session.ts"],"names":[],"mappings":"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"}
|