@modular-prompt/process 0.4.18 → 0.5.2
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/workflows/agentic-workflow/agentic-workflow.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/agentic-workflow.js +18 -15
- package/dist/workflows/agentic-workflow/agentic-workflow.js.map +1 -1
- package/dist/workflows/agentic-workflow/process/builtin-tools.d.ts +12 -6
- package/dist/workflows/agentic-workflow/process/builtin-tools.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/process/builtin-tools.js +41 -41
- package/dist/workflows/agentic-workflow/process/builtin-tools.js.map +1 -1
- package/dist/workflows/agentic-workflow/process/query-with-tools.d.ts +1 -0
- package/dist/workflows/agentic-workflow/process/query-with-tools.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/process/query-with-tools.js +3 -0
- package/dist/workflows/agentic-workflow/process/query-with-tools.js.map +1 -1
- package/dist/workflows/agentic-workflow/process/topological-sort.d.ts +19 -0
- package/dist/workflows/agentic-workflow/process/topological-sort.d.ts.map +1 -0
- package/dist/workflows/agentic-workflow/process/topological-sort.js +94 -0
- package/dist/workflows/agentic-workflow/process/topological-sort.js.map +1 -0
- package/dist/workflows/agentic-workflow/task-types/execution-tasks.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/execution-tasks.js +6 -4
- package/dist/workflows/agentic-workflow/task-types/execution-tasks.js.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/index.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/index.js +1 -0
- package/dist/workflows/agentic-workflow/task-types/index.js.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/planning.d.ts +2 -2
- package/dist/workflows/agentic-workflow/task-types/planning.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/planning.js +29 -15
- package/dist/workflows/agentic-workflow/task-types/planning.js.map +1 -1
- package/dist/workflows/agentic-workflow/types.d.ts +8 -0
- package/dist/workflows/agentic-workflow/types.d.ts.map +1 -1
- package/dist/workflows/concat-process-workflow.d.ts.map +1 -1
- package/dist/workflows/concat-process-workflow.js +4 -0
- package/dist/workflows/concat-process-workflow.js.map +1 -1
- package/dist/workflows/default-workflow.d.ts.map +1 -1
- package/dist/workflows/default-workflow.js +1 -0
- package/dist/workflows/default-workflow.js.map +1 -1
- package/dist/workflows/dialogue-workflow.d.ts.map +1 -1
- package/dist/workflows/dialogue-workflow.js +2 -0
- package/dist/workflows/dialogue-workflow.js.map +1 -1
- package/dist/workflows/self-prompting-workflow/index.d.ts +1 -3
- package/dist/workflows/self-prompting-workflow/index.d.ts.map +1 -1
- package/dist/workflows/self-prompting-workflow/index.js +1 -3
- package/dist/workflows/self-prompting-workflow/index.js.map +1 -1
- package/dist/workflows/self-prompting-workflow/self-prompting-workflow.d.ts +1 -0
- package/dist/workflows/self-prompting-workflow/self-prompting-workflow.d.ts.map +1 -1
- package/dist/workflows/self-prompting-workflow/self-prompting-workflow.js +1 -0
- package/dist/workflows/self-prompting-workflow/self-prompting-workflow.js.map +1 -1
- package/dist/workflows/stream-workflow.d.ts.map +1 -1
- package/dist/workflows/stream-workflow.js +3 -0
- package/dist/workflows/stream-workflow.js.map +1 -1
- package/dist/workflows/summarize-workflow.d.ts.map +1 -1
- package/dist/workflows/summarize-workflow.js +4 -0
- package/dist/workflows/summarize-workflow.js.map +1 -1
- package/dist/workflows/tool-agent-workflow.d.ts.map +1 -1
- package/dist/workflows/tool-agent-workflow.js +5 -0
- package/dist/workflows/tool-agent-workflow.js.map +1 -1
- package/dist/workflows/types.d.ts +1 -0
- package/dist/workflows/types.d.ts.map +1 -1
- package/dist/workflows/types.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentic-workflow.d.ts","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/agentic-workflow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,YAAY,EAA0C,MAAM,sBAAsB,CAAC;AAGjG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,KAAK,EAEV,sBAAsB,EACtB,kBAAkB,EAKnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"agentic-workflow.d.ts","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/agentic-workflow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,KAAK,EAAE,YAAY,EAA0C,MAAM,sBAAsB,CAAC;AAGjG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,OAAO,KAAK,EAEV,sBAAsB,EACtB,kBAAkB,EAKnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,oBAAoB,CAAC;AAkLrE,wBAAsB,cAAc,CAAC,CAAC,EACpC,MAAM,EAAE,WAAW,EACnB,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EACvB,OAAO,EAAE,CAAC,EACV,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAwJ7C"}
|
|
@@ -16,21 +16,10 @@ import { DEFAULT_DRIVER_ROLE } from './types.js';
|
|
|
16
16
|
import { resolveDriver } from '../driver-input.js';
|
|
17
17
|
import { getTaskTypeConfig, taskCommon, MAX_TOKENS_VALUES } from './task-types/index.js';
|
|
18
18
|
import { replanningModule } from './task-types/planning.js';
|
|
19
|
-
import { createPlanningTools, createExecutionBuiltinTools, } from './process/builtin-tools.js';
|
|
19
|
+
import { createPlanningTools, createExecutionBuiltinTools, TASK_TYPE_TOOL_NAMES, } from './process/builtin-tools.js';
|
|
20
20
|
import { queryWithTools, rethrowAsWorkflowError } from './process/query-with-tools.js';
|
|
21
|
+
import { topologicalSortTasks } from './process/topological-sort.js';
|
|
21
22
|
const logger = new Logger({ prefix: 'process', context: 'agentic', accumulate: true });
|
|
22
|
-
/**
|
|
23
|
-
* Strip <think>...</think> blocks from model output.
|
|
24
|
-
* Thinking traces are internal reasoning and should not be passed to subsequent tasks.
|
|
25
|
-
*/
|
|
26
|
-
function stripThinkBlocks(text) {
|
|
27
|
-
return text
|
|
28
|
-
.replace(/<think>[\s\S]*?<\/think>\s*/g, '')
|
|
29
|
-
.replace(/^[\s\S]*?<\/think>\s*/g, '')
|
|
30
|
-
.replace(/<\|channel>thought[\s\S]*?<channel\|>\s*/g, '')
|
|
31
|
-
.replace(/^[\s\S]*?<channel\|>\s*/g, '')
|
|
32
|
-
.trim();
|
|
33
|
-
}
|
|
34
23
|
/**
|
|
35
24
|
* Check if the resolved user module's messages end with a tool result.
|
|
36
25
|
* This indicates a re-planning scenario where a previous workflow broke
|
|
@@ -78,7 +67,8 @@ function getBuiltinToolsForTask(taskType, taskList, currentIndex, _context) {
|
|
|
78
67
|
const config = getTaskTypeConfig(taskType);
|
|
79
68
|
const toolNames = new Set(config.builtinToolNames);
|
|
80
69
|
const allTools = [];
|
|
81
|
-
|
|
70
|
+
const hasPlanningTools = [...TASK_TYPE_TOOL_NAMES].some(name => toolNames.has(name));
|
|
71
|
+
if (hasPlanningTools) {
|
|
82
72
|
allTools.push(...createPlanningTools(taskList, currentIndex));
|
|
83
73
|
}
|
|
84
74
|
if (toolNames.has('__replan') || toolNames.has('__time')) {
|
|
@@ -137,7 +127,8 @@ async function executeTask(driver, userModule, context, task, taskIndex, taskLis
|
|
|
137
127
|
taskName: task.name,
|
|
138
128
|
taskType: task.taskType,
|
|
139
129
|
instruction: task.instruction,
|
|
140
|
-
result:
|
|
130
|
+
result: result.content,
|
|
131
|
+
thinkingContent: result.thinkingContent,
|
|
141
132
|
toolCallLog: result.toolCallLog.length > 0 ? result.toolCallLog : undefined,
|
|
142
133
|
pendingToolCalls: result.pendingToolCalls,
|
|
143
134
|
metadata: {
|
|
@@ -169,6 +160,7 @@ export async function agenticProcess(driver, module, context, options = {}) {
|
|
|
169
160
|
taskList: resumeState?.taskList ?? bootstrap(userModule, enablePlanning),
|
|
170
161
|
executionLog: resumeState?.executionLog ? [...resumeState.executionLog] : [],
|
|
171
162
|
currentTaskIndex: 0,
|
|
163
|
+
availableTools: tools.map(t => ({ name: t.name, description: t.description ?? '' })),
|
|
172
164
|
};
|
|
173
165
|
const { taskList, executionLog } = internalContext;
|
|
174
166
|
const startIndex = executionLog.length;
|
|
@@ -183,6 +175,11 @@ export async function agenticProcess(driver, module, context, options = {}) {
|
|
|
183
175
|
internalContext.currentTaskIndex = i;
|
|
184
176
|
const logEntry = await executeTask(driver, userModule, internalContext, task, i, taskList, tools);
|
|
185
177
|
executionLog.push(logEntry);
|
|
178
|
+
// After planning completes, topologically sort newly registered tasks by dep
|
|
179
|
+
if (task.taskType === 'planning') {
|
|
180
|
+
const newTasks = topologicalSortTasks(taskList.slice(i + 1));
|
|
181
|
+
taskList.splice(i + 1, taskList.length - i - 1, ...newTasks);
|
|
182
|
+
}
|
|
186
183
|
// Check if __replan was called
|
|
187
184
|
const hasReplanCall = logEntry.toolCallLog?.some(call => call.name === '__replan');
|
|
188
185
|
if (hasReplanCall) {
|
|
@@ -225,6 +222,11 @@ export async function agenticProcess(driver, module, context, options = {}) {
|
|
|
225
222
|
// Final output
|
|
226
223
|
const lastLog = executionLog[executionLog.length - 1];
|
|
227
224
|
const finalResult = lastLog?.result || '';
|
|
225
|
+
const thinkingParts = executionLog
|
|
226
|
+
.filter(log => log.thinkingContent)
|
|
227
|
+
.map(log => `[${log.taskType}: ${log.instruction}]\n${log.thinkingContent}`);
|
|
228
|
+
const aggregatedThinkingContent = thinkingParts.length > 0
|
|
229
|
+
? thinkingParts.join('\n\n') : undefined;
|
|
228
230
|
let output;
|
|
229
231
|
if (includeThinking && executionLog.length > 1) {
|
|
230
232
|
const intermediateLog = executionLog.slice(0, -1);
|
|
@@ -243,6 +245,7 @@ export async function agenticProcess(driver, module, context, options = {}) {
|
|
|
243
245
|
logger.info('[end] agentic workflow');
|
|
244
246
|
return {
|
|
245
247
|
output,
|
|
248
|
+
thinkingContent: aggregatedThinkingContent,
|
|
246
249
|
context: {
|
|
247
250
|
taskList,
|
|
248
251
|
executionLog,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentic-workflow.js","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/agentic-workflow.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAUxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAoB,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACL,mBAAmB,EACnB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"agentic-workflow.js","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/agentic-workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,18 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Agentic workflow 組み込みツール定義 (
|
|
2
|
+
* Agentic workflow 組み込みツール定義 (v3)
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
4
|
+
* Planning tools:
|
|
5
|
+
* タスクタイプ名をそのままツール名として使用(think, verify, act, ...)
|
|
6
|
+
* モデルが自然に呼びやすい形式
|
|
7
|
+
*
|
|
8
|
+
* Execution tools:
|
|
9
|
+
* __replan: 再プランニング要求(execution タスクから利用可能)
|
|
10
|
+
* __time: 現在時刻取得
|
|
7
11
|
*/
|
|
8
12
|
import type { ToolSpec, AgenticTask } from '../types.js';
|
|
9
13
|
export declare const BUILTIN_TOOL_PREFIX = "__";
|
|
14
|
+
/** タスクタイプ名ツール(planning用) */
|
|
15
|
+
export declare const TASK_TYPE_TOOL_NAMES: Set<string>;
|
|
10
16
|
/**
|
|
11
17
|
* 組み込みツールかどうかを判定
|
|
12
18
|
*/
|
|
@@ -14,8 +20,8 @@ export declare function isBuiltinTool(name: string): boolean;
|
|
|
14
20
|
/**
|
|
15
21
|
* Planning フェーズ用の組み込みツールを生成
|
|
16
22
|
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
23
|
+
* タスクタイプ名をそのままツール名として使用:
|
|
24
|
+
* think(), verify(), act(), extractContext(), recall(), determine(), output()
|
|
19
25
|
*/
|
|
20
26
|
export declare function createPlanningTools(taskList: AgenticTask[], currentIndex: number): ToolSpec[];
|
|
21
27
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAY,MAAM,aAAa,CAAC;AAInE,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,4BAA4B;AAC5B,eAAO,MAAM,oBAAoB,aAAmE,CAAC;AAErG;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AAwFD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,QAAQ,EAAE,CA4B7F;AAoED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,WAAW,EAAE,EACvB,YAAY,EAAE,MAAM,GACnB,QAAQ,EAAE,CAKZ"}
|
|
@@ -1,33 +1,31 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Agentic workflow 組み込みツール定義 (
|
|
2
|
+
* Agentic workflow 組み込みツール定義 (v3)
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
4
|
+
* Planning tools:
|
|
5
|
+
* タスクタイプ名をそのままツール名として使用(think, verify, act, ...)
|
|
6
|
+
* モデルが自然に呼びやすい形式
|
|
7
|
+
*
|
|
8
|
+
* Execution tools:
|
|
9
|
+
* __replan: 再プランニング要求(execution タスクから利用可能)
|
|
10
|
+
* __time: 現在時刻取得
|
|
7
11
|
*/
|
|
8
12
|
import { EXECUTION_TASK_DEFS } from '../task-types/execution-tasks.js';
|
|
9
13
|
export const BUILTIN_TOOL_PREFIX = '__';
|
|
10
|
-
/**
|
|
11
|
-
const
|
|
14
|
+
/** タスクタイプ名ツール(planning用) */
|
|
15
|
+
export const TASK_TYPE_TOOL_NAMES = new Set([...Object.keys(EXECUTION_TASK_DEFS), 'output']);
|
|
12
16
|
/**
|
|
13
17
|
* 組み込みツールかどうかを判定
|
|
14
18
|
*/
|
|
15
19
|
export function isBuiltinTool(name) {
|
|
16
|
-
return name.startsWith(BUILTIN_TOOL_PREFIX);
|
|
20
|
+
return name.startsWith(BUILTIN_TOOL_PREFIX) || TASK_TYPE_TOOL_NAMES.has(name);
|
|
17
21
|
}
|
|
18
|
-
|
|
22
|
+
/** 有効な実行タスクタイプ(planning は除外 — モデルが指定する対象外) */
|
|
23
|
+
const VALID_TASK_TYPES = new Set([...Object.keys(EXECUTION_TASK_DEFS), 'output']);
|
|
24
|
+
const COMMON_TASK_PARAMS = {
|
|
19
25
|
type: 'object',
|
|
20
26
|
properties: {
|
|
21
27
|
name: { type: 'string', description: 'Short identifier for this task (e.g. "search", "analyze"). Used in dep references and display.' },
|
|
22
28
|
instruction: { type: 'string', description: 'Description of the deliverable this task produces.' },
|
|
23
|
-
taskType: {
|
|
24
|
-
type: 'string',
|
|
25
|
-
enum: [...Object.keys(EXECUTION_TASK_DEFS), 'output'],
|
|
26
|
-
description: Object.entries(EXECUTION_TASK_DEFS)
|
|
27
|
-
.map(([name, def]) => `${name}: ${def.toolDescription}`)
|
|
28
|
-
.concat(['output: produces the final user-facing response (must be the last task)'])
|
|
29
|
-
.join('. ') + '. Default: think',
|
|
30
|
-
},
|
|
31
29
|
reason: {
|
|
32
30
|
type: 'string',
|
|
33
31
|
description: 'Why this task is necessary — what gap it fills in the deliverable chain.',
|
|
@@ -59,10 +57,10 @@ const TASK_ENTRY_SCHEMA = {
|
|
|
59
57
|
description: 'Position in the task list to insert at. If omitted, the task is scheduled as the next task. Values before the current task are ignored.',
|
|
60
58
|
},
|
|
61
59
|
},
|
|
62
|
-
required: ['name', 'instruction', '
|
|
60
|
+
required: ['name', 'instruction', 'reason'],
|
|
63
61
|
};
|
|
64
62
|
/**
|
|
65
|
-
* TaskEntry
|
|
63
|
+
* TaskEntry からタスクを登録する
|
|
66
64
|
* @param currentIndex 現在実行中のタスクのインデックス。insertAt がこれ以下の場合はクランプされる。
|
|
67
65
|
*/
|
|
68
66
|
function registerTask(taskList, entry, currentIndex) {
|
|
@@ -76,6 +74,7 @@ function registerTask(taskList, entry, currentIndex) {
|
|
|
76
74
|
name: entry.name,
|
|
77
75
|
instruction: entry.instruction,
|
|
78
76
|
taskType,
|
|
77
|
+
dep: entry.dep,
|
|
79
78
|
driverRole: entry.driverRole,
|
|
80
79
|
withoutInputs: entry.withoutInputs,
|
|
81
80
|
withoutMessages: entry.withoutMessages,
|
|
@@ -89,27 +88,33 @@ function registerTask(taskList, entry, currentIndex) {
|
|
|
89
88
|
/**
|
|
90
89
|
* Planning フェーズ用の組み込みツールを生成
|
|
91
90
|
*
|
|
92
|
-
*
|
|
93
|
-
*
|
|
91
|
+
* タスクタイプ名をそのままツール名として使用:
|
|
92
|
+
* think(), verify(), act(), extractContext(), recall(), determine(), output()
|
|
94
93
|
*/
|
|
95
94
|
export function createPlanningTools(taskList, currentIndex) {
|
|
96
95
|
let insertOffset = 0;
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
96
|
+
const outputDescription = 'produces the final user-facing response (must be the last task)';
|
|
97
|
+
const taskTypeEntries = [
|
|
98
|
+
...Object.entries(EXECUTION_TASK_DEFS).map(([name, def]) => [name, def.toolDescription]),
|
|
99
|
+
['output', outputDescription],
|
|
100
|
+
];
|
|
101
|
+
return taskTypeEntries.map(([typeName, description]) => ({
|
|
102
|
+
definition: {
|
|
103
|
+
name: typeName,
|
|
104
|
+
description: `Register a "${typeName}" task: ${description}. Call once per task.`,
|
|
105
|
+
parameters: COMMON_TASK_PARAMS,
|
|
106
|
+
},
|
|
107
|
+
handler: async (args) => {
|
|
108
|
+
const entry = args;
|
|
109
|
+
entry.taskType = typeName;
|
|
110
|
+
if (!entry.instruction) {
|
|
111
|
+
throw new Error('Provide an "instruction" field.');
|
|
112
|
+
}
|
|
113
|
+
registerTask(taskList, entry, currentIndex + insertOffset);
|
|
114
|
+
insertOffset++;
|
|
115
|
+
return `Registered: [${entry.name}] (${typeName})`;
|
|
116
|
+
},
|
|
117
|
+
}));
|
|
113
118
|
}
|
|
114
119
|
/**
|
|
115
120
|
* 現在時刻を返す組み込みツール
|
|
@@ -135,13 +140,8 @@ const timeTool = {
|
|
|
135
140
|
};
|
|
136
141
|
},
|
|
137
142
|
};
|
|
138
|
-
/**
|
|
139
|
-
* 再プランニング要求ツール
|
|
140
|
-
* ワークフロー側で検出され、実際の再プランニングが実行される
|
|
141
|
-
*/
|
|
142
143
|
/**
|
|
143
144
|
* Execution フェーズ用の __replan ツールを生成
|
|
144
|
-
* タスクリストと現在位置を参照してログに残す
|
|
145
145
|
*/
|
|
146
146
|
function createReplanTool(taskList, currentIndex) {
|
|
147
147
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAExC,4BAA4B;AAC5B,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAS,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;AAErG;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAChF,CAAC;AAkBD,8CAA8C;AAC9C,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAS,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE1F,MAAM,kBAAkB,GAAG;IACzB,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,gGAAgG,EAAE;QACvI,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,oDAAoD,EAAE;QAClG,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,0EAA0E;SACxF;QACD,GAAG,EAAE;YACH,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACzB,WAAW,EAAE,qGAAqG;SACnH;QACD,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC;YACzD,WAAW,EAAE,+CAA+C;SAC7D;QACD,aAAa,EAAE;YACb,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,4FAA4F;SAC1G;QACD,eAAe,EAAE;YACf,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,4FAA4F;SAC1G;QACD,gBAAgB,EAAE;YAChB,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,8FAA8F;SAC5G;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,yIAAyI;SACvJ;KACF;IACD,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC;CACnC,CAAC;AAEX;;;GAGG;AACH,SAAS,YAAY,CAAC,QAAuB,EAAE,KAAgB,EAAE,YAAoB;IACnF,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,IAAI,OAAO,CAAC;IAC1C,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,mBAAmB,KAAK,EAAE,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,QAAQ,GAAG,OAAmB,CAAC;IACrC,MAAM,IAAI,GAAgB;QACxB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,QAAQ;QACR,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,UAAU,EAAE,KAAK,CAAC,UAAmC;QACrD,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACzC,CAAC;IAEF,MAAM,WAAW,GAAG,YAAY,GAAG,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC;IACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;IACpD,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAuB,EAAE,YAAoB;IAC/E,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,MAAM,iBAAiB,GAAG,iEAAiE,CAAC;IAE5F,MAAM,eAAe,GAA4B;QAC/C,GAAG,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,CAAqB,CAAC;QAC5G,CAAC,QAAQ,EAAE,iBAAiB,CAAC;KAC9B,CAAC;IAEF,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QACvD,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,eAAe,QAAQ,WAAW,WAAW,uBAAuB;YACjF,UAAU,EAAE,kBAAkB;SAC/B;QACD,OAAO,EAAE,KAAK,EAAE,IAA6B,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,IAA4B,CAAC;YAC3C,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC1B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBACvB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACrD,CAAC;YACD,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC;YAC3D,YAAY,EAAE,CAAC;YAEf,OAAO,gBAAgB,KAAK,CAAC,IAAI,MAAM,QAAQ,GAAG,CAAC;QACrD,CAAC;KACF,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,QAAQ,GAAa;IACzB,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,gCAAgC;QAC7C,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE;SACf;KACF;IACD,OAAO,EAAE,KAAK,IAAI,EAAE;QAClB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC;QAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC;QAClE,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE;YACtB,KAAK,EAAE,GAAG,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC;YAC/C,MAAM;YACN,QAAQ;SACT,CAAC;IACJ,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,SAAS,gBAAgB,CAAC,QAAuB,EAAE,YAAoB;IACrE,OAAO;QACL,UAAU,EAAE;YACV,IAAI,EAAE,UAAU;YAChB,WAAW,EAAE,+HAA+H;YAC5I,UAAU,EAAE;gBACV,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,4BAA4B;qBAC1C;iBACF;aACF;SACF;QACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACtB,MAAM,SAAS,GAAG,QAAQ;iBACvB,KAAK,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC;iBAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,QAAQ,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC/E,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,MAAM,SAAS,GAAG,QAAQ;iBACvB,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC;iBACvB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,YAAY,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,IAAI,GAAG,MAAM,CAAC,CAAC,QAAQ,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC9F,IAAI,CAAC,IAAI,CAAC,CAAC;YAEd,OAAO;gBACL,0BAA0B,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE;gBACxD,EAAE;gBACF,kBAAkB;gBAClB,SAAS,IAAI,QAAQ;gBACrB,EAAE;gBACF,oCAAoC;gBACpC,SAAS,IAAI,QAAQ;aACtB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B,CACzC,QAAuB,EACvB,YAAoB;IAEpB,OAAO;QACL,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC;QACxC,QAAQ;KACT,CAAC;AACJ,CAAC"}
|
|
@@ -24,6 +24,7 @@ export interface QueryWithToolsOptions {
|
|
|
24
24
|
}
|
|
25
25
|
export interface QueryWithToolsResult {
|
|
26
26
|
content: string;
|
|
27
|
+
thinkingContent?: string;
|
|
27
28
|
toolCallLog: ToolCallLog[];
|
|
28
29
|
/** External tool calls that the LLM requested (not executed) */
|
|
29
30
|
pendingToolCalls?: ToolCall[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-with-tools.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/query-with-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAoD,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEvH,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAyCzD,MAAM,WAAW,qBAAqB;IACpC,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,EAAE,CAAC;IAC3B,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC9B,sCAAsC;IACtC,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,mBAAmB;IACnB,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,8BAA8B;IAC9B,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC;IACxB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,cAAc,EACxB,YAAY,EAAE,QAAQ,EAAE,EACxB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"query-with-tools.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/query-with-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAoD,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEvH,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAyCzD,MAAM,WAAW,qBAAqB;IACpC,4EAA4E;IAC5E,gBAAgB,CAAC,EAAE,cAAc,EAAE,CAAC;IACpC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,WAAW,EAAE,CAAC;IAC3B,gEAAgE;IAChE,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC9B,sCAAsC;IACtC,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,mBAAmB;IACnB,aAAa,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACrC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,8BAA8B;IAC9B,UAAU,CAAC,EAAE,QAAQ,EAAE,CAAC;IACxB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,QAAQ,EAChB,QAAQ,EAAE,cAAc,EACxB,YAAY,EAAE,QAAQ,EAAE,EACxB,OAAO,GAAE,qBAA0B,GAClC,OAAO,CAAC,oBAAoB,CAAC,CA+H/B;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,KAAK,CAGP"}
|
|
@@ -67,6 +67,7 @@ export async function queryWithTools(driver, resolved, builtinTools, options = {
|
|
|
67
67
|
...(options.maxTokens ? { maxTokens: options.maxTokens } : {}),
|
|
68
68
|
};
|
|
69
69
|
let retryCount = 0;
|
|
70
|
+
let lastThinkingContent;
|
|
70
71
|
const allUsages = [];
|
|
71
72
|
const allLogEntries = [];
|
|
72
73
|
const allErrors = [];
|
|
@@ -77,6 +78,7 @@ export async function queryWithTools(driver, resolved, builtinTools, options = {
|
|
|
77
78
|
allErrors.push(lastResult.errors);
|
|
78
79
|
return {
|
|
79
80
|
content,
|
|
81
|
+
thinkingContent: lastThinkingContent,
|
|
80
82
|
toolCallLog,
|
|
81
83
|
consumedUsage: aggregateUsage(allUsages),
|
|
82
84
|
responseUsage: lastResult.usage,
|
|
@@ -88,6 +90,7 @@ export async function queryWithTools(driver, resolved, builtinTools, options = {
|
|
|
88
90
|
};
|
|
89
91
|
while (true) {
|
|
90
92
|
const queryResult = await driver.query(prompt, queryOptions);
|
|
93
|
+
lastThinkingContent = queryResult.thinkingContent;
|
|
91
94
|
qLogger.verbose('[output]', queryResult.content);
|
|
92
95
|
const content = queryResult.content || '';
|
|
93
96
|
// No tool calls → return
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-with-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/query-with-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3E,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AAEvF;;GAEG;AACH,KAAK,UAAU,uBAAuB,CACpC,SAAqB,EACrB,YAAwB,EACxB,MAAc;IAEd,MAAM,OAAO,GAA+B,EAAE,CAAC;IAC/C,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;gBAC/D,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,IAAI,EAAE;aACzD,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC9C,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;gBAC/D,IAAI,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM;aAClE,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;gBAC/D,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;
|
|
1
|
+
{"version":3,"file":"query-with-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/query-with-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3E,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;AAEvF;;GAEG;AACH,KAAK,UAAU,uBAAuB,CACpC,SAAqB,EACrB,YAAwB,EACxB,MAAc;IAEd,MAAM,OAAO,GAA+B,EAAE,CAAC;IAC/C,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;gBAC/D,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,IAAI,EAAE;aACzD,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC9C,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;gBAC/D,IAAI,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM;aAClE,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;gBAC/D,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA8BD;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAgB,EAChB,QAAwB,EACxB,YAAwB,EACxB,UAAiC,EAAE;IAEnC,MAAM,EAAE,gBAAgB,GAAG,EAAE,EAAE,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;IACpF,MAAM,WAAW,GAAG;QAClB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;QACtC,GAAG,gBAAgB;KACpB,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtE,MAAM,WAAW,GAAkB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QACvD,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,MAAoB;QACtD,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/D,CAAC;IAEF,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,mBAAuC,CAAC;IAC5C,MAAM,SAAS,GAAyC,EAAE,CAAC;IAC3D,MAAM,aAAa,GAA+B,EAAE,CAAC;IACrD,MAAM,SAAS,GAA+B,EAAE,CAAC;IAEjD,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,UAAuB,EAAE,KAAqC,EAAwB,EAAE;QAC5H,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACjC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC1C,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5C,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAClC,OAAO;YACL,OAAO;YACP,eAAe,EAAE,mBAAmB;YACpC,WAAW;YACX,aAAa,EAAE,cAAc,CAAC,SAAS,CAAC;YACxC,aAAa,EAAE,UAAU,CAAC,KAAK;YAC/B,YAAY,EAAE,UAAU,CAAC,YAAY;YACrC,UAAU,EAAE,mBAAmB,CAAC,aAAa,CAAC;YAC9C,MAAM,EAAE,mBAAmB,CAAC,SAAS,CAAC;YACtC,GAAG,KAAK;SACT,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC7D,mBAAmB,GAAG,WAAW,CAAC,eAAe,CAAC;QAClD,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;QAEjD,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;QAE1C,yBAAyB;QACzB,IAAI,CAAC,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjE,OAAO,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC3C,CAAC;QAED,iBAAiB;QACjB,KAAK,MAAM,EAAE,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,gDAAgD;QAChD,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,MAAM,aAAa,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAClF,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAElF,wBAAwB;QACxB,MAAM,cAAc,GAA+B,YAAY,CAAC,MAAM,GAAG,CAAC;YACxE,CAAC,CAAC,MAAM,uBAAuB,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC;YACpE,CAAC,CAAC,EAAE,CAAC;QAEP,oCAAoC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,WAAW,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC1B,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;gBACpC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK;aAChC,CAAC,CAAC;QACL,CAAC;QAED,gDAAgD;QAChD,MAAM,cAAc,GAA+B,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YACzE,IAAI,EAAE,SAAkB,EAAE,IAAI,EAAE,MAAe,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI;YACjF,IAAI,EAAE,OAAgB;YACtB,KAAK,EAAE,kBAAkB,EAAE,CAAC,IAAI,uBAAuB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;SACjG,CAAC,CAAC,CAAC;QAEJ,mBAAmB;QACnB,MAAM,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;QACtE,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,gBAAgB,IAAI,eAAe,CAAC;QAEtD,6EAA6E;QAC7E,iFAAiF;QACjF,kDAAkD;QAClD,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,OAAO,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACrF,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC3C,CAAC;QAED,yDAAyD;QACzD,IAAI,UAAU,IAAI,UAAU,EAAE,CAAC;YAC7B,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,iBAAiB,UAAU,UAAU,CAAC,CAAC;YACzE,OAAO,WAAW,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC3C,CAAC;QAED,wDAAwD;QACxD,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAClC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEnC,kEAAkE;QAClE,UAAU,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,UAAU,IAAI,UAAU,qBAAqB,CAAC,CAAC;QAElF,MAAM,gBAAgB,GAA2B;YAC/C,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;YACpD,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC;QACF,MAAM,cAAc,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,cAAc,CAAC,CAAC;QAE9D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,cAAc,CAAC,CAAC;QAExD,2DAA2D;QAC3D,YAAY,CAAC,UAAU,GAAG,MAAM,CAAC;IACnC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,KAAc,EACd,OAAgB,EAChB,OAAgC;IAEhC,IAAI,KAAK,YAAY,sBAAsB;QAAE,MAAM,KAAK,CAAC;IACzD,MAAM,IAAI,sBAAsB,CAAC,KAAc,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACrE,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Topological sort for agentic workflow tasks based on dep field.
|
|
3
|
+
*
|
|
4
|
+
* Uses Kahn's algorithm (in-degree based) for stable topological ordering.
|
|
5
|
+
* Tasks without dep maintain their relative order.
|
|
6
|
+
* Output tasks are always placed at the end.
|
|
7
|
+
*/
|
|
8
|
+
import type { AgenticTask } from '../types.js';
|
|
9
|
+
/**
|
|
10
|
+
* Topologically sort tasks based on their dep field.
|
|
11
|
+
*
|
|
12
|
+
* - Tasks with no dep are treated as having in-degree 0.
|
|
13
|
+
* - Among tasks with equal priority, original array order is preserved (stable).
|
|
14
|
+
* - Output tasks are excluded from sorting and appended at the end.
|
|
15
|
+
* - Circular dependencies: warns and returns original order.
|
|
16
|
+
* - Missing dep references: warns and ignores.
|
|
17
|
+
*/
|
|
18
|
+
export declare function topologicalSortTasks(tasks: AgenticTask[]): AgenticTask[];
|
|
19
|
+
//# sourceMappingURL=topological-sort.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"topological-sort.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/topological-sort.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK/C;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CA6ExE"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Topological sort for agentic workflow tasks based on dep field.
|
|
3
|
+
*
|
|
4
|
+
* Uses Kahn's algorithm (in-degree based) for stable topological ordering.
|
|
5
|
+
* Tasks without dep maintain their relative order.
|
|
6
|
+
* Output tasks are always placed at the end.
|
|
7
|
+
*/
|
|
8
|
+
import { Logger } from '@modular-prompt/utils';
|
|
9
|
+
const logger = new Logger({ prefix: 'process', context: 'agentic', accumulate: true });
|
|
10
|
+
/**
|
|
11
|
+
* Topologically sort tasks based on their dep field.
|
|
12
|
+
*
|
|
13
|
+
* - Tasks with no dep are treated as having in-degree 0.
|
|
14
|
+
* - Among tasks with equal priority, original array order is preserved (stable).
|
|
15
|
+
* - Output tasks are excluded from sorting and appended at the end.
|
|
16
|
+
* - Circular dependencies: warns and returns original order.
|
|
17
|
+
* - Missing dep references: warns and ignores.
|
|
18
|
+
*/
|
|
19
|
+
export function topologicalSortTasks(tasks) {
|
|
20
|
+
if (tasks.length <= 1)
|
|
21
|
+
return tasks;
|
|
22
|
+
// Separate output tasks
|
|
23
|
+
const outputTasks = [];
|
|
24
|
+
const sortable = [];
|
|
25
|
+
for (const task of tasks) {
|
|
26
|
+
if (task.taskType === 'output') {
|
|
27
|
+
outputTasks.push(task);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
sortable.push(task);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
if (sortable.length <= 1)
|
|
34
|
+
return [...sortable, ...outputTasks];
|
|
35
|
+
// Build name → index map
|
|
36
|
+
const nameToIndex = new Map();
|
|
37
|
+
for (let i = 0; i < sortable.length; i++) {
|
|
38
|
+
const name = sortable[i].name;
|
|
39
|
+
if (name)
|
|
40
|
+
nameToIndex.set(name, i);
|
|
41
|
+
}
|
|
42
|
+
// Build adjacency list and in-degree array
|
|
43
|
+
const adj = sortable.map(() => []);
|
|
44
|
+
const inDegree = new Array(sortable.length).fill(0);
|
|
45
|
+
for (let i = 0; i < sortable.length; i++) {
|
|
46
|
+
const deps = sortable[i].dep;
|
|
47
|
+
if (!deps)
|
|
48
|
+
continue;
|
|
49
|
+
for (const depName of deps) {
|
|
50
|
+
const depIdx = nameToIndex.get(depName);
|
|
51
|
+
if (depIdx === undefined) {
|
|
52
|
+
logger.warn(`[toposort] Task "${sortable[i].name}" depends on "${depName}" which does not exist, ignoring`);
|
|
53
|
+
continue;
|
|
54
|
+
}
|
|
55
|
+
// depIdx → i (depIdx must come before i)
|
|
56
|
+
adj[depIdx].push(i);
|
|
57
|
+
inDegree[i]++;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
// Kahn's algorithm with stable ordering (use original index as tiebreaker)
|
|
61
|
+
const queue = [];
|
|
62
|
+
for (let i = 0; i < sortable.length; i++) {
|
|
63
|
+
if (inDegree[i] === 0)
|
|
64
|
+
queue.push(i);
|
|
65
|
+
}
|
|
66
|
+
const result = [];
|
|
67
|
+
while (queue.length > 0) {
|
|
68
|
+
// Pick the task with the smallest original index (stable sort)
|
|
69
|
+
let minIdx = 0;
|
|
70
|
+
for (let j = 1; j < queue.length; j++) {
|
|
71
|
+
if (queue[j] < queue[minIdx])
|
|
72
|
+
minIdx = j;
|
|
73
|
+
}
|
|
74
|
+
const idx = queue.splice(minIdx, 1)[0];
|
|
75
|
+
result.push(sortable[idx]);
|
|
76
|
+
for (const neighbor of adj[idx]) {
|
|
77
|
+
inDegree[neighbor]--;
|
|
78
|
+
if (inDegree[neighbor] === 0) {
|
|
79
|
+
queue.push(neighbor);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
// Circular dependency check
|
|
84
|
+
if (result.length !== sortable.length) {
|
|
85
|
+
const unresolved = sortable
|
|
86
|
+
.filter((_, i) => inDegree[i] > 0)
|
|
87
|
+
.map(t => t.name || '(unnamed)')
|
|
88
|
+
.join(', ');
|
|
89
|
+
logger.warn(`[toposort] Circular dependency detected among: ${unresolved}. Using original order.`);
|
|
90
|
+
return tasks;
|
|
91
|
+
}
|
|
92
|
+
return [...result, ...outputTasks];
|
|
93
|
+
}
|
|
94
|
+
//# sourceMappingURL=topological-sort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"topological-sort.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/topological-sort.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-tasks.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/task-types/execution-tasks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAMhE,UAAU,gBAAgB;IACxB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,0BAA0B;IAC1B,UAAU,EAAE,SAAS,CAAC;IACtB,yEAAyE;IACzE,QAAQ,EAAE;QAAE,aAAa,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,OAAO,CAAC;QAAC,gBAAgB,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1F,iDAAiD;IACjD,eAAe,EAAE,MAAM,CAAC;IACxB,yCAAyC;IACzC,aAAa,EAAE,aAAa,CAAC;IAC7B,2DAA2D;IAC3D,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAMD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"execution-tasks.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/task-types/execution-tasks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAMhE,UAAU,gBAAgB;IACxB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0DAA0D;IAC1D,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,0BAA0B;IAC1B,UAAU,EAAE,SAAS,CAAC;IACtB,yEAAyE;IACzE,QAAQ,EAAE;QAAE,aAAa,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,OAAO,CAAC;QAAC,gBAAgB,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1F,iDAAiD;IACjD,eAAe,EAAE,MAAM,CAAC;IACxB,yCAAyC;IACzC,aAAa,EAAE,aAAa,CAAC;IAC7B,2DAA2D;IAC3D,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAMD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CA8EhE,CAAC;AAwEF,0DAA0D;AAC1D,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAE/D,CAAC"}
|
|
@@ -20,6 +20,7 @@ export const EXECUTION_TASK_DEFS = {
|
|
|
20
20
|
'- You will perform reasoning, analysis, or processing as instructed.',
|
|
21
21
|
'- You may call tools if needed to gather information or perform actions.',
|
|
22
22
|
'- If additional tasks are needed to complete the objective, use `__replan` to request re-planning.',
|
|
23
|
+
'- Focus solely on logical reasoning in this phase. Language refinement and phrasing decisions will be handled during the output generation stage.',
|
|
23
24
|
],
|
|
24
25
|
driverRole: 'thinking',
|
|
25
26
|
defaults: { withoutInputs: false, withoutMessages: false, withoutMaterials: false },
|
|
@@ -65,16 +66,17 @@ export const EXECUTION_TASK_DEFS = {
|
|
|
65
66
|
maxTokensTier: 'high',
|
|
66
67
|
},
|
|
67
68
|
recall: {
|
|
68
|
-
objective: '- Retrieve information relevant to your Focus
|
|
69
|
+
objective: '- Retrieve known information relevant to your Focus from the workflow\'s internal knowledge base or your own training knowledge.',
|
|
69
70
|
instructions: [
|
|
70
71
|
'- You will retrieve information relevant to your Focus.',
|
|
71
|
-
'-
|
|
72
|
-
'- If
|
|
72
|
+
'- Use your training knowledge to provide what you already know.',
|
|
73
|
+
'- If internal knowledge-retrieval tools are provided, use them to search the knowledge base.',
|
|
74
|
+
'- If internal knowledge-retrieval tools are NOT available, state that the internal knowledge base is not yet implemented and answer from your training knowledge only.',
|
|
73
75
|
'- Do not fabricate information. If uncertain, state what you know and what is unverified.',
|
|
74
76
|
],
|
|
75
77
|
driverRole: 'instruct',
|
|
76
78
|
defaults: { withoutInputs: false, withoutMessages: false, withoutMaterials: false },
|
|
77
|
-
toolDescription: '
|
|
79
|
+
toolDescription: 'retrieves known information from the workflow\'s internal knowledge base or model knowledge',
|
|
78
80
|
maxTokensTier: 'middle',
|
|
79
81
|
},
|
|
80
82
|
determine: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-tasks.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/task-types/execution-tasks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AA4BH,8EAA8E;AAC9E,mBAAmB;AACnB,8EAA8E;AAE9E,MAAM,CAAC,MAAM,mBAAmB,GAAqC;IACnE,KAAK,EAAE;QACL,SAAS,EAAE,uEAAuE;QAClF,YAAY,EAAE;YACZ,sEAAsE;YACtE,0EAA0E;YAC1E,oGAAoG;
|
|
1
|
+
{"version":3,"file":"execution-tasks.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/task-types/execution-tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/task-types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,KAAK,EAAE,sBAAsB,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAK7F;;GAEG;AACH;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAItD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAI3D,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,8CAA8C;IAC9C,MAAM,EAAE,YAAY,CAAC,sBAAsB,CAAC,CAAC;IAC7C,8DAA8D;IAC9D,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,yCAAyC;IACzC,aAAa,EAAE,aAAa,CAAC;CAC9B;AAYD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,cAAc,CAEpE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,uBAAuB,EAAE,GACtC,WAAW,CAeb;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,sBAAsB,GAAG,MAAM,CAyBxE;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,sBAAsB,GAAG,MAAM,CAiC5E;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/task-types/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtF,OAAO,KAAK,EAAE,sBAAsB,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAK7F;;GAEG;AACH;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAItD,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAI3D,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,8CAA8C;IAC9C,MAAM,EAAE,YAAY,CAAC,sBAAsB,CAAC,CAAC;IAC7C,8DAA8D;IAC9D,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,yCAAyC;IACzC,aAAa,EAAE,aAAa,CAAC;CAC9B;AAYD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,cAAc,CAEpE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,uBAAuB,EAAE,GACtC,WAAW,CAeb;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,sBAAsB,GAAG,MAAM,CAyBxE;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,sBAAsB,GAAG,MAAM,CAiC5E;AAED;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,sBAAsB,CA0C3D,CAAC;AAEF;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,SAAS,GAAG,MAAM,CAUvF"}
|