@markusylisiurunen/tau 0.2.36 → 0.2.38
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/README.md +65 -2
- package/dist/core/cli.js +20 -1
- package/dist/core/cli.js.map +1 -1
- package/dist/core/config/content_loader.js +55 -3
- package/dist/core/config/content_loader.js.map +1 -1
- package/dist/core/config/schema.js +47 -0
- package/dist/core/config/schema.js.map +1 -1
- package/dist/core/index.js +4 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/modes/index.js +2 -0
- package/dist/core/modes/index.js.map +1 -1
- package/dist/core/modes/rpc_protocol.js +240 -0
- package/dist/core/modes/rpc_protocol.js.map +1 -0
- package/dist/core/modes/rpc_server.js +275 -0
- package/dist/core/modes/rpc_server.js.map +1 -0
- package/dist/core/runtime/chat_runtime.js +124 -0
- package/dist/core/runtime/chat_runtime.js.map +1 -0
- package/dist/core/runtime/conversation_turn_runtime.js +49 -0
- package/dist/core/runtime/conversation_turn_runtime.js.map +1 -0
- package/dist/core/runtime/session_prompt_composer.js +55 -0
- package/dist/core/runtime/session_prompt_composer.js.map +1 -0
- package/dist/core/subagents/launch_model.js +89 -0
- package/dist/core/subagents/launch_model.js.map +1 -0
- package/dist/core/subagents/registry.js +18 -11
- package/dist/core/subagents/registry.js.map +1 -1
- package/dist/core/tools/spawn_agent.js +46 -2
- package/dist/core/tools/spawn_agent.js.map +1 -1
- package/dist/core/utils/auto_retry.js +1 -1
- package/dist/core/utils/auto_retry.js.map +1 -1
- package/dist/core/version.js +1 -1
- package/dist/main.js +140 -5
- package/dist/main.js.map +1 -1
- package/dist/sdk/client.d.ts +2 -0
- package/dist/sdk/client.js +409 -0
- package/dist/sdk/client.js.map +1 -0
- package/dist/sdk/errors.d.ts +32 -0
- package/dist/sdk/errors.js +37 -0
- package/dist/sdk/errors.js.map +1 -0
- package/dist/sdk/index.d.ts +4 -0
- package/dist/sdk/index.js +3 -0
- package/dist/sdk/index.js.map +1 -0
- package/dist/sdk/types.d.ts +83 -0
- package/dist/sdk/types.js +2 -0
- package/dist/sdk/types.js.map +1 -0
- package/dist/tui/app.js.map +1 -1
- package/dist/tui/chat_controller.js +101 -99
- package/dist/tui/chat_controller.js.map +1 -1
- package/package.json +9 -3
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import { CoreSession } from "../session/core_session.js";
|
|
2
|
+
import { ConversationTurnRuntime, } from "./conversation_turn_runtime.js";
|
|
3
|
+
import { composeSessionPrompts } from "./session_prompt_composer.js";
|
|
4
|
+
export class ChatRuntime {
|
|
5
|
+
sessionInstance;
|
|
6
|
+
turnRuntime;
|
|
7
|
+
currentPersona;
|
|
8
|
+
riskLevel;
|
|
9
|
+
promptContext;
|
|
10
|
+
environment;
|
|
11
|
+
latestPromptComposition;
|
|
12
|
+
static create(options) {
|
|
13
|
+
const promptComposition = composeSessionPrompts({
|
|
14
|
+
persona: options.persona,
|
|
15
|
+
riskLevel: options.riskLevel,
|
|
16
|
+
cwd: options.promptContext.cwd,
|
|
17
|
+
datetime: new Date(options.environment.now()).toISOString(),
|
|
18
|
+
platform: options.environment.platform(),
|
|
19
|
+
nodeVersion: options.environment.nodeVersion(),
|
|
20
|
+
skillsBlock: options.promptContext.skillsBlock,
|
|
21
|
+
projectContextBlock: options.promptContext.projectContextBlock,
|
|
22
|
+
sandboxEnabled: options.promptContext.sandboxEnabled,
|
|
23
|
+
sandboxEnvironmentInfo: options.promptContext.sandboxEnvironmentInfo,
|
|
24
|
+
});
|
|
25
|
+
const session = new CoreSession({
|
|
26
|
+
persona: options.persona,
|
|
27
|
+
systemPrompt: promptComposition.baseSystemPrompt,
|
|
28
|
+
subagentPrompts: promptComposition.subagentPrompts,
|
|
29
|
+
riskLevel: options.riskLevel,
|
|
30
|
+
toolRegistry: options.toolRegistry,
|
|
31
|
+
config: options.config,
|
|
32
|
+
deps: options.deps,
|
|
33
|
+
});
|
|
34
|
+
return new ChatRuntime({
|
|
35
|
+
session,
|
|
36
|
+
persona: options.persona,
|
|
37
|
+
riskLevel: options.riskLevel,
|
|
38
|
+
promptContext: options.promptContext,
|
|
39
|
+
environment: options.environment,
|
|
40
|
+
initialPromptComposition: promptComposition,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
constructor(options) {
|
|
44
|
+
this.sessionInstance = options.session;
|
|
45
|
+
this.turnRuntime = new ConversationTurnRuntime(this.sessionInstance);
|
|
46
|
+
this.currentPersona = options.persona;
|
|
47
|
+
this.riskLevel = options.riskLevel;
|
|
48
|
+
this.promptContext = { ...options.promptContext };
|
|
49
|
+
this.environment = options.environment;
|
|
50
|
+
this.latestPromptComposition = options.initialPromptComposition ?? this.composePromptSet();
|
|
51
|
+
if (!options.initialPromptComposition) {
|
|
52
|
+
this.sessionInstance.setPersona(this.currentPersona, this.latestPromptComposition.baseSystemPrompt, this.latestPromptComposition.subagentPrompts);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
get session() {
|
|
56
|
+
return this.sessionInstance;
|
|
57
|
+
}
|
|
58
|
+
get isTurnRunning() {
|
|
59
|
+
return this.turnRuntime.isRunning;
|
|
60
|
+
}
|
|
61
|
+
get promptComposition() {
|
|
62
|
+
return this.latestPromptComposition;
|
|
63
|
+
}
|
|
64
|
+
runTurn(onEvent) {
|
|
65
|
+
return this.turnRuntime.run(onEvent);
|
|
66
|
+
}
|
|
67
|
+
interruptTurn() {
|
|
68
|
+
return this.turnRuntime.interrupt();
|
|
69
|
+
}
|
|
70
|
+
setConfig(config) {
|
|
71
|
+
this.sessionInstance.setConfig(config);
|
|
72
|
+
}
|
|
73
|
+
setRiskLevel(level) {
|
|
74
|
+
const previous = this.riskLevel;
|
|
75
|
+
this.riskLevel = level;
|
|
76
|
+
this.sessionInstance.setRiskLevel(level);
|
|
77
|
+
if (previous !== level) {
|
|
78
|
+
this.rebuildSubagentPrompts();
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
setPersona(persona, options) {
|
|
82
|
+
this.currentPersona = persona;
|
|
83
|
+
this.rebuildSystemPrompts(options);
|
|
84
|
+
}
|
|
85
|
+
updatePromptContext(context) {
|
|
86
|
+
this.promptContext = {
|
|
87
|
+
...this.promptContext,
|
|
88
|
+
...context,
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
rebuildSystemPrompts(options) {
|
|
92
|
+
if (options?.skillsBlock !== undefined) {
|
|
93
|
+
this.promptContext.skillsBlock = options.skillsBlock;
|
|
94
|
+
}
|
|
95
|
+
this.latestPromptComposition = this.composePromptSet(options?.skillsBlock);
|
|
96
|
+
this.sessionInstance.setPersona(this.currentPersona, this.latestPromptComposition.baseSystemPrompt, this.latestPromptComposition.subagentPrompts);
|
|
97
|
+
}
|
|
98
|
+
rebuildSubagentPrompts(options) {
|
|
99
|
+
if (options?.skillsBlock !== undefined) {
|
|
100
|
+
this.promptContext.skillsBlock = options.skillsBlock;
|
|
101
|
+
}
|
|
102
|
+
const nextPromptComposition = this.composePromptSet(options?.skillsBlock);
|
|
103
|
+
this.latestPromptComposition = {
|
|
104
|
+
...this.latestPromptComposition,
|
|
105
|
+
subagentPrompts: nextPromptComposition.subagentPrompts,
|
|
106
|
+
};
|
|
107
|
+
this.sessionInstance.setPersona(this.currentPersona, this.latestPromptComposition.baseSystemPrompt, this.latestPromptComposition.subagentPrompts);
|
|
108
|
+
}
|
|
109
|
+
composePromptSet(skillsBlock) {
|
|
110
|
+
return composeSessionPrompts({
|
|
111
|
+
persona: this.currentPersona,
|
|
112
|
+
riskLevel: this.riskLevel,
|
|
113
|
+
cwd: this.promptContext.cwd,
|
|
114
|
+
datetime: new Date(this.environment.now()).toISOString(),
|
|
115
|
+
platform: this.environment.platform(),
|
|
116
|
+
nodeVersion: this.environment.nodeVersion(),
|
|
117
|
+
skillsBlock: skillsBlock ?? this.promptContext.skillsBlock,
|
|
118
|
+
projectContextBlock: this.promptContext.projectContextBlock,
|
|
119
|
+
sandboxEnabled: this.promptContext.sandboxEnabled,
|
|
120
|
+
sandboxEnvironmentInfo: this.promptContext.sandboxEnvironmentInfo,
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=chat_runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chat_runtime.js","sourceRoot":"","sources":["../../../src/core/runtime/chat_runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
export class ConversationTurnRuntime {
|
|
2
|
+
session;
|
|
3
|
+
abortController;
|
|
4
|
+
constructor(session) {
|
|
5
|
+
this.session = session;
|
|
6
|
+
}
|
|
7
|
+
get isRunning() {
|
|
8
|
+
return this.abortController !== undefined;
|
|
9
|
+
}
|
|
10
|
+
async run(onEvent) {
|
|
11
|
+
if (this.abortController) {
|
|
12
|
+
throw new Error("conversation turn is already running");
|
|
13
|
+
}
|
|
14
|
+
const abortController = new AbortController();
|
|
15
|
+
this.abortController = abortController;
|
|
16
|
+
try {
|
|
17
|
+
try {
|
|
18
|
+
for await (const event of this.session.events(abortController.signal)) {
|
|
19
|
+
if (abortController.signal.aborted) {
|
|
20
|
+
break;
|
|
21
|
+
}
|
|
22
|
+
await onEvent(event);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
if (!abortController.signal.aborted) {
|
|
27
|
+
throw err;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
return {
|
|
31
|
+
aborted: abortController.signal.aborted,
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
finally {
|
|
35
|
+
if (this.abortController === abortController) {
|
|
36
|
+
this.abortController = undefined;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
interrupt() {
|
|
41
|
+
const abortController = this.abortController;
|
|
42
|
+
if (!abortController || abortController.signal.aborted) {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
abortController.abort();
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=conversation_turn_runtime.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conversation_turn_runtime.js","sourceRoot":"","sources":["../../../src/core/runtime/conversation_turn_runtime.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,uBAAuB;IACjB,OAAO,CAA8B;IAC9C,eAAe,CAAmB;IAE1C,YAAY,OAAoC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAmD;QAC3D,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,IAAI,CAAC;YACH,IAAI,CAAC;gBACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;oBACtE,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnC,MAAM;oBACR,CAAC;oBACD,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;oBACpC,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC,OAAO;aACxC,CAAC;QACJ,CAAC;gBAAS,CAAC;YACT,IAAI,IAAI,CAAC,eAAe,KAAK,eAAe,EAAE,CAAC;gBAC7C,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,SAAS;QACP,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,eAAe,CAAC,KAAK,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { formatSubagentsForPrompt, getSubagentBasePrompt } from "../subagents/registry.js";
|
|
2
|
+
import { buildBaseSystemPrompt, buildEnvironmentTag, buildSandboxInfoBlock, } from "../utils/context.js";
|
|
3
|
+
export function composeSessionPrompts(args) {
|
|
4
|
+
const environmentTag = buildEnvironmentTag({
|
|
5
|
+
riskLevel: args.riskLevel,
|
|
6
|
+
cwd: args.cwd,
|
|
7
|
+
datetime: args.datetime,
|
|
8
|
+
platform: args.platform,
|
|
9
|
+
nodeVersion: args.nodeVersion,
|
|
10
|
+
});
|
|
11
|
+
const sandboxInfoBlock = args.sandboxEnabled
|
|
12
|
+
? buildSandboxInfoBlock(args.sandboxEnvironmentInfo)
|
|
13
|
+
: undefined;
|
|
14
|
+
const baseSystemPrompt = buildBaseSystemPrompt({
|
|
15
|
+
personaSystemPrompt: args.persona.systemPrompt,
|
|
16
|
+
skillsBlock: args.skillsBlock,
|
|
17
|
+
projectContextBlock: args.projectContextBlock,
|
|
18
|
+
sandboxInfoBlock,
|
|
19
|
+
environmentTag,
|
|
20
|
+
subagentsBlock: formatSubagentsForPrompt(args.persona),
|
|
21
|
+
});
|
|
22
|
+
const subagentPrompts = {};
|
|
23
|
+
const subagents = args.persona.subagents;
|
|
24
|
+
if (subagents && Object.keys(subagents).length > 0) {
|
|
25
|
+
for (const [name, config] of Object.entries(subagents)) {
|
|
26
|
+
if (!config) {
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
const personaSystemPrompt = getSubagentBasePrompt(name, config);
|
|
30
|
+
if (!personaSystemPrompt) {
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const subagentEnvironmentTag = buildEnvironmentTag({
|
|
34
|
+
riskLevel: config.riskLevel ?? args.riskLevel,
|
|
35
|
+
cwd: args.cwd,
|
|
36
|
+
datetime: args.datetime,
|
|
37
|
+
platform: args.platform,
|
|
38
|
+
nodeVersion: args.nodeVersion,
|
|
39
|
+
});
|
|
40
|
+
subagentPrompts[name] = buildBaseSystemPrompt({
|
|
41
|
+
personaSystemPrompt,
|
|
42
|
+
skillsBlock: args.skillsBlock,
|
|
43
|
+
projectContextBlock: args.projectContextBlock,
|
|
44
|
+
sandboxInfoBlock,
|
|
45
|
+
environmentTag: subagentEnvironmentTag,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
environmentTag,
|
|
51
|
+
baseSystemPrompt,
|
|
52
|
+
subagentPrompts,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=session_prompt_composer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session_prompt_composer.js","sourceRoot":"","sources":["../../../src/core/runtime/session_prompt_composer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAE3F,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAqB7B,MAAM,UAAU,qBAAqB,CAAC,IAA+B;IACnE,MAAM,cAAc,GAAG,mBAAmB,CAAC;QACzC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc;QAC1C,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,sBAAsB,CAAC;QACpD,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,gBAAgB,GAAG,qBAAqB,CAAC;QAC7C,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;QAC9C,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,gBAAgB;QAChB,cAAc;QACd,cAAc,EAAE,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC;KACvD,CAAC,CAAC;IAEH,MAAM,eAAe,GAA2B,EAAE,CAAC;IACnD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACzC,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnD,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACvD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,SAAS;YACX,CAAC;YAED,MAAM,mBAAmB,GAAG,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAChE,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,SAAS;YACX,CAAC;YAED,MAAM,sBAAsB,GAAG,mBAAmB,CAAC;gBACjD,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS;gBAC7C,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,WAAW,EAAE,IAAI,CAAC,WAAW;aAC9B,CAAC,CAAC;YAEH,eAAe,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC;gBAC5C,mBAAmB;gBACnB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,gBAAgB;gBAChB,cAAc,EAAE,sBAAsB;aACvC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,cAAc;QACd,gBAAgB;QAChB,eAAe;KAChB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { getModels, getProviders } from "@mariozechner/pi-ai";
|
|
2
|
+
import { ReasoningEffortSchema } from "../types.js";
|
|
3
|
+
function parseProvider(raw) {
|
|
4
|
+
const provider = raw.trim().toLowerCase();
|
|
5
|
+
if (!provider) {
|
|
6
|
+
return undefined;
|
|
7
|
+
}
|
|
8
|
+
if (!getProviders().includes(provider)) {
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
return provider;
|
|
12
|
+
}
|
|
13
|
+
function resolveModel(provider, modelId) {
|
|
14
|
+
return getModels(provider).find((candidate) => candidate.id === modelId);
|
|
15
|
+
}
|
|
16
|
+
export function parseSubagentLaunchModel(value) {
|
|
17
|
+
const raw = value.trim();
|
|
18
|
+
if (!raw) {
|
|
19
|
+
return { error: "must be a non-empty string in format <provider>/<model>:<effort>" };
|
|
20
|
+
}
|
|
21
|
+
const effortSeparator = raw.lastIndexOf(":");
|
|
22
|
+
if (effortSeparator <= 0 || effortSeparator >= raw.length - 1) {
|
|
23
|
+
return { error: "must use format <provider>/<model>:<effort>" };
|
|
24
|
+
}
|
|
25
|
+
const modelPart = raw.slice(0, effortSeparator).trim();
|
|
26
|
+
const effortPart = raw
|
|
27
|
+
.slice(effortSeparator + 1)
|
|
28
|
+
.trim()
|
|
29
|
+
.toLowerCase();
|
|
30
|
+
const providerSeparator = modelPart.indexOf("/");
|
|
31
|
+
if (providerSeparator <= 0 || providerSeparator >= modelPart.length - 1) {
|
|
32
|
+
return { error: "must use format <provider>/<model>:<effort>" };
|
|
33
|
+
}
|
|
34
|
+
const providerPart = modelPart.slice(0, providerSeparator);
|
|
35
|
+
const modelIdPart = modelPart.slice(providerSeparator + 1).trim();
|
|
36
|
+
if (!modelIdPart) {
|
|
37
|
+
return { error: "model id is required" };
|
|
38
|
+
}
|
|
39
|
+
const provider = parseProvider(providerPart);
|
|
40
|
+
if (!provider) {
|
|
41
|
+
return { error: `unknown provider '${providerPart.trim()}'` };
|
|
42
|
+
}
|
|
43
|
+
const model = resolveModel(provider, modelIdPart);
|
|
44
|
+
if (!model) {
|
|
45
|
+
return { error: `unknown model '${provider}/${modelIdPart}'` };
|
|
46
|
+
}
|
|
47
|
+
const reasoning = ReasoningEffortSchema.safeParse(effortPart);
|
|
48
|
+
if (!reasoning.success) {
|
|
49
|
+
return {
|
|
50
|
+
error: "invalid reasoning effort. expected one of: none, minimal, low, medium, high, xhigh",
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
const normalized = `${provider}/${model.id}:${reasoning.data}`;
|
|
54
|
+
return {
|
|
55
|
+
launchModel: {
|
|
56
|
+
model,
|
|
57
|
+
reasoning: reasoning.data,
|
|
58
|
+
normalized,
|
|
59
|
+
},
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
export function parseSubagentLaunchModelList(raw) {
|
|
63
|
+
if (raw === undefined) {
|
|
64
|
+
return {};
|
|
65
|
+
}
|
|
66
|
+
const values = typeof raw === "string" ? [raw] : Array.isArray(raw) ? raw : undefined;
|
|
67
|
+
if (!values) {
|
|
68
|
+
return { error: "must be a string or list of strings" };
|
|
69
|
+
}
|
|
70
|
+
const normalized = [];
|
|
71
|
+
const seen = new Set();
|
|
72
|
+
for (const entry of values) {
|
|
73
|
+
if (typeof entry !== "string") {
|
|
74
|
+
return { error: "must be a string or list of strings" };
|
|
75
|
+
}
|
|
76
|
+
const parsed = parseSubagentLaunchModel(entry);
|
|
77
|
+
if (parsed.error) {
|
|
78
|
+
return { error: parsed.error };
|
|
79
|
+
}
|
|
80
|
+
const spec = parsed.launchModel;
|
|
81
|
+
if (!spec || seen.has(spec.normalized)) {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
seen.add(spec.normalized);
|
|
85
|
+
normalized.push(spec.normalized);
|
|
86
|
+
}
|
|
87
|
+
return { launchModels: normalized };
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=launch_model.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"launch_model.js","sourceRoot":"","sources":["../../../src/core/subagents/launch_model.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGpD,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,QAAyB,CAAC,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,QAAyB,CAAC;AACnC,CAAC;AAED,SAAS,YAAY,CAAC,QAAuB,EAAE,OAAe;IAC5D,OAAO,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAa;IAIpD,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IACzB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,EAAE,KAAK,EAAE,kEAAkE,EAAE,CAAC;IACvF,CAAC;IAED,MAAM,eAAe,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7C,IAAI,eAAe,IAAI,CAAC,IAAI,eAAe,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9D,OAAO,EAAE,KAAK,EAAE,6CAA6C,EAAE,CAAC;IAClE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;IACvD,MAAM,UAAU,GAAG,GAAG;SACnB,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC;SAC1B,IAAI,EAAE;SACN,WAAW,EAAE,CAAC;IAEjB,MAAM,iBAAiB,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,iBAAiB,IAAI,CAAC,IAAI,iBAAiB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxE,OAAO,EAAE,KAAK,EAAE,6CAA6C,EAAE,CAAC;IAClE,CAAC;IAED,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAElE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC;IAC3C,CAAC;IAED,MAAM,QAAQ,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IAC7C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,KAAK,EAAE,qBAAqB,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC;IAChE,CAAC;IAED,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAClD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,KAAK,EAAE,kBAAkB,QAAQ,IAAI,WAAW,GAAG,EAAE,CAAC;IACjE,CAAC;IAED,MAAM,SAAS,GAAG,qBAAqB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC9D,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO;YACL,KAAK,EAAE,oFAAoF;SAC5F,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,GAAG,QAAQ,IAAI,KAAK,CAAC,EAAE,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;IAC/D,OAAO;QACL,WAAW,EAAE;YACX,KAAK;YACL,SAAS,EAAE,SAAS,CAAC,IAAI;YACzB,UAAU;SACX;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,GAAY;IAIvD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IACtF,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,KAAK,EAAE,qCAAqC,EAAE,CAAC;IAC1D,CAAC;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,EAAE,KAAK,EAAE,qCAAqC,EAAE,CAAC;QAC1D,CAAC;QAED,MAAM,MAAM,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;QAChC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YACvC,SAAS;QACX,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;AACtC,CAAC"}
|
|
@@ -35,11 +35,14 @@ function getInheritedSubagentTools(persona) {
|
|
|
35
35
|
return normalizeTools(selected);
|
|
36
36
|
}
|
|
37
37
|
export function resolveSubagentEffectiveSettings(args) {
|
|
38
|
-
const model = args.config.model ?? args.persona.model;
|
|
38
|
+
const model = args.launchModel?.model ?? args.config.model ?? args.persona.model;
|
|
39
39
|
const baseSettings = args.persona.settings ?? {};
|
|
40
40
|
const mergedSettings = args.config.settings
|
|
41
41
|
? { ...baseSettings, ...args.config.settings }
|
|
42
|
-
: baseSettings;
|
|
42
|
+
: { ...baseSettings };
|
|
43
|
+
if (args.launchModel) {
|
|
44
|
+
mergedSettings.reasoning = args.launchModel.reasoning;
|
|
45
|
+
}
|
|
43
46
|
const tools = args.config.tools
|
|
44
47
|
? normalizeTools(args.config.tools)
|
|
45
48
|
: getInheritedSubagentTools(args.persona);
|
|
@@ -69,15 +72,19 @@ export function formatSubagentsForPrompt(persona) {
|
|
|
69
72
|
if (!persona.subagents || Object.keys(persona.subagents).length === 0) {
|
|
70
73
|
return undefined;
|
|
71
74
|
}
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
.map(([name, cfg]) => {
|
|
75
|
+
const subagentLines = [];
|
|
76
|
+
for (const [name, cfg] of Object.entries(persona.subagents)) {
|
|
77
|
+
if (!cfg)
|
|
78
|
+
continue;
|
|
77
79
|
const description = getSubagentDescription(name, cfg) ?? "(no description)";
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
80
|
+
const launchModels = cfg.launchModels ?? [];
|
|
81
|
+
const launchModelsText = launchModels.length > 0
|
|
82
|
+
? `\n - launch models: ${launchModels.map((entry) => `\`${entry}\``).join(", ")}`
|
|
83
|
+
: "";
|
|
84
|
+
subagentLines.push(`- \`${name}\`: ${description}${launchModelsText}`);
|
|
85
|
+
}
|
|
86
|
+
if (subagentLines.length === 0)
|
|
87
|
+
return undefined;
|
|
88
|
+
return `\n\n### Available sub-agents\n\nYou have access to the following sub-agents:\n\n${subagentLines.join("\n")}`;
|
|
82
89
|
}
|
|
83
90
|
//# sourceMappingURL=registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/core/subagents/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,EACpB,eAAe,GAChB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACL,qBAAqB,
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/core/subagents/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Type } from "@sinclair/typebox";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
+
import { parseSubagentLaunchModel } from "../subagents/launch_model.js";
|
|
3
4
|
import { getSubagentDescription, resolveSubagentEffectiveSettings } from "../subagents/registry.js";
|
|
4
5
|
import { createToolError, createToolResult } from "../utils/messages.js";
|
|
5
6
|
import { buildSubagentUiText } from "./subagent_ui.js";
|
|
@@ -23,6 +24,10 @@ const SPAWN_AGENT_PROMPT_DESCRIPTION = [
|
|
|
23
24
|
"Include all necessary context and instructions in the prompt for the subagent to complete " +
|
|
24
25
|
"the request successfully.",
|
|
25
26
|
].join(" ");
|
|
27
|
+
const SPAWN_AGENT_MODEL_DESCRIPTION = [
|
|
28
|
+
"Optional launch override in format <provider>/<model>:<effort>.",
|
|
29
|
+
"The value must match one of the selected subagent's configured launch models.",
|
|
30
|
+
].join(" ");
|
|
26
31
|
export const SPAWN_AGENT_TOOL = {
|
|
27
32
|
name: TOOL_NAME_SPAWN_AGENT,
|
|
28
33
|
description: SPAWN_AGENT_DESCRIPTION,
|
|
@@ -30,25 +35,33 @@ export const SPAWN_AGENT_TOOL = {
|
|
|
30
35
|
name: Type.String({ description: SPAWN_AGENT_NAME_DESCRIPTION }),
|
|
31
36
|
title: Type.String({ description: SPAWN_AGENT_TITLE_DESCRIPTION }),
|
|
32
37
|
prompt: Type.String({ description: SPAWN_AGENT_PROMPT_DESCRIPTION }),
|
|
38
|
+
model: Type.Optional(Type.String({ description: SPAWN_AGENT_MODEL_DESCRIPTION })),
|
|
33
39
|
}, { additionalProperties: false }),
|
|
34
40
|
};
|
|
35
41
|
const spawnArgsSchema = z.object({
|
|
36
42
|
name: z.string().trim().catch(""),
|
|
37
43
|
title: z.string().trim().catch(""),
|
|
38
44
|
prompt: z.string().trim().catch(""),
|
|
45
|
+
model: z.string().trim().optional().catch(undefined),
|
|
39
46
|
});
|
|
40
47
|
function parseSpawnArgs(raw) {
|
|
41
48
|
const parsed = spawnArgsSchema.safeParse(raw);
|
|
42
|
-
return parsed.success ? parsed.data : { name: "", title: "", prompt: "" };
|
|
49
|
+
return parsed.success ? parsed.data : { name: "", title: "", prompt: "", model: undefined };
|
|
43
50
|
}
|
|
44
51
|
function formatSpawnToolResult(args) {
|
|
45
52
|
return [`id: ${args.id}`, `name: ${args.name}`, `title: ${args.title}`, "status: running"].join("\n");
|
|
46
53
|
}
|
|
54
|
+
function formatAllowedLaunchModels(launchModels) {
|
|
55
|
+
if (launchModels.length === 0) {
|
|
56
|
+
return "(none configured)";
|
|
57
|
+
}
|
|
58
|
+
return launchModels.map((entry) => `'${entry}'`).join(", ");
|
|
59
|
+
}
|
|
47
60
|
export function createSpawnAgentToolDefinition(backend) {
|
|
48
61
|
return {
|
|
49
62
|
schema: SPAWN_AGENT_TOOL,
|
|
50
63
|
async dispatch(toolCall, _riskLevel, signal, context) {
|
|
51
|
-
const { name, title, prompt } = parseSpawnArgs(toolCall.arguments);
|
|
64
|
+
const { name, title, prompt, model } = parseSpawnArgs(toolCall.arguments);
|
|
52
65
|
const headerTarget = title || "(subagent)";
|
|
53
66
|
const blocked = (reason, details) => {
|
|
54
67
|
const toolResult = createToolError(toolCall, reason);
|
|
@@ -101,10 +114,41 @@ export function createSpawnAgentToolDefinition(backend) {
|
|
|
101
114
|
title,
|
|
102
115
|
});
|
|
103
116
|
}
|
|
117
|
+
let launchModelOverride;
|
|
118
|
+
if (model !== undefined && !model) {
|
|
119
|
+
return blocked("model parameter must be a non-empty string in format <provider>/<model>:<effort>.", {
|
|
120
|
+
name,
|
|
121
|
+
title,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
if (model) {
|
|
125
|
+
const parsedLaunchModel = parseSubagentLaunchModel(model);
|
|
126
|
+
if (parsedLaunchModel.error || !parsedLaunchModel.launchModel) {
|
|
127
|
+
return blocked(`invalid model parameter: ${parsedLaunchModel.error}.`, {
|
|
128
|
+
name,
|
|
129
|
+
title,
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
const launchModels = personaConfig.launchModels ?? [];
|
|
133
|
+
if (launchModels.length === 0) {
|
|
134
|
+
return blocked(`subagent '${name}' does not allow launch model overrides. allowed values: ${formatAllowedLaunchModels(launchModels)}.`, {
|
|
135
|
+
name,
|
|
136
|
+
title,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
if (!launchModels.includes(parsedLaunchModel.launchModel.normalized)) {
|
|
140
|
+
return blocked(`model '${parsedLaunchModel.launchModel.normalized}' is not allowed for subagent '${name}'. allowed values: ${formatAllowedLaunchModels(launchModels)}.`, {
|
|
141
|
+
name,
|
|
142
|
+
title,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
launchModelOverride = parsedLaunchModel.launchModel;
|
|
146
|
+
}
|
|
104
147
|
const effectiveSettings = resolveSubagentEffectiveSettings({
|
|
105
148
|
persona,
|
|
106
149
|
config: personaConfig,
|
|
107
150
|
riskLevel: context.riskLevel ?? "read-only",
|
|
151
|
+
launchModel: launchModelOverride,
|
|
108
152
|
});
|
|
109
153
|
const runtimeConfig = {
|
|
110
154
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,gCAAgC,EAAE,MAAM,0BAA0B,CAAC;AAGpG,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AASzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,uBAAuB,GAAG;IAC9B,8DAA8D;IAC9D,yDAAyD;IACzD,8EAA8E;CAC/E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,4BAA4B,GAAG;IACnC,uBAAuB;IACvB,kEAAkE;CACnE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,6BAA6B,GAAG;IACpC,gEAAgE;IAChE,6EAA6E;CAC9E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,8BAA8B,GAAG;IACrC,qCAAqC;IACrC,2FAA2F;IAC3F,4FAA4F;QAC1F,2BAA2B;CAC9B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ,MAAM,CAAC,MAAM,gBAAgB,GAAS;IACpC,IAAI,EAAE,qBAAqB;IAC3B,WAAW,EAAE,uBAAuB;IACpC,UAAU,EAAE,IAAI,CAAC,MAAM,CACrB;QACE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,4BAA4B,EAAE,CAAC;QAChE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC;QAClE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,8BAA8B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn_agent.js","sourceRoot":"","sources":["../../../src/core/tools/spawn_agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { isContextOverflow } from "@mariozechner/pi-ai";
|
|
2
|
-
const RETRYABLE_ERROR_REGEX = /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated/i;
|
|
2
|
+
const RETRYABLE_ERROR_REGEX = /overloaded|high.?demand|peak.?load|maximum.?usage.?size|provisioned.?throughput|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated/i;
|
|
3
3
|
function asAssistantMessage(error) {
|
|
4
4
|
if (!error || typeof error !== "object") {
|
|
5
5
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto_retry.js","sourceRoot":"","sources":["../../../src/core/utils/auto_retry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAOxD,MAAM,qBAAqB,GACzB,
|
|
1
|
+
{"version":3,"file":"auto_retry.js","sourceRoot":"","sources":["../../../src/core/utils/auto_retry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAOxD,MAAM,qBAAqB,GACzB,4SAA4S,CAAC;AAE/S,SAAS,kBAAkB,CAAC,KAAc;IACxC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,OAAO,GAAG,KAAkC,CAAC;IACnD,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;QACnE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,OAA2B,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAoB;IAChE,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;QACpD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/core/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const APP_VERSION = "0.2.
|
|
1
|
+
export const APP_VERSION = "0.2.38";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|