@beeos-ai/device-agent 0.9.5 → 0.9.8
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/config/schema.js +14 -6
- package/dist/config/schema.js.map +1 -1
- package/dist/inbound/cli/main.js +2 -2
- package/dist/inbound/cli/run-command.js +13 -1
- package/dist/inbound/cli/run-command.js.map +1 -1
- package/dist/messaging/token-provider.d.ts +15 -14
- package/dist/messaging/token-provider.js +16 -16
- package/dist/messaging/token-provider.js.map +1 -1
- package/dist/model/adapters/guiowl.js +3 -2
- package/dist/model/adapters/guiowl.js.map +1 -1
- package/dist/model/adapters/maiui.js +80 -53
- package/dist/model/adapters/maiui.js.map +1 -1
- package/dist/model/adapters/qwenvl.js +147 -51
- package/dist/model/adapters/qwenvl.js.map +1 -1
- package/dist/model/adapters/tool-call.js +13 -3
- package/dist/model/adapters/tool-call.js.map +1 -1
- package/dist/model/adapters/uitars.js +80 -84
- package/dist/model/adapters/uitars.js.map +1 -1
- package/dist/plugins/message-bus/busy-reply.d.ts +5 -5
- package/dist/plugins/message-bus/busy-reply.js +30 -9
- package/dist/plugins/message-bus/busy-reply.js.map +1 -1
- package/dist/plugins/message-bus/cancel.d.ts +5 -11
- package/dist/plugins/message-bus/cancel.js +8 -14
- package/dist/plugins/message-bus/cancel.js.map +1 -1
- package/dist/plugins/message-bus/inbound.d.ts +18 -25
- package/dist/plugins/message-bus/inbound.js +23 -55
- package/dist/plugins/message-bus/inbound.js.map +1 -1
- package/dist/plugins/message-bus/index.d.ts +25 -44
- package/dist/plugins/message-bus/index.js +81 -111
- package/dist/plugins/message-bus/index.js.map +1 -1
- package/dist/plugins/message-bus/ms-channel-notifier.d.ts +24 -37
- package/dist/plugins/message-bus/ms-channel-notifier.js +39 -59
- package/dist/plugins/message-bus/ms-channel-notifier.js.map +1 -1
- package/dist/resources/parsers.js +17 -0
- package/dist/resources/parsers.js.map +1 -1
- package/package.json +2 -2
package/dist/config/schema.js
CHANGED
|
@@ -357,14 +357,22 @@ export const Config = z
|
|
|
357
357
|
* (`ch:{channelId}`) with `in_reply_to` set to the request's
|
|
358
358
|
* `message_id`, so callers' `/wait` long-polls match.
|
|
359
359
|
*
|
|
360
|
-
*
|
|
361
|
-
*
|
|
362
|
-
*
|
|
363
|
-
*
|
|
360
|
+
* Enabled by default since v0.9.7 — this is the only path that
|
|
361
|
+
* delivers A2A / MCP / OpenAPI `chat_message` invocations to the
|
|
362
|
+
* device, so leaving it off causes silent `invocation timeout`
|
|
363
|
+
* errors on the caller side. Opt out with
|
|
364
|
+
* `BEEOS_MESSAGE_BUS_ENABLED=false` or `--no-message-bus`.
|
|
365
|
+
*
|
|
366
|
+
* Conditional activation: even when `enabled: true`, the plugin
|
|
367
|
+
* only actually connects when the agent has BOTH an Ed25519
|
|
368
|
+
* identity (`--key` / `BEEOS_KEY_FILE`) and an `agentGatewayUrl`.
|
|
369
|
+
* Missing either, it logs a single warning and stays dormant —
|
|
370
|
+
* Bridge ACP and HTTP debug keep running so legacy / dev setups
|
|
371
|
+
* without an agent-gateway are unaffected.
|
|
364
372
|
*/
|
|
365
373
|
messageBus: z
|
|
366
374
|
.object({
|
|
367
|
-
enabled: z.boolean().default(
|
|
375
|
+
enabled: z.boolean().default(true),
|
|
368
376
|
/**
|
|
369
377
|
* Optional Centrifugo WebSocket URL override. Empty (default) →
|
|
370
378
|
* the plugin uses whatever URL the gateway returns in the
|
|
@@ -408,7 +416,7 @@ export const Config = z
|
|
|
408
416
|
sessionTtlHours: z.coerce.number().int().nonnegative().default(24),
|
|
409
417
|
})
|
|
410
418
|
.default({
|
|
411
|
-
enabled:
|
|
419
|
+
enabled: true,
|
|
412
420
|
centrifugoUrl: "",
|
|
413
421
|
principalIdOverride: "",
|
|
414
422
|
historyEnabled: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/inbound/cli/main.js
CHANGED
|
@@ -309,8 +309,8 @@ Options:
|
|
|
309
309
|
--http-host <host> HTTP host (default: 127.0.0.1 — local only)
|
|
310
310
|
--http-port <port> HTTP port (default: 9090)
|
|
311
311
|
--http-cors-origins <list> Comma-separated allowed CORS origins (or '*')
|
|
312
|
-
--message-bus Enable BeeOS Message Service plugin (
|
|
313
|
-
--no-message-bus Force-disable the Message Service plugin (overrides BEEOS_MESSAGE_BUS_ENABLED)
|
|
312
|
+
--message-bus Enable BeeOS Message Service plugin (DEFAULT since v0.9.7; redundant unless overriding env to off)
|
|
313
|
+
--no-message-bus Force-disable the Message Service plugin (overrides BEEOS_MESSAGE_BUS_ENABLED=true)
|
|
314
314
|
--centrifugo-url <url> Override Centrifugo WebSocket URL (defaults to gateway-issued)
|
|
315
315
|
--log-level <lvl> Log level (default: info)
|
|
316
316
|
--config <path> Config file path (default: ~/.beeos/config.json)
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
import { McpClient, resolveDefaultMcpUrl } from "../../mcp-client/client.js";
|
|
23
23
|
import { FleetStatusClient, FleetClientError } from "../../fleet/http/status-client.js";
|
|
24
24
|
import { OpenAIClient } from "../../model/client.js";
|
|
25
|
-
import { AgentRunner, LLMPlanner, OpenAIAdapter, } from "../../agent-runtime/index.js";
|
|
25
|
+
import { AgentRunner, LLMPlanner, OpenAIAdapter, buildReflectorPolicyFromEnv, } from "../../agent-runtime/index.js";
|
|
26
26
|
/** Side-effect: registers the `autoglm` ModelAdapter (and friends). */
|
|
27
27
|
import "../../model/adapters/autoglm.js";
|
|
28
28
|
const DEFAULT_BASE_URL = "https://autoglm-mobile-9b.arouter.ai/v1";
|
|
@@ -301,6 +301,17 @@ export async function runCommand(argv, io = {}, deps = {}) {
|
|
|
301
301
|
emit({ event: "planner_ready", plannerModel, plannerName: planner.name });
|
|
302
302
|
}
|
|
303
303
|
// ── Build runner ─────────────────────────────────────────────────────
|
|
304
|
+
// Reflector policy: start from env defaults, then inject planner credentials
|
|
305
|
+
// so the trajectory-reflector can reuse --planner-api-key / --planner-base-url
|
|
306
|
+
// instead of falling back to "EMPTY" when those flags are provided.
|
|
307
|
+
const reflectorPolicy = buildReflectorPolicyFromEnv();
|
|
308
|
+
if (plannerApiKey || plannerBaseUrl) {
|
|
309
|
+
reflectorPolicy.trajectoryReflectorOptions = {
|
|
310
|
+
...reflectorPolicy.trajectoryReflectorOptions,
|
|
311
|
+
...(plannerBaseUrl ? { baseUrl: plannerBaseUrl } : {}),
|
|
312
|
+
...(plannerApiKey ? { apiKey: plannerApiKey } : {}),
|
|
313
|
+
};
|
|
314
|
+
}
|
|
304
315
|
const runnerCtor = deps.runnerFactory ?? ((opts) => new AgentRunner(opts));
|
|
305
316
|
const runner = runnerCtor({
|
|
306
317
|
task: flags.task,
|
|
@@ -311,6 +322,7 @@ export async function runCommand(argv, io = {}, deps = {}) {
|
|
|
311
322
|
mode: planMode,
|
|
312
323
|
maxSteps,
|
|
313
324
|
timeoutMs,
|
|
325
|
+
reflectorPolicy,
|
|
314
326
|
hooks: {
|
|
315
327
|
onStep: (step) => {
|
|
316
328
|
emit({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../src/inbound/cli/run-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../src/inbound/cli/run-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Bridges device-agent's `IDeviceIdentity` (which exposes a `KeyPair`
|
|
5
5
|
* with raw 32-byte private/public Ed25519 keys) to the
|
|
6
|
-
* `
|
|
7
|
-
* `
|
|
6
|
+
* `Identity` interface consumed by `@beeos-ai/message-sdk`'s
|
|
7
|
+
* `createTokenProvider`.
|
|
8
8
|
*
|
|
9
9
|
* The actual Ed25519 signing reuses the same `sign()` helper from
|
|
10
10
|
* `@beeos-ai/bridge-client` that powers `agent-gateway-client.ts` —
|
|
@@ -12,7 +12,8 @@
|
|
|
12
12
|
* between the bridge handshake, file presign, and messaging-token
|
|
13
13
|
* endpoints.
|
|
14
14
|
*/
|
|
15
|
-
import { type
|
|
15
|
+
import { type Identity } from "@beeos-ai/message-sdk/auth";
|
|
16
|
+
import type { TokenProvider } from "@beeos-ai/message-sdk";
|
|
16
17
|
import type { KeyPair } from "../ports/identity.js";
|
|
17
18
|
export interface DeviceMessagingTokenProviderOptions {
|
|
18
19
|
/** Agent Gateway base URL (e.g. `https://agent-gw.beeos.ai`). */
|
|
@@ -22,22 +23,22 @@ export interface DeviceMessagingTokenProviderOptions {
|
|
|
22
23
|
fetchImpl?: typeof fetch;
|
|
23
24
|
}
|
|
24
25
|
/**
|
|
25
|
-
* Wrap a raw Ed25519 keypair into the `
|
|
26
|
-
*
|
|
26
|
+
* Wrap a raw Ed25519 keypair into the `Identity` shape expected by
|
|
27
|
+
* the shared `@beeos-ai/message-sdk/auth` token provider.
|
|
27
28
|
*
|
|
28
|
-
* Exported separately from `createDeviceMessagingTokenProvider` so
|
|
29
|
-
* tests can verify the produced signature with `crypto.verify`.
|
|
29
|
+
* Exported separately from `createDeviceMessagingTokenProvider` so
|
|
30
|
+
* unit tests can verify the produced signature with `crypto.verify`.
|
|
30
31
|
*/
|
|
31
|
-
export declare function
|
|
32
|
+
export declare function keypairToIdentity(keypair: KeyPair): Identity;
|
|
32
33
|
/**
|
|
33
|
-
* Build a ready-to-use `TokenProvider` for `
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
34
|
+
* Build a ready-to-use `TokenProvider` for `MessageClient`. The
|
|
35
|
+
* provider POSTs to `${agentGatewayUrl}/api/v1/messaging/token` with
|
|
36
|
+
* Ed25519 headers and returns the canonical token payload (token /
|
|
37
|
+
* centrifugoUrl / identityId / expiresAt).
|
|
37
38
|
*
|
|
38
39
|
* The Agent Gateway derives the principal from the request's Ed25519
|
|
39
|
-
* public key (pod-is-principal), so the `
|
|
40
|
+
* public key (pod-is-principal), so the `identityId` argument passed
|
|
40
41
|
* to the returned function is ignored on the wire — callers should
|
|
41
|
-
* still re-read `tok.
|
|
42
|
+
* still re-read `tok.identityId` after the first call.
|
|
42
43
|
*/
|
|
43
44
|
export declare function createDeviceMessagingTokenProvider(opts: DeviceMessagingTokenProviderOptions): TokenProvider;
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Bridges device-agent's `IDeviceIdentity` (which exposes a `KeyPair`
|
|
5
5
|
* with raw 32-byte private/public Ed25519 keys) to the
|
|
6
|
-
* `
|
|
7
|
-
* `
|
|
6
|
+
* `Identity` interface consumed by `@beeos-ai/message-sdk`'s
|
|
7
|
+
* `createTokenProvider`.
|
|
8
8
|
*
|
|
9
9
|
* The actual Ed25519 signing reuses the same `sign()` helper from
|
|
10
10
|
* `@beeos-ai/bridge-client` that powers `agent-gateway-client.ts` —
|
|
@@ -13,19 +13,19 @@
|
|
|
13
13
|
* endpoints.
|
|
14
14
|
*/
|
|
15
15
|
import * as crypto from "node:crypto";
|
|
16
|
-
import {
|
|
16
|
+
import { createTokenProvider, } from "@beeos-ai/message-sdk/auth";
|
|
17
17
|
// PKCS8 prefix that wraps a raw 32-byte Ed25519 seed so node:crypto's
|
|
18
18
|
// createPrivateKey can ingest it. Identical to the prefix used by
|
|
19
19
|
// @beeos-ai/bridge-client and beeos-claw's agent-auth.
|
|
20
20
|
const ED25519_PKCS8_PREFIX = Buffer.from("302e020100300506032b657004220420", "hex");
|
|
21
21
|
/**
|
|
22
|
-
* Wrap a raw Ed25519 keypair into the `
|
|
23
|
-
*
|
|
22
|
+
* Wrap a raw Ed25519 keypair into the `Identity` shape expected by
|
|
23
|
+
* the shared `@beeos-ai/message-sdk/auth` token provider.
|
|
24
24
|
*
|
|
25
|
-
* Exported separately from `createDeviceMessagingTokenProvider` so
|
|
26
|
-
* tests can verify the produced signature with `crypto.verify`.
|
|
25
|
+
* Exported separately from `createDeviceMessagingTokenProvider` so
|
|
26
|
+
* unit tests can verify the produced signature with `crypto.verify`.
|
|
27
27
|
*/
|
|
28
|
-
export function
|
|
28
|
+
export function keypairToIdentity(keypair) {
|
|
29
29
|
return {
|
|
30
30
|
publicKeyBase64: () => Buffer.from(keypair.publicKey).toString("base64"),
|
|
31
31
|
sign: (bytes) => {
|
|
@@ -45,20 +45,20 @@ export function keypairToMessagingIdentity(keypair) {
|
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
47
|
/**
|
|
48
|
-
* Build a ready-to-use `TokenProvider` for `
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
*
|
|
48
|
+
* Build a ready-to-use `TokenProvider` for `MessageClient`. The
|
|
49
|
+
* provider POSTs to `${agentGatewayUrl}/api/v1/messaging/token` with
|
|
50
|
+
* Ed25519 headers and returns the canonical token payload (token /
|
|
51
|
+
* centrifugoUrl / identityId / expiresAt).
|
|
52
52
|
*
|
|
53
53
|
* The Agent Gateway derives the principal from the request's Ed25519
|
|
54
|
-
* public key (pod-is-principal), so the `
|
|
54
|
+
* public key (pod-is-principal), so the `identityId` argument passed
|
|
55
55
|
* to the returned function is ignored on the wire — callers should
|
|
56
|
-
* still re-read `tok.
|
|
56
|
+
* still re-read `tok.identityId` after the first call.
|
|
57
57
|
*/
|
|
58
58
|
export function createDeviceMessagingTokenProvider(opts) {
|
|
59
|
-
return
|
|
59
|
+
return createTokenProvider({
|
|
60
60
|
agentGatewayUrl: opts.agentGatewayUrl,
|
|
61
|
-
identity:
|
|
61
|
+
identity: keypairToIdentity(opts.keypair),
|
|
62
62
|
fetchImpl: opts.fetchImpl,
|
|
63
63
|
});
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-provider.js","sourceRoot":"","sources":["../../src/messaging/token-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"token-provider.js","sourceRoot":"","sources":["../../src/messaging/token-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,OAAO,EACL,mBAAmB,GAEpB,MAAM,4BAA4B,CAAC;AAKpC,sEAAsE;AACtE,kEAAkE;AAClE,uDAAuD;AACvD,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CACtC,kCAAkC,EAClC,KAAK,CACN,CAAC;AAUF;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAgB;IAChD,OAAO;QACL,eAAe,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACxE,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACd,MAAM,OAAO,GACX,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,EAAE;gBAC9B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;oBACZ,oBAAoB;oBACpB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;iBAChC,CAAC;gBACJ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACtC,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC;gBACrC,GAAG,EAAE,OAAO;gBACZ,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;YACH,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QACvE,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kCAAkC,CAChD,IAAyC;IAEzC,OAAO,mBAAmB,CAAC;QACzB,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;QACzC,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -45,10 +45,11 @@ function buildToolSchema(w, h) {
|
|
|
45
45
|
"* `open`: Open an app on the device.\n" +
|
|
46
46
|
"* `wait`: Wait specified seconds for the change to happen.\n" +
|
|
47
47
|
"* `answer`: Terminate the current task and output the answer.\n" +
|
|
48
|
+
"* `interact`: Resolve the blocking window by interacting with the user.\n" +
|
|
48
49
|
"* `terminate`: Terminate the current task and report its completion status.",
|
|
49
50
|
enum: [
|
|
50
51
|
"key", "click", "long_press", "swipe", "type",
|
|
51
|
-
"system_button", "open", "wait", "answer", "terminate",
|
|
52
|
+
"system_button", "open", "wait", "answer", "interact", "terminate",
|
|
52
53
|
],
|
|
53
54
|
type: "string",
|
|
54
55
|
},
|
|
@@ -62,7 +63,7 @@ function buildToolSchema(w, h) {
|
|
|
62
63
|
type: "array",
|
|
63
64
|
},
|
|
64
65
|
text: {
|
|
65
|
-
description: "Required only by `action=key`, `action=type`, `action=open`, and `action=
|
|
66
|
+
description: "Required only by `action=key`, `action=type`, `action=open`, `action=answer`, and `action=interact`.",
|
|
66
67
|
type: "string",
|
|
67
68
|
},
|
|
68
69
|
time: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guiowl.js","sourceRoot":"","sources":["../../../src/model/adapters/guiowl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,gFAAgF;AAChF,6BAA6B;AAC7B,EAAE;AACF,yBAAyB;AACzB,sFAAsF;AACtF,uEAAuE;AACvE,EAAE;AACF,wDAAwD;AACxD,gFAAgF;AAChF,4GAA4G;AAC5G,6EAA6E;AAC7E,iFAAiF;AACjF,wFAAwF;AACxF,gFAAgF;AAEhF,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,QAAQ,GAAG,IAAI,CAAC;AAEtB,SAAS,eAAe,CAAC,CAAS,EAAE,CAAS;IAC3C,MAAM,MAAM,GAAG;QACb,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE;YACR,cAAc,EAAE,YAAY;YAC5B,IAAI,EAAE,YAAY;YAClB,WAAW,EACT,6EAA6E;gBAC7E,8DAA8D;gBAC9D,gEAAgE;gBAChE,iEAAiE;gBACjE,+FAA+F;gBAC/F,gCAAgC,CAAC,IAAI,CAAC,KAAK;gBAC3C,0EAA0E;gBAC1E,8EAA8E;YAChF,UAAU,EAAE;gBACV,UAAU,EAAE;oBACV,MAAM,EAAE;wBACN,WAAW,EACT,qDAAqD;4BACrD,sDAAsD;4BACtD,gDAAgD;4BAChD,2EAA2E;4BAC3E,oEAAoE;4BACpE,+FAA+F;4BAC/F,gHAAgH;4BAChH,oEAAoE;4BACpE,+CAA+C;4BAC/C,wCAAwC;4BACxC,8DAA8D;4BAC9D,iEAAiE;4BACjE,6EAA6E;wBAC/E,IAAI,EAAE;4BACJ,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM;4BAC7C,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"guiowl.js","sourceRoot":"","sources":["../../../src/model/adapters/guiowl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,75 +1,105 @@
|
|
|
1
1
|
import { ModelAdapter, registerAdapter } from "./base.js";
|
|
2
2
|
import { parseToolCall } from "./tool-call.js";
|
|
3
3
|
// MAIUI adapter
|
|
4
|
-
//
|
|
5
|
-
//
|
|
4
|
+
// Aligned with ClawGUI prompts_maiui.py (MAI_MOBILE_SYS_PROMPT_CN / MAI_MOBILE_SYS_PROMPT_EN)
|
|
5
|
+
//
|
|
6
|
+
// Message structure (mirrors ClawGUI exactly):
|
|
7
|
+
// First turn : [system(string), user([text:task]), user([image])]
|
|
8
|
+
// Subsequent : [...context, assistant(rawContent), user([image])]
|
|
9
|
+
// Max 3 images in context window (pruned in updateContext).
|
|
10
|
+
//
|
|
11
|
+
// Output format expected:
|
|
12
|
+
// <thinking>...</thinking>
|
|
13
|
+
// <tool_call>{"name": "mobile_use", "arguments": {...}}</tool_call>
|
|
6
14
|
const MAX_IMAGES = 3;
|
|
7
|
-
const
|
|
8
|
-
You are a mobile GUI automation agent. Analyze the screenshot and output the next action as a tool call.
|
|
15
|
+
const SYSTEM_PROMPT_CN = `你是一个 GUI 智能体。你将获得一个任务、你的动作历史以及截图。你需要执行下一个动作来完成任务。
|
|
9
16
|
|
|
17
|
+
## 输出格式
|
|
18
|
+
对于每个函数调用,在 <thinking> </thinking> 标签中返回思考过程,并在 <tool_call></tool_call> XML 标签中返回包含函数名和参数的 json 对象:
|
|
19
|
+
\`\`\`
|
|
20
|
+
<thinking>
|
|
21
|
+
...
|
|
22
|
+
</thinking>
|
|
10
23
|
<tool_call>
|
|
11
|
-
{"name": "mobile_use", "arguments":
|
|
24
|
+
{"name": "mobile_use", "arguments": <args-json-object>}
|
|
12
25
|
</tool_call>
|
|
26
|
+
\`\`\`
|
|
13
27
|
|
|
14
|
-
|
|
15
|
-
- {"action":"tap","coordinate":[x,y]}
|
|
16
|
-
- {"action":"double_tap","coordinate":[x,y]}
|
|
17
|
-
- {"action":"long_press","coordinate":[x,y]}
|
|
18
|
-
- {"action":"swipe","start_coordinate":[x,y],"end_coordinate":[x,y]}
|
|
19
|
-
- {"action":"type","text":"..."}
|
|
20
|
-
- {"action":"press_back"}
|
|
21
|
-
- {"action":"press_home"}
|
|
22
|
-
- {"action":"open_app","text":"App Name"}
|
|
23
|
-
- {"action":"wait"}
|
|
24
|
-
- {"action":"finish","text":"completion reason"}
|
|
28
|
+
## 动作空间
|
|
25
29
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
30
|
+
{"action": "click", "coordinate": [x, y]}
|
|
31
|
+
{"action": "long_press", "coordinate": [x, y]}
|
|
32
|
+
{"action": "type", "text": ""}
|
|
33
|
+
{"action": "swipe", "direction": "up 或 down 或 left 或 right", "coordinate": [x, y]} # "coordinate" 是可选的。如果要滑动特定 UI 元素,请使用 "coordinate"。
|
|
34
|
+
{"action": "open", "text": "app_name"}
|
|
35
|
+
{"action": "drag", "start_coordinate": [x1, y1], "end_coordinate": [x2, y2]}
|
|
36
|
+
{"action": "system_button", "button": "button_name"} # 选项: back, home, menu, enter
|
|
37
|
+
{"action": "wait"}
|
|
38
|
+
{"action": "terminate", "status": "success 或 fail"}
|
|
39
|
+
{"action": "answer", "text": "xxx"} # 在 text 部分使用转义字符 \\'、\\" 和 \\n 以确保我们可以按正常 python 字符串格式解析内容。
|
|
29
40
|
|
|
41
|
+
## 注意事项
|
|
42
|
+
- 写一个小计划,然后在 <thinking></thinking> 部分用一句话总结你的下一个动作(及其目标元素)。
|
|
43
|
+
- 你可以使用 \`open\` 动作直接打开应用,这是打开应用最快的方式。
|
|
44
|
+
- 你必须严格遵循动作空间,并在 <thinking> </thinking> 和 <tool_call></tool_call> XML 标签中返回正确的 json 对象。
|
|
45
|
+
`;
|
|
46
|
+
const SYSTEM_PROMPT_EN = `You are a GUI agent. You are given a task and your action history, with screenshots. You need to perform the next action to complete the task.
|
|
47
|
+
|
|
48
|
+
## Output Format
|
|
49
|
+
For each function call, return the thinking process in <thinking> </thinking> tags, and a json object with function name and arguments within <tool_call></tool_call> XML tags:
|
|
50
|
+
\`\`\`
|
|
51
|
+
<thinking>
|
|
52
|
+
...
|
|
53
|
+
</thinking>
|
|
30
54
|
<tool_call>
|
|
31
|
-
{"name": "mobile_use", "arguments":
|
|
55
|
+
{"name": "mobile_use", "arguments": <args-json-object>}
|
|
32
56
|
</tool_call>
|
|
57
|
+
\`\`\`
|
|
58
|
+
|
|
59
|
+
## Action Space
|
|
60
|
+
|
|
61
|
+
{"action": "click", "coordinate": [x, y]}
|
|
62
|
+
{"action": "long_press", "coordinate": [x, y]}
|
|
63
|
+
{"action": "type", "text": ""}
|
|
64
|
+
{"action": "swipe", "direction": "up or down or left or right", "coordinate": [x, y]} # "coordinate" is optional. Use the "coordinate" if you want to swipe a specific UI element.
|
|
65
|
+
{"action": "open", "text": "app_name"}
|
|
66
|
+
{"action": "drag", "start_coordinate": [x1, y1], "end_coordinate": [x2, y2]}
|
|
67
|
+
{"action": "system_button", "button": "button_name"} # Options: back, home, menu, enter
|
|
68
|
+
{"action": "wait"}
|
|
69
|
+
{"action": "terminate", "status": "success or fail"}
|
|
70
|
+
{"action": "answer", "text": "xxx"} # Use escape characters \\'、\\" and \\n in text part to ensure we can parse the text in normal python string format.
|
|
33
71
|
|
|
34
|
-
动作及参数:
|
|
35
|
-
- {"action":"tap","coordinate":[x,y]}
|
|
36
|
-
- {"action":"double_tap","coordinate":[x,y]}
|
|
37
|
-
- {"action":"long_press","coordinate":[x,y]}
|
|
38
|
-
- {"action":"swipe","start_coordinate":[x,y],"end_coordinate":[x,y]}
|
|
39
|
-
- {"action":"type","text":"..."}
|
|
40
|
-
- {"action":"press_back"}
|
|
41
|
-
- {"action":"press_home"}
|
|
42
|
-
- {"action":"open_app","text":"App名称"}
|
|
43
|
-
- {"action":"wait"}
|
|
44
|
-
- {"action":"finish","text":"完成原因"}
|
|
45
72
|
|
|
46
|
-
|
|
73
|
+
## Note
|
|
74
|
+
- Write a small plan and finally summarize your next action (with its target element) in one sentence in <thinking></thinking> part.
|
|
75
|
+
- You can use the \`open\` action to open the app directly, because it is the fastest way to open the app.
|
|
76
|
+
- You must follow the Action Space strictly, and return the correct json object within <thinking> </thinking> and <tool_call></tool_call> XML tags.
|
|
77
|
+
`;
|
|
47
78
|
class MAIUIAdapter extends ModelAdapter {
|
|
48
79
|
name = "maiui";
|
|
49
80
|
patterns = [/maiui/, /mai[-_]?ui/, /mai_ui/];
|
|
50
81
|
buildMessages(task, screenInfo, context, isFirst, lang) {
|
|
51
82
|
const systemPrompt = lang === "cn" ? SYSTEM_PROMPT_CN : SYSTEM_PROMPT_EN;
|
|
52
|
-
const msgs = [{ role: "system", content: systemPrompt }];
|
|
53
83
|
if (isFirst) {
|
|
54
|
-
|
|
84
|
+
// First turn: [system(string), user([text:task]), user([image])]
|
|
85
|
+
const msgs = [
|
|
86
|
+
{ role: "system", content: systemPrompt },
|
|
87
|
+
{ role: "user", content: [{ type: "text", text: task }] },
|
|
88
|
+
];
|
|
55
89
|
if (screenInfo.imageRef) {
|
|
56
|
-
|
|
90
|
+
msgs.push({
|
|
91
|
+
role: "user",
|
|
92
|
+
content: [{ type: "image_url", image_url: { url: screenInfo.imageRef.url } }],
|
|
93
|
+
});
|
|
57
94
|
}
|
|
58
|
-
|
|
59
|
-
msgs.push({ role: "user", content });
|
|
95
|
+
return msgs;
|
|
60
96
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
const content = [];
|
|
66
|
-
if (screenInfo.imageRef) {
|
|
67
|
-
content.push({ type: "image_url", image_url: { url: screenInfo.imageRef.url } });
|
|
68
|
-
}
|
|
69
|
-
content.push({ type: "text", text: "Current screen. What is the next action?" });
|
|
70
|
-
msgs.push({ role: "user", content });
|
|
97
|
+
// Subsequent turns: [...accumulated context, user([image])]
|
|
98
|
+
const userContent = [];
|
|
99
|
+
if (screenInfo.imageRef) {
|
|
100
|
+
userContent.push({ type: "image_url", image_url: { url: screenInfo.imageRef.url } });
|
|
71
101
|
}
|
|
72
|
-
return
|
|
102
|
+
return [...context, { role: "user", content: userContent }];
|
|
73
103
|
}
|
|
74
104
|
parseResponse(raw) {
|
|
75
105
|
const thinking = extractThinking(raw);
|
|
@@ -77,9 +107,9 @@ class MAIUIAdapter extends ModelAdapter {
|
|
|
77
107
|
const toolBlock = cleaned.includes("<tool_call>") ? cleaned : `<tool_call>${cleaned}</tool_call>`;
|
|
78
108
|
return parseToolCall(toolBlock, thinking) ?? wait(thinking);
|
|
79
109
|
}
|
|
80
|
-
updateContext(context, response,
|
|
110
|
+
updateContext(context, response, _parsed) {
|
|
81
111
|
context.push({ role: "assistant", content: response.rawContent });
|
|
82
|
-
return context;
|
|
112
|
+
return pruneImages(context, MAX_IMAGES);
|
|
83
113
|
}
|
|
84
114
|
}
|
|
85
115
|
registerAdapter(new MAIUIAdapter());
|
|
@@ -89,9 +119,7 @@ function extractThinking(raw) {
|
|
|
89
119
|
return m ? m[1].trim() : "";
|
|
90
120
|
}
|
|
91
121
|
function pruneImages(context, keepCount) {
|
|
92
|
-
// Find all messages with images, remove oldest ones exceeding keepCount
|
|
93
122
|
let imageCount = 0;
|
|
94
|
-
// Count images from newest to oldest
|
|
95
123
|
for (let i = context.length - 1; i >= 0; i--) {
|
|
96
124
|
const msg = context[i];
|
|
97
125
|
if (Array.isArray(msg.content)) {
|
|
@@ -100,7 +128,6 @@ function pruneImages(context, keepCount) {
|
|
|
100
128
|
if (hasImage) {
|
|
101
129
|
imageCount++;
|
|
102
130
|
if (imageCount > keepCount) {
|
|
103
|
-
// Strip images from this message
|
|
104
131
|
context[i] = {
|
|
105
132
|
...msg,
|
|
106
133
|
content: parts.filter((p) => p.type !== "image_url"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maiui.js","sourceRoot":"","sources":["../../../src/model/adapters/maiui.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,gBAAgB;AAChB,
|
|
1
|
+
{"version":3,"file":"maiui.js","sourceRoot":"","sources":["../../../src/model/adapters/maiui.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,gBAAgB;AAChB,8FAA8F;AAC9F,EAAE;AACF,+CAA+C;AAC/C,qEAAqE;AACrE,qEAAqE;AACrE,8DAA8D;AAC9D,EAAE;AACF,0BAA0B;AAC1B,6BAA6B;AAC7B,sEAAsE;AAEtE,MAAM,UAAU,GAAG,CAAC,CAAC;AAErB,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BxB,CAAC;AAEF,MAAM,gBAAgB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BxB,CAAC;AAEF,MAAM,YAAa,SAAQ,YAAY;IAC5B,IAAI,GAAG,OAAO,CAAC;IACf,QAAQ,GAAG,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;IAEtD,aAAa,CACX,IAAY,EACZ,UAAsB,EACtB,OAAkB,EAClB,OAAgB,EAChB,IAAY;QAEZ,MAAM,YAAY,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAEzE,IAAI,OAAO,EAAE,CAAC;YACZ,iEAAiE;YACjE,MAAM,IAAI,GAAc;gBACtB,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE;gBACzC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE;aAC1D,CAAC;YACF,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC;iBAC9E,CAAC,CAAC;YACL,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,4DAA4D;QAC5D,MAAM,WAAW,GAAkD,EAAE,CAAC;QACtE,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;YACxB,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,CAAC,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CAAC,GAAW;QACvB,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,kCAAkC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3E,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,OAAO,cAAc,CAAC;QAClG,OAAO,aAAa,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9D,CAAC;IAED,aAAa,CAAC,OAAkB,EAAE,QAAuB,EAAE,OAAqB;QAC9E,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;QAClE,OAAO,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;CACF;AAED,eAAe,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;AAEpC,gFAAgF;AAEhF,SAAS,eAAe,CAAC,GAAW;IAClC,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACzD,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAC9B,CAAC;AAED,SAAS,WAAW,CAAC,OAAkB,EAAE,SAAiB;IACxD,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAkC,CAAC;YACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;YAC3D,IAAI,QAAQ,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC;gBACb,IAAI,UAAU,GAAG,SAAS,EAAE,CAAC;oBAC3B,OAAO,CAAC,CAAC,CAAC,GAAG;wBACX,GAAG,GAAG;wBACN,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC;qBACrD,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,IAAI,CAAC,QAAgB;IAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;AAC5I,CAAC"}
|