@beeos-ai/device-agent 0.14.3 → 0.15.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/adapters/device-android-adb.js +2 -1
- package/dist/adapters/device-android-adb.js.map +1 -1
- package/dist/agent-runtime/action-guard.d.ts +20 -0
- package/dist/agent-runtime/action-guard.js +60 -0
- package/dist/agent-runtime/action-guard.js.map +1 -0
- package/dist/agent-runtime/adapters/base.d.ts +15 -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/general-flash.d.ts +6 -0
- package/dist/agent-runtime/adapters/general-flash.js +9 -0
- package/dist/agent-runtime/adapters/general-flash.js.map +1 -0
- package/dist/agent-runtime/adapters/index.d.ts +1 -0
- package/dist/agent-runtime/adapters/index.js +1 -0
- package/dist/agent-runtime/adapters/index.js.map +1 -1
- package/dist/agent-runtime/adapters/openai.d.ts +2 -1
- package/dist/agent-runtime/adapters/openai.js +7 -3
- package/dist/agent-runtime/adapters/openai.js.map +1 -1
- package/dist/agent-runtime/adapters/pro.d.ts +38 -0
- package/dist/agent-runtime/adapters/pro.js +253 -0
- package/dist/agent-runtime/adapters/pro.js.map +1 -0
- package/dist/agent-runtime/advanced/knowledge.js +3 -3
- package/dist/agent-runtime/advanced/knowledge.js.map +1 -1
- package/dist/agent-runtime/advanced/subgoal-verifier.d.ts +5 -1
- package/dist/agent-runtime/advanced/subgoal-verifier.js +79 -20
- package/dist/agent-runtime/advanced/subgoal-verifier.js.map +1 -1
- package/dist/agent-runtime/agent-runner.d.ts +2 -0
- package/dist/agent-runtime/agent-runner.js +3 -1
- package/dist/agent-runtime/agent-runner.js.map +1 -1
- package/dist/agent-runtime/core.d.ts +11 -1
- package/dist/agent-runtime/core.js +190 -8
- package/dist/agent-runtime/core.js.map +1 -1
- package/dist/agent-runtime/execution-mode.d.ts +9 -4
- package/dist/agent-runtime/execution-mode.js +18 -6
- package/dist/agent-runtime/execution-mode.js.map +1 -1
- package/dist/agent-runtime/index.d.ts +1 -1
- package/dist/agent-runtime/index.js +1 -1
- package/dist/agent-runtime/index.js.map +1 -1
- package/dist/agent-runtime/models/base.d.ts +13 -1
- package/dist/agent-runtime/models/client.d.ts +1 -0
- package/dist/agent-runtime/models/client.js +39 -3
- package/dist/agent-runtime/models/client.js.map +1 -1
- package/dist/agent-runtime/models/pro-fallback.d.ts +3 -0
- package/dist/agent-runtime/models/pro-fallback.js +31 -0
- package/dist/agent-runtime/models/pro-fallback.js.map +1 -0
- package/dist/agent-runtime/models/pro-policy.d.ts +4 -0
- package/dist/agent-runtime/models/pro-policy.js +20 -0
- package/dist/agent-runtime/models/pro-policy.js.map +1 -0
- package/dist/agent-runtime/models/runtime-registry.d.ts +2 -0
- package/dist/agent-runtime/models/runtime-registry.js +16 -6
- package/dist/agent-runtime/models/runtime-registry.js.map +1 -1
- package/dist/agent-runtime/modes/hybrid/index.d.ts +4 -0
- package/dist/agent-runtime/modes/hybrid/index.js +7 -4
- package/dist/agent-runtime/modes/hybrid/index.js.map +1 -1
- package/dist/agent-runtime/modes/hybrid/planner/llm-planner.d.ts +2 -0
- package/dist/agent-runtime/modes/hybrid/planner/llm-planner.js +16 -3
- package/dist/agent-runtime/modes/hybrid/planner/llm-planner.js.map +1 -1
- package/dist/agent-runtime/modes/hybrid/planner/prompts.js +15 -0
- package/dist/agent-runtime/modes/hybrid/planner/prompts.js.map +1 -1
- package/dist/agent-runtime/modes/orchestrator/index.d.ts +2 -2
- package/dist/agent-runtime/modes/orchestrator/index.js +1 -1
- package/dist/agent-runtime/ocr.d.ts +18 -0
- package/dist/agent-runtime/ocr.js +43 -0
- package/dist/agent-runtime/ocr.js.map +1 -0
- package/dist/agent-runtime/plan-executor.d.ts +5 -1
- package/dist/agent-runtime/plan-executor.js +122 -31
- package/dist/agent-runtime/plan-executor.js.map +1 -1
- package/dist/agent-runtime/pro-memory.d.ts +21 -0
- package/dist/agent-runtime/pro-memory.js +103 -0
- package/dist/agent-runtime/pro-memory.js.map +1 -0
- package/dist/agent-runtime/pro-operator.d.ts +3 -0
- package/dist/agent-runtime/pro-operator.js +40 -0
- package/dist/agent-runtime/pro-operator.js.map +1 -0
- package/dist/agent-runtime/pro-perception.d.ts +19 -0
- package/dist/agent-runtime/pro-perception.js +62 -0
- package/dist/agent-runtime/pro-perception.js.map +1 -0
- package/dist/agent-runtime/pro-target-check.d.ts +6 -0
- package/dist/agent-runtime/pro-target-check.js +108 -0
- package/dist/agent-runtime/pro-target-check.js.map +1 -0
- package/dist/app/agent-host.js +1 -3
- package/dist/app/agent-host.js.map +1 -1
- package/dist/app/session-manager.js +7 -3
- package/dist/app/session-manager.js.map +1 -1
- package/dist/bootstrap.js +17 -7
- package/dist/bootstrap.js.map +1 -1
- package/dist/core/wait.d.ts +2 -0
- package/dist/core/wait.js +16 -0
- package/dist/core/wait.js.map +1 -0
- package/dist/device/ui-xml.d.ts +2 -0
- package/dist/device/ui-xml.js +17 -0
- package/dist/device/ui-xml.js.map +1 -1
- package/dist/inbound/acp/handlers/session.js +3 -2
- package/dist/inbound/acp/handlers/session.js.map +1 -1
- package/dist/inbound/cli/benchmark-command.js +1 -1
- package/dist/inbound/cli/main.js +1 -1
- package/dist/inbound/cli/run-command.d.ts +2 -2
- package/dist/inbound/cli/run-command.js +37 -19
- package/dist/inbound/cli/run-command.js.map +1 -1
- package/dist/mcp-client/client.d.ts +1 -3
- package/dist/mcp-client/client.js +10 -0
- package/dist/mcp-client/client.js.map +1 -1
- package/dist/mcp-client/inproc.js +2 -2
- package/dist/mcp-client/inproc.js.map +1 -1
- package/dist/mcp-client/runtime.d.ts +6 -0
- package/dist/plugins/message-bus/inbound.js +3 -2
- package/dist/plugins/message-bus/inbound.js.map +1 -1
- package/dist/types.d.ts +10 -0
- package/package.json +2 -2
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
import { buildReflectorPolicyFromEnv, } from "./reflectors/policy.js";
|
|
2
|
-
export const EXECUTION_MODES = ["
|
|
2
|
+
export const EXECUTION_MODES = ["flash", "pro"];
|
|
3
|
+
export function parseExecutionMode(value) {
|
|
4
|
+
switch (value) {
|
|
5
|
+
case "flash":
|
|
6
|
+
case "fast": return "flash";
|
|
7
|
+
case "pro":
|
|
8
|
+
case "reasoning":
|
|
9
|
+
case "advanced": return "pro";
|
|
10
|
+
default: return undefined;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
3
13
|
const DEFAULT_MAX_STEPS = 30;
|
|
4
14
|
const DEFAULT_TIMEOUT_MS = 5 * 60 * 1000;
|
|
5
15
|
const ADVANCED_MAX_STEPS = 45;
|
|
@@ -8,18 +18,19 @@ const ADVANCED_MAX_REPLANS = 4;
|
|
|
8
18
|
const ADVANCED_TRAJECTORY_INTERVAL = 3;
|
|
9
19
|
/**
|
|
10
20
|
* Resolve product execution modes into concrete AgentRunner settings.
|
|
11
|
-
*
|
|
12
|
-
*
|
|
21
|
+
* Flash preserves the dedicated adapter's historical ReAct behavior.
|
|
22
|
+
* Pro consolidates planning and Advanced capabilities and, when reflection is
|
|
13
23
|
* explicitly enabled, more frequent global progress checks. Explicit
|
|
14
24
|
* caller/config budgets and reflector opt-out continue to win.
|
|
15
25
|
*/
|
|
16
26
|
export function resolveExecutionProfile(opts) {
|
|
17
|
-
const executionMode = opts.executionMode ?? "
|
|
18
|
-
const advanced = executionMode === "
|
|
19
|
-
const plannerPolicy = executionMode === "
|
|
27
|
+
const executionMode = parseExecutionMode(opts.executionMode) ?? "flash";
|
|
28
|
+
const advanced = executionMode === "pro";
|
|
29
|
+
const plannerPolicy = executionMode === "flash"
|
|
20
30
|
? "never"
|
|
21
31
|
: "always";
|
|
22
32
|
const profile = {
|
|
33
|
+
executionMode,
|
|
23
34
|
plannerPolicy,
|
|
24
35
|
maxSteps: opts.requestedMaxSteps ??
|
|
25
36
|
opts.configuredMaxSteps ??
|
|
@@ -34,6 +45,7 @@ export function resolveExecutionProfile(opts) {
|
|
|
34
45
|
}
|
|
35
46
|
const basePolicy = opts.reflectorPolicy ?? buildReflectorPolicyFromEnv();
|
|
36
47
|
profile.maxReplans = ADVANCED_MAX_REPLANS;
|
|
48
|
+
profile.maxLocalRecoveries = 1;
|
|
37
49
|
profile.reflectorPolicy = {
|
|
38
50
|
...basePolicy,
|
|
39
51
|
trajectoryReflector: basePolicy.trajectoryReflector === "off"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-mode.js","sourceRoot":"","sources":["../../src/agent-runtime/execution-mode.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,GAE5B,MAAM,wBAAwB,CAAC;AAEhC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"execution-mode.js","sourceRoot":"","sources":["../../src/agent-runtime/execution-mode.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,GAE5B,MAAM,wBAAwB,CAAC;AAEhC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,KAAK,CAAU,CAAC;AAMzD,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,OAAO,CAAC;QACb,KAAK,MAAM,CAAC,CAAC,OAAO,OAAO,CAAC;QAC5B,KAAK,KAAK,CAAC;QACX,KAAK,WAAW,CAAC;QACjB,KAAK,UAAU,CAAC,CAAC,OAAO,KAAK,CAAC;QAC9B,OAAO,CAAC,CAAC,OAAO,SAAS,CAAC;IAC5B,CAAC;AACH,CAAC;AAsBD,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AACzC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAC9B,MAAM,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC3C,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAC/B,MAAM,4BAA4B,GAAG,CAAC,CAAC;AAEvC;;;;;;GAMG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAA6B;IACnE,MAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC;IACxE,MAAM,QAAQ,GAAG,aAAa,KAAK,KAAK,CAAC;IACzC,MAAM,aAAa,GACjB,aAAa,KAAK,OAAO;QACvB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,QAAQ,CAAC;IAEf,MAAM,OAAO,GAAqB;QAChC,aAAa;QACb,aAAa;QACb,QAAQ,EACN,IAAI,CAAC,iBAAiB;YACtB,IAAI,CAAC,kBAAkB;YACvB,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,iBAAiB,CAAC;QACrD,SAAS,EACP,IAAI,CAAC,mBAAmB;YACxB,CAAC,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,kBAAkB,CAAC;KACxD,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IAAI,IAAI,CAAC,eAAe;YAAE,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QACzE,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,IAAI,2BAA2B,EAAE,CAAC;IACzE,OAAO,CAAC,UAAU,GAAG,oBAAoB,CAAC;IAC1C,OAAO,CAAC,kBAAkB,GAAG,CAAC,CAAC;IAC/B,OAAO,CAAC,eAAe,GAAG;QACxB,GAAG,UAAU;QACb,mBAAmB,EACjB,UAAU,CAAC,mBAAmB,KAAK,KAAK;YACtC,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,4BAA4B,EAAE;QAClE,0BAA0B,EAAE;YAC1B,GAAG,UAAU,CAAC,0BAA0B;YACxC,GAAG,CAAC,IAAI,CAAC,0BAA0B;gBACjC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,0BAA0B,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC;SACR;KACF,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -7,7 +7,7 @@ export { AgentLoop, type AgentErrorCode, type AgentErrorEvent, type AgentLoopTer
|
|
|
7
7
|
export { HierarchicalReflector, actionsEqual, type HierarchicalReflectorOptions, type PreActionVeto, } from "./reflection.js";
|
|
8
8
|
export { formatFeedbackForPrompt, type StepFeedback } from "./feedback.js";
|
|
9
9
|
export { OBSERVATION_MODES, parseObservationMode, resolveObservationMode, type EffectiveObservationMode, type ObservationMode, type ObservationProfile, } from "./observation-mode.js";
|
|
10
|
-
export { EXECUTION_MODES, resolveExecutionProfile, type ExecutionMode, type ExecutionProfile, type ExecutionProfileOptions, } from "./execution-mode.js";
|
|
10
|
+
export { EXECUTION_MODES, parseExecutionMode, type CanonicalExecutionMode, resolveExecutionProfile, type ExecutionMode, type ExecutionProfile, type ExecutionProfileOptions, } from "./execution-mode.js";
|
|
11
11
|
export { inferTargetApp, listAppCards, matchAppCard, renderAppCard, type AppCard, type AppCardMatch, } from "./advanced/app-card.js";
|
|
12
12
|
export { buildAdvancedKnowledge, type AdvancedKnowledge, } from "./advanced/knowledge.js";
|
|
13
13
|
export { LLMSubgoalVerifier, type ISubgoalVerifier, type LLMSubgoalVerifierOptions, type SubgoalVerification, type SubgoalVerificationContext, type SubgoalVerdict, } from "./advanced/subgoal-verifier.js";
|
|
@@ -7,7 +7,7 @@ export { AgentLoop, } from "./core.js";
|
|
|
7
7
|
export { HierarchicalReflector, actionsEqual, } from "./reflection.js";
|
|
8
8
|
export { formatFeedbackForPrompt } from "./feedback.js";
|
|
9
9
|
export { OBSERVATION_MODES, parseObservationMode, resolveObservationMode, } from "./observation-mode.js";
|
|
10
|
-
export { EXECUTION_MODES, resolveExecutionProfile, } from "./execution-mode.js";
|
|
10
|
+
export { EXECUTION_MODES, parseExecutionMode, resolveExecutionProfile, } from "./execution-mode.js";
|
|
11
11
|
export { inferTargetApp, listAppCards, matchAppCard, renderAppCard, } from "./advanced/app-card.js";
|
|
12
12
|
export { buildAdvancedKnowledge, } from "./advanced/knowledge.js";
|
|
13
13
|
export { LLMSubgoalVerifier, } from "./advanced/subgoal-verifier.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/agent-runtime/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,SAAS,GAUV,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,qBAAqB,EACrB,YAAY,GAGb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAqB,MAAM,eAAe,CAAC;AAC3E,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,sBAAsB,GAIvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,eAAe,EACf,uBAAuB,GAIxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,aAAa,GAGd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sBAAsB,GAEvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,kBAAkB,GAMnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,iBAAiB,GAGlB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,eAAe,EACf,kBAAkB,GAMnB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,EACtB,0BAA0B,GAE3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,kBAAkB,GAUnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,oBAAoB,GAOrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,UAAU,EAA0B,MAAM,uCAAuC,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EACL,YAAY,GAGb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,WAAW,GAKZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAmC,MAAM,UAAU,CAAC;AAEhE,sDAAsD;AACtD,OAAO,EACL,eAAe,GAGhB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,eAAe,GAEhB,MAAM,yBAAyB,CAAC;AAEjC,qEAAqE;AACrE,OAAO,EACL,iBAAiB,GAGlB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAqB,MAAM,mCAAmC,CAAC;AAEnG,OAAO,EACL,iBAAiB,EACjB,MAAM,EACN,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,WAAW,EACX,yBAAyB,EACzB,qBAAqB,EACrB,uBAAuB,EACvB,UAAU,EACV,uBAAuB,EACvB,eAAe,GAYhB,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/agent-runtime/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,SAAS,GAUV,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,qBAAqB,EACrB,YAAY,GAGb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAqB,MAAM,eAAe,CAAC;AAC3E,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,sBAAsB,GAIvB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EACL,eAAe,EACf,kBAAkB,EAElB,uBAAuB,GAIxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,aAAa,GAGd,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sBAAsB,GAEvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,kBAAkB,GAMnB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,iBAAiB,GAGlB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,eAAe,EACf,kBAAkB,GAMnB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,EACtB,0BAA0B,GAE3B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,kBAAkB,GAUnB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,oBAAoB,GAOrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,UAAU,EAA0B,MAAM,uCAAuC,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EACL,YAAY,GAGb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,WAAW,GAKZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,GAAG,EAAmC,MAAM,UAAU,CAAC;AAEhE,sDAAsD;AACtD,OAAO,EACL,eAAe,GAGhB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,eAAe,GAEhB,MAAM,yBAAyB,CAAC;AAEjC,qEAAqE;AACrE,OAAO,EACL,iBAAiB,GAGlB,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAqB,MAAM,mCAAmC,CAAC;AAEnG,OAAO,EACL,iBAAiB,EACjB,MAAM,EACN,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,WAAW,EACX,yBAAyB,EACzB,qBAAqB,EACrB,uBAAuB,EACvB,UAAU,EACV,uBAAuB,EACvB,eAAe,GAYhB,MAAM,mBAAmB,CAAC"}
|
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
import type { ScreenInfo, ParsedAction, ModelResponse } from "../../types.js";
|
|
2
2
|
import type { ObservationProfile } from "../observation-mode.js";
|
|
3
3
|
export type Message = {
|
|
4
|
-
role: "system" | "user" | "assistant";
|
|
4
|
+
role: "system" | "user" | "assistant" | "tool";
|
|
5
5
|
content: string | Array<{
|
|
6
6
|
type: string;
|
|
7
7
|
[k: string]: unknown;
|
|
8
8
|
}>;
|
|
9
|
+
tool_call_id?: string;
|
|
10
|
+
reasoning_content?: string;
|
|
11
|
+
tool_calls?: Array<{
|
|
12
|
+
id: string;
|
|
13
|
+
type: "function";
|
|
14
|
+
function: {
|
|
15
|
+
name: string;
|
|
16
|
+
arguments: string;
|
|
17
|
+
};
|
|
18
|
+
}>;
|
|
9
19
|
};
|
|
10
20
|
export interface ModelRequestOptions {
|
|
21
|
+
/** Pro uses native calls; Flash retains adapter-specific request profiles. */
|
|
22
|
+
nativeTools?: readonly import("openai").default.Chat.Completions.ChatCompletionTool[];
|
|
11
23
|
verbose?: boolean;
|
|
12
24
|
signal?: AbortSignal;
|
|
13
25
|
/**
|
|
@@ -20,7 +20,7 @@ export class OpenAIClient {
|
|
|
20
20
|
baseURL: this.config.baseUrl,
|
|
21
21
|
apiKey: this.config.apiKey,
|
|
22
22
|
timeout: 120_000,
|
|
23
|
-
maxRetries: 4,
|
|
23
|
+
maxRetries: opts.maxRetries ?? 4,
|
|
24
24
|
});
|
|
25
25
|
this.adapter =
|
|
26
26
|
typeof opts.adapter === "string" ? getAdapter(opts.adapter)
|
|
@@ -66,7 +66,15 @@ export class OpenAIClient {
|
|
|
66
66
|
// Some providers (e.g. Zhipu) occasionally RESET long streaming responses.
|
|
67
67
|
// Allow disabling streaming via env for robustness.
|
|
68
68
|
const useStream = process.env.GUI_AGENT_STREAM !== "0";
|
|
69
|
-
const requestProfile =
|
|
69
|
+
const requestProfile = opts.nativeTools ? {
|
|
70
|
+
tools: opts.nativeTools, toolChoice: "required", parallelToolCalls: false,
|
|
71
|
+
} : this.adapter.requestProfile;
|
|
72
|
+
// Alibaba's Qwen Flash route rejects forced tools while thinking is enabled.
|
|
73
|
+
// Limit the provider extension to the affected OpenRouter models.
|
|
74
|
+
const requestExtras = new URL(this.config.baseUrl).hostname === "openrouter.ai"
|
|
75
|
+
&& /^qwen\/qwen3\.8-(?:omni-)?flash(?:$|[-:])/.test(this.config.modelName)
|
|
76
|
+
&& requestProfile?.toolChoice === "required"
|
|
77
|
+
? { reasoning: { enabled: false } } : {};
|
|
70
78
|
if (!useStream) {
|
|
71
79
|
const resp = await this.openai.chat.completions.create({
|
|
72
80
|
model: this.config.modelName,
|
|
@@ -77,8 +85,18 @@ export class OpenAIClient {
|
|
|
77
85
|
tools: requestProfile?.tools ? [...requestProfile.tools] : undefined,
|
|
78
86
|
tool_choice: requestProfile?.toolChoice,
|
|
79
87
|
parallel_tool_calls: requestProfile?.parallelToolCalls,
|
|
88
|
+
...requestExtras,
|
|
80
89
|
}, { signal });
|
|
81
90
|
const message = resp.choices?.[0]?.message;
|
|
91
|
+
if (opts.nativeTools) {
|
|
92
|
+
const text = message?.content ?? "";
|
|
93
|
+
const reasoningContent = message?.reasoning_content;
|
|
94
|
+
emitDelta(text);
|
|
95
|
+
await drainDeltas();
|
|
96
|
+
return { rawContent: text, thinking: [reasoningContent, text].filter(Boolean).join("\n"), action: "", reasoningContent,
|
|
97
|
+
toolCalls: (message?.tool_calls ?? []).map((c) => ({ id: c.id, name: c.function.name, arguments: c.function.arguments })),
|
|
98
|
+
usage: { inputTokens: resp.usage?.prompt_tokens ?? 0, outputTokens: resp.usage?.completion_tokens ?? 0 } };
|
|
99
|
+
}
|
|
82
100
|
const rawContent = appendNativeToolCall(message?.content ?? "", message?.tool_calls);
|
|
83
101
|
if (verbose)
|
|
84
102
|
process.stdout.write(rawContent);
|
|
@@ -171,7 +189,9 @@ export class OpenAIClient {
|
|
|
171
189
|
tools: requestProfile?.tools ? [...requestProfile.tools] : undefined,
|
|
172
190
|
tool_choice: requestProfile?.toolChoice,
|
|
173
191
|
parallel_tool_calls: requestProfile?.parallelToolCalls,
|
|
192
|
+
...requestExtras,
|
|
174
193
|
stream: true,
|
|
194
|
+
...(opts.nativeTools ? { stream_options: { include_usage: true } } : {}),
|
|
175
195
|
}, { signal: controller.signal })));
|
|
176
196
|
}
|
|
177
197
|
catch (e) {
|
|
@@ -182,6 +202,8 @@ export class OpenAIClient {
|
|
|
182
202
|
let buffer = "";
|
|
183
203
|
let inAction = false;
|
|
184
204
|
const nativeToolCalls = new Map();
|
|
205
|
+
let nativeUsage;
|
|
206
|
+
let nativeReasoningContent = "";
|
|
185
207
|
const iter = stream[Symbol.asyncIterator]();
|
|
186
208
|
try {
|
|
187
209
|
while (true) {
|
|
@@ -189,6 +211,8 @@ export class OpenAIClient {
|
|
|
189
211
|
if (result.done)
|
|
190
212
|
break;
|
|
191
213
|
const chunk = result.value;
|
|
214
|
+
if (chunk.usage)
|
|
215
|
+
nativeUsage = { inputTokens: chunk.usage.prompt_tokens, outputTokens: chunk.usage.completion_tokens };
|
|
192
216
|
// Any SSE chunk (even an empty role-only frame) means the upstream is
|
|
193
217
|
// still alive — swap to the inter-chunk budget for the next wait.
|
|
194
218
|
phase = "inter";
|
|
@@ -204,7 +228,10 @@ export class OpenAIClient {
|
|
|
204
228
|
// Reasoning models (MAI-UI etc.) emit reasoning_content before content
|
|
205
229
|
const reasoning = delta.reasoning_content;
|
|
206
230
|
if (typeof reasoning === "string" && reasoning) {
|
|
207
|
-
|
|
231
|
+
if (opts.nativeTools)
|
|
232
|
+
nativeReasoningContent += reasoning;
|
|
233
|
+
else
|
|
234
|
+
rawContent += reasoning;
|
|
208
235
|
if (!inAction) {
|
|
209
236
|
if (verbose)
|
|
210
237
|
process.stdout.write(reasoning);
|
|
@@ -257,6 +284,13 @@ export class OpenAIClient {
|
|
|
257
284
|
throw e;
|
|
258
285
|
}
|
|
259
286
|
cleanup();
|
|
287
|
+
if (opts.nativeTools) {
|
|
288
|
+
await drainDeltas();
|
|
289
|
+
return { rawContent, thinking: [nativeReasoningContent, rawContent].filter(Boolean).join("\n"), action: "", usage: nativeUsage,
|
|
290
|
+
reasoningContent: nativeReasoningContent || undefined,
|
|
291
|
+
toolCalls: [...nativeToolCalls.entries()].sort(([a], [b]) => a - b)
|
|
292
|
+
.map(([, c]) => ({ id: c.id ?? "", name: c.name, arguments: c.arguments })) };
|
|
293
|
+
}
|
|
260
294
|
rawContent = appendNativeToolCall(rawContent, [...nativeToolCalls.entries()]
|
|
261
295
|
.sort(([a], [b]) => a - b)
|
|
262
296
|
.map(([, call]) => ({ function: call })));
|
|
@@ -283,6 +317,8 @@ function collectNativeToolCallDeltas(buffers, deltas) {
|
|
|
283
317
|
for (const delta of deltas ?? []) {
|
|
284
318
|
const index = typeof delta.index === "number" ? delta.index : 0;
|
|
285
319
|
const current = buffers.get(index) ?? { name: "", arguments: "" };
|
|
320
|
+
if (delta.id)
|
|
321
|
+
current.id = delta.id;
|
|
286
322
|
if (typeof delta.function?.name === "string")
|
|
287
323
|
current.name += delta.function.name;
|
|
288
324
|
if (typeof delta.function?.arguments === "string") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/agent-runtime/models/client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/agent-runtime/models/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export declare function proFallbackModels(primary: string, role: "operator" | "planner" | "verifier", baseUrl?: string): string[];
|
|
2
|
+
/** Only retry inference, never replay an already dispatched device action. */
|
|
3
|
+
export declare function withProFallback<T>(models: readonly string[], invoke: (model: string) => Promise<T>, signal?: AbortSignal): Promise<T>;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { assertProModel, DEFAULT_PRO_MODEL, resolveProModel } from "./pro-policy.js";
|
|
2
|
+
export function proFallbackModels(primary, role, baseUrl) {
|
|
3
|
+
const value = process.env[`BEEOS_PRO_${role.toUpperCase()}_FALLBACK_MODELS`] ?? process.env.BEEOS_PRO_FALLBACK_MODELS;
|
|
4
|
+
const defaults = primary.replace(/^google\//, "") === DEFAULT_PRO_MODEL ? ["gemini-3.7-flash"] : [];
|
|
5
|
+
const candidates = value === undefined ? defaults : value.split(",").map((s) => s.trim()).filter(Boolean);
|
|
6
|
+
return [...new Set(candidates.map((model) => resolveProModel(assertProModel(model), baseUrl)))].filter((model) => model !== primary).slice(0, 3);
|
|
7
|
+
}
|
|
8
|
+
function transient(error) {
|
|
9
|
+
const status = error?.status;
|
|
10
|
+
if (typeof status === "number")
|
|
11
|
+
return status === 429 || status >= 500 && status <= 599;
|
|
12
|
+
return error instanceof Error && /timeout|timed out|stream stalled|connection|ECONNRESET|fetch failed/i.test(`${error.name}: ${error.message}`);
|
|
13
|
+
}
|
|
14
|
+
/** Only retry inference, never replay an already dispatched device action. */
|
|
15
|
+
export async function withProFallback(models, invoke, signal) {
|
|
16
|
+
for (let i = 0; i < models.length; i++) {
|
|
17
|
+
signal?.throwIfAborted();
|
|
18
|
+
try {
|
|
19
|
+
const result = await invoke(models[i]);
|
|
20
|
+
signal?.throwIfAborted();
|
|
21
|
+
return result;
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
signal?.throwIfAborted();
|
|
25
|
+
if (i === models.length - 1 || !transient(error))
|
|
26
|
+
throw error;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
throw new Error("No Pro model configured");
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=pro-fallback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pro-fallback.js","sourceRoot":"","sources":["../../../src/agent-runtime/models/pro-fallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAErF,MAAM,UAAU,iBAAiB,CAAC,OAAe,EAAE,IAAyC,EAAE,OAAgB;IAC5G,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IACtH,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,KAAK,iBAAiB,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACpG,MAAM,UAAU,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC1G,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACnJ,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,MAAM,MAAM,GAAI,KAAyC,EAAE,MAAM,CAAC;IAClE,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;IACxF,OAAO,KAAK,YAAY,KAAK,IAAI,sEAAsE,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;AAClJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,CAAC,KAAK,UAAU,eAAe,CAAI,MAAyB,EAAE,MAAqC,EAAE,MAAoB;IAC7H,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,EAAE,cAAc,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,EAAE,cAAc,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,EAAE,cAAc,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC;QAChE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
/** ARTEMIS reference config/artemis.jsonc: shared Planner/Operator/Checker model. */
|
|
2
|
+
export declare const DEFAULT_PRO_MODEL = "gemini-3.8-flash";
|
|
3
|
+
export declare function assertProModel(modelName: string): string;
|
|
4
|
+
export declare function resolveProModel(modelName?: string, baseUrl?: string): string;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/** ARTEMIS reference config/artemis.jsonc: shared Planner/Operator/Checker model. */
|
|
2
|
+
export const DEFAULT_PRO_MODEL = "gemini-3.8-flash";
|
|
3
|
+
export function assertProModel(modelName) {
|
|
4
|
+
const model = modelName.trim();
|
|
5
|
+
if (!model || /autoglm|gui[-_]?owl|mai[-_]?ui/i.test(model)) {
|
|
6
|
+
throw new Error("Pro requires a general-purpose model; specialized GUI models belong to Flash");
|
|
7
|
+
}
|
|
8
|
+
return model;
|
|
9
|
+
}
|
|
10
|
+
export function resolveProModel(modelName, baseUrl) {
|
|
11
|
+
const selected = modelName?.trim();
|
|
12
|
+
const model = assertProModel(selected && selected !== "auto"
|
|
13
|
+
? selected : process.env.BEEOS_PRO_MODEL ?? DEFAULT_PRO_MODEL);
|
|
14
|
+
// OpenRouter uses provider-qualified IDs; compatible local routers may not.
|
|
15
|
+
if (baseUrl && new URL(baseUrl).hostname === "openrouter.ai" && /^gemini-/.test(model)) {
|
|
16
|
+
return `google/${model}`;
|
|
17
|
+
}
|
|
18
|
+
return model;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=pro-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pro-policy.js","sourceRoot":"","sources":["../../../src/agent-runtime/models/pro-policy.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,MAAM,CAAC,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;AAEpD,MAAM,UAAU,cAAc,CAAC,SAAiB;IAC9C,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,CAAC,KAAK,IAAI,iCAAiC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;IAClG,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,SAAkB,EAAE,OAAgB;IAClE,MAAM,QAAQ,GAAG,SAAS,EAAE,IAAI,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,cAAc,CAAC,QAAQ,IAAI,QAAQ,KAAK,MAAM;QAC1D,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,iBAAiB,CAAC,CAAC;IACjE,4EAA4E;IAC5E,IAAI,OAAO,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,QAAQ,KAAK,eAAe,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACvF,OAAO,UAAU,KAAK,EAAE,CAAC;IAC3B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -6,6 +6,8 @@ export interface ModelRuntimeRegistryOptions {
|
|
|
6
6
|
defaultModelName?: string;
|
|
7
7
|
/** Preserves an explicit local adapter override for the configured default only. */
|
|
8
8
|
defaultLegacyAdapter?: string;
|
|
9
|
+
/** Fixed universal protocol for Pro, independent of model-name detection. */
|
|
10
|
+
forcedAdapter?: string;
|
|
9
11
|
lang?: "cn" | "en";
|
|
10
12
|
imageTransport: ImageTransport;
|
|
11
13
|
maxCachedModels?: number;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { OpenAIAdapter } from "../adapters/openai.js";
|
|
2
|
+
import { ProModelAdapter } from "../adapters/pro.js";
|
|
3
|
+
import { GeneralFlashAdapter } from "../adapters/general-flash.js";
|
|
2
4
|
import { OpenAIClient } from "./client.js";
|
|
3
5
|
/**
|
|
4
6
|
* Builds model adapters from trusted local credentials while callers select
|
|
@@ -36,13 +38,21 @@ export class ModelRuntimeRegistry {
|
|
|
36
38
|
return adapter;
|
|
37
39
|
}
|
|
38
40
|
create(modelName, legacyAdapter) {
|
|
41
|
+
if (this.opts.forcedAdapter === "pro") {
|
|
42
|
+
return new ProModelAdapter({ modelName, apiKey: this.opts.apiKey, baseUrl: this.opts.baseUrl,
|
|
43
|
+
imageTransport: this.opts.imageTransport });
|
|
44
|
+
}
|
|
45
|
+
const client = new OpenAIClient({
|
|
46
|
+
apiKey: this.opts.apiKey,
|
|
47
|
+
baseUrl: this.opts.baseUrl,
|
|
48
|
+
modelName,
|
|
49
|
+
adapter: this.opts.forcedAdapter ?? legacyAdapter,
|
|
50
|
+
});
|
|
51
|
+
if (client.adapterName === "general")
|
|
52
|
+
return new GeneralFlashAdapter({ client, apiKey: this.opts.apiKey,
|
|
53
|
+
baseUrl: this.opts.baseUrl, imageTransport: this.opts.imageTransport });
|
|
39
54
|
return new OpenAIAdapter({
|
|
40
|
-
client
|
|
41
|
-
apiKey: this.opts.apiKey,
|
|
42
|
-
baseUrl: this.opts.baseUrl,
|
|
43
|
-
modelName,
|
|
44
|
-
adapter: legacyAdapter,
|
|
45
|
-
}),
|
|
55
|
+
client,
|
|
46
56
|
lang: this.opts.lang ?? "cn",
|
|
47
57
|
imageTransport: this.opts.imageTransport,
|
|
48
58
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-registry.js","sourceRoot":"","sources":["../../../src/agent-runtime/models/runtime-registry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime-registry.js","sourceRoot":"","sources":["../../../src/agent-runtime/models/runtime-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,10 @@ export interface AgentRunnerCoreOptions {
|
|
|
31
31
|
modelResolver?: {
|
|
32
32
|
resolve(modelName?: string): IModelAdapter;
|
|
33
33
|
};
|
|
34
|
+
/** Separate universal model runtime; never inherits Flash's default. */
|
|
35
|
+
proModelResolver?: {
|
|
36
|
+
resolve(modelName?: string): IModelAdapter;
|
|
37
|
+
};
|
|
34
38
|
/** Text adapter used only for explicit XML observation turns. */
|
|
35
39
|
xmlAdapter?: IModelAdapter;
|
|
36
40
|
/** Optional planner. When omitted the runner is pure ReAct. */
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
import { AgentRunner, resolveExecutionProfile, FileSystemSkillCacheStore, } from "../../index.js";
|
|
19
19
|
import { taskOutcomeFromTerminator } from "../../../core/task-outcome.js";
|
|
20
20
|
import { buildAdvancedKnowledge } from "../../advanced/knowledge.js";
|
|
21
|
+
import { assertProModel } from "../../models/pro-policy.js";
|
|
21
22
|
export class AgentRunnerCore {
|
|
22
23
|
opts;
|
|
23
24
|
defaultModel;
|
|
@@ -38,9 +39,6 @@ export class AgentRunnerCore {
|
|
|
38
39
|
const mcp = this.opts.mcpProvider();
|
|
39
40
|
const env = this.opts.env ?? "mobile";
|
|
40
41
|
const requestedModel = opts.model?.trim();
|
|
41
|
-
const resolvedAdapter = requestedModel
|
|
42
|
-
? this.opts.modelResolver?.resolve(requestedModel)
|
|
43
|
-
: undefined;
|
|
44
42
|
const execution = resolveExecutionProfile({
|
|
45
43
|
executionMode: opts.executionMode,
|
|
46
44
|
requestedMaxSteps: opts.maxSteps,
|
|
@@ -51,7 +49,11 @@ export class AgentRunnerCore {
|
|
|
51
49
|
? (this.opts.advancedXmlReflectorModelName ?? this.opts.advancedReflectorModelName)
|
|
52
50
|
: this.opts.advancedReflectorModelName,
|
|
53
51
|
});
|
|
54
|
-
const advanced =
|
|
52
|
+
const advanced = execution.executionMode === "pro";
|
|
53
|
+
const explicitModel = requestedModel && requestedModel !== "auto" ? requestedModel : undefined;
|
|
54
|
+
const resolvedAdapter = advanced && this.opts.proModelResolver
|
|
55
|
+
? this.opts.proModelResolver.resolve(explicitModel ? assertProModel(explicitModel) : undefined)
|
|
56
|
+
: explicitModel ? this.opts.modelResolver?.resolve(explicitModel) : undefined;
|
|
55
57
|
const advancedSkillStore = advanced ? this.getAdvancedSkillStore() : undefined;
|
|
56
58
|
const advancedKnowledge = advanced
|
|
57
59
|
? await buildAdvancedKnowledge({ task: opts.task, skillStore: advancedSkillStore })
|
|
@@ -141,6 +143,7 @@ export class AgentRunnerCore {
|
|
|
141
143
|
: (useXmlAdapter ? (this.opts.xmlPlanner ?? this.opts.planner) : this.opts.planner),
|
|
142
144
|
plannerPolicy: execution.plannerPolicy,
|
|
143
145
|
maxSteps: execution.maxSteps,
|
|
146
|
+
maxLocalRecoveries: execution.maxLocalRecoveries,
|
|
144
147
|
timeoutMs: execution.timeoutMs,
|
|
145
148
|
...(execution.maxReplans !== undefined
|
|
146
149
|
? { maxReplans: execution.maxReplans }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/agent-runtime/modes/hybrid/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAWH,OAAO,EACL,WAAW,EAGX,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,gBAAgB,CAAC;AAMxB,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/agent-runtime/modes/hybrid/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,11 +45,13 @@ export interface LLMPlannerOptions {
|
|
|
45
45
|
* Defaults to `true`.
|
|
46
46
|
*/
|
|
47
47
|
jsonMode?: boolean;
|
|
48
|
+
fallbackModels?: string[];
|
|
48
49
|
}
|
|
49
50
|
export declare class LLMPlanner implements IPlanner {
|
|
50
51
|
readonly name: string;
|
|
51
52
|
readonly modelName: string;
|
|
52
53
|
private readonly client;
|
|
54
|
+
private readonly multimodal;
|
|
53
55
|
private readonly opts;
|
|
54
56
|
constructor(opts?: LLMPlannerOptions);
|
|
55
57
|
makePlan(ctx: PlanContext, opts?: PlanOptions): Promise<PlanResult>;
|
|
@@ -20,15 +20,19 @@ import OpenAI from "openai";
|
|
|
20
20
|
import { normalizeOpenAIBaseUrl } from "../../../models/openai-base-url.js";
|
|
21
21
|
import { extractFirstJson, makePlanResult, normalisePlanPayload, } from "./base.js";
|
|
22
22
|
import { renderSystemPrompt, renderUserPrompt, STRICT_SCHEMA_HINT } from "./prompts.js";
|
|
23
|
+
import { withProFallback } from "../../../models/pro-fallback.js";
|
|
24
|
+
import { compressForVlm } from "../../../models/image/compress.js";
|
|
23
25
|
const DEFAULT_MODEL_NAME = "glm-4-flash";
|
|
24
26
|
export class LLMPlanner {
|
|
25
27
|
name;
|
|
26
28
|
modelName;
|
|
27
29
|
client;
|
|
30
|
+
multimodal;
|
|
28
31
|
opts;
|
|
29
32
|
constructor(opts = {}) {
|
|
30
33
|
this.modelName = opts.modelName ?? process.env.PLANNER_MODEL ?? DEFAULT_MODEL_NAME;
|
|
31
34
|
this.name = opts.name ?? `llm:${this.modelName}`;
|
|
35
|
+
this.multimodal = opts.fallbackModels !== undefined;
|
|
32
36
|
this.opts = {
|
|
33
37
|
baseUrl: normalizeOpenAIBaseUrl(opts.baseUrl ??
|
|
34
38
|
process.env.PLANNER_BASE_URL ??
|
|
@@ -40,6 +44,7 @@ export class LLMPlanner {
|
|
|
40
44
|
topP: opts.topP ?? 0.9,
|
|
41
45
|
maxTokens: opts.maxTokens ?? 1500,
|
|
42
46
|
jsonMode: opts.jsonMode ?? true,
|
|
47
|
+
fallbackModels: opts.fallbackModels ?? [],
|
|
43
48
|
};
|
|
44
49
|
this.client =
|
|
45
50
|
opts.client ??
|
|
@@ -51,7 +56,7 @@ export class LLMPlanner {
|
|
|
51
56
|
// tolerance for transient ARouter / llama.cpp 5xx so the planner
|
|
52
57
|
// doesn't surface a 502 to the user before the retry budget would
|
|
53
58
|
// have been hit by VLM steps anyway.
|
|
54
|
-
maxRetries: 4,
|
|
59
|
+
maxRetries: opts.fallbackModels !== undefined ? 0 : 4,
|
|
55
60
|
});
|
|
56
61
|
}
|
|
57
62
|
async makePlan(ctx, opts = {}) {
|
|
@@ -77,9 +82,17 @@ export class LLMPlanner {
|
|
|
77
82
|
trajectoryVerdict: ctx.trajectoryVerdict,
|
|
78
83
|
failureChain: isReplan ? ctx.failureChain : undefined,
|
|
79
84
|
});
|
|
85
|
+
const content = [
|
|
86
|
+
{ type: "text", text: `${user}\n\n${STRICT_SCHEMA_HINT}` },
|
|
87
|
+
];
|
|
88
|
+
if (this.multimodal && ctx.observation?.screenshotB64) {
|
|
89
|
+
const image = await compressForVlm(Buffer.from(ctx.observation.screenshotB64, "base64"));
|
|
90
|
+
content.push({ type: "image_url", image_url: { url: `data:${image.mime};base64,${image.bytes.toString("base64")}` } });
|
|
91
|
+
}
|
|
92
|
+
opts.signal?.throwIfAborted();
|
|
80
93
|
const messages = [
|
|
81
94
|
{ role: "system", content: system },
|
|
82
|
-
{ role: "user", content: `${user}\n\n${STRICT_SCHEMA_HINT}` },
|
|
95
|
+
{ role: "user", content: this.multimodal ? content : `${user}\n\n${STRICT_SCHEMA_HINT}` },
|
|
83
96
|
];
|
|
84
97
|
const reqBody = {
|
|
85
98
|
model: this.modelName,
|
|
@@ -91,7 +104,7 @@ export class LLMPlanner {
|
|
|
91
104
|
if (this.opts.jsonMode) {
|
|
92
105
|
reqBody.response_format = { type: "json_object" };
|
|
93
106
|
}
|
|
94
|
-
const resp = await this.client.chat.completions.create(reqBody, { signal: opts.signal });
|
|
107
|
+
const resp = await withProFallback([this.modelName, ...this.opts.fallbackModels], (model) => this.client.chat.completions.create({ ...reqBody, model, stream: false }, { signal: opts.signal }), opts.signal);
|
|
95
108
|
const choice = ("choices" in resp ? resp.choices : undefined)?.[0];
|
|
96
109
|
const raw = choice?.message?.content ?? "";
|
|
97
110
|
const usage = {
|