@modular-prompt/process 0.2.2 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/workflows/agentic-workflow/agentic-workflow.d.ts +2 -2
- package/dist/workflows/agentic-workflow/agentic-workflow.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/agentic-workflow.js +32 -35
- package/dist/workflows/agentic-workflow/agentic-workflow.js.map +1 -1
- package/dist/workflows/agentic-workflow/index.d.ts +1 -1
- package/dist/workflows/agentic-workflow/index.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/index.js.map +1 -1
- package/dist/workflows/agentic-workflow/process/builtin-tools.d.ts +9 -0
- package/dist/workflows/agentic-workflow/process/builtin-tools.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/process/builtin-tools.js +29 -4
- package/dist/workflows/agentic-workflow/process/builtin-tools.js.map +1 -1
- package/dist/workflows/agentic-workflow/process/query-with-tools.d.ts +9 -10
- package/dist/workflows/agentic-workflow/process/query-with-tools.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/process/query-with-tools.js +45 -62
- package/dist/workflows/agentic-workflow/process/query-with-tools.js.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/execution-tasks.d.ts +5 -1
- package/dist/workflows/agentic-workflow/task-types/execution-tasks.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/execution-tasks.js +30 -19
- package/dist/workflows/agentic-workflow/task-types/execution-tasks.js.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/index.d.ts +12 -3
- package/dist/workflows/agentic-workflow/task-types/index.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/index.js +40 -21
- package/dist/workflows/agentic-workflow/task-types/index.js.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/output.d.ts +3 -3
- package/dist/workflows/agentic-workflow/task-types/output.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/output.js +9 -8
- package/dist/workflows/agentic-workflow/task-types/output.js.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/planning.d.ts +1 -2
- package/dist/workflows/agentic-workflow/task-types/planning.d.ts.map +1 -1
- package/dist/workflows/agentic-workflow/task-types/planning.js +46 -21
- package/dist/workflows/agentic-workflow/task-types/planning.js.map +1 -1
- package/dist/workflows/agentic-workflow/types.d.ts +27 -12
- package/dist/workflows/agentic-workflow/types.d.ts.map +1 -1
- package/dist/workflows/index.d.ts +1 -1
- package/dist/workflows/index.d.ts.map +1 -1
- package/dist/workflows/index.js.map +1 -1
- package/package.json +2 -2
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import type { PromptModule } from '@modular-prompt/core';
|
|
13
13
|
import type { WorkflowResult } from '../types.js';
|
|
14
|
-
import type {
|
|
14
|
+
import type { AgenticWorkflowOptions, AgenticResumeState } from './types.js';
|
|
15
15
|
import { type DriverInput } from '../driver-input.js';
|
|
16
|
-
export declare function agenticProcess(driver: DriverInput, module: PromptModule<
|
|
16
|
+
export declare function agenticProcess<T>(driver: DriverInput, module: PromptModule<T>, context: T, options?: AgenticWorkflowOptions): Promise<WorkflowResult<AgenticResumeState>>;
|
|
17
17
|
//# sourceMappingURL=agentic-workflow.d.ts.map
|
|
@@ -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,EAAkB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,
|
|
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,EAAkB,MAAM,sBAAsB,CAAC;AAGzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAEV,sBAAsB,EACtB,kBAAkB,EAKnB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,oBAAoB,CAAC;AAmKrE,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,CAoH7C"}
|
|
@@ -13,8 +13,8 @@ import { merge, resolve } from '@modular-prompt/core';
|
|
|
13
13
|
import { Logger } from '@modular-prompt/utils';
|
|
14
14
|
import { DEFAULT_DRIVER_ROLE } from './types.js';
|
|
15
15
|
import { resolveDriver } from '../driver-input.js';
|
|
16
|
-
import { getTaskTypeConfig, taskCommon } from './task-types/index.js';
|
|
17
|
-
import { createPlanningTools, createExecutionBuiltinTools, createUpdateStateTool, } from './process/builtin-tools.js';
|
|
16
|
+
import { getTaskTypeConfig, taskCommon, MAX_TOKENS_VALUES } from './task-types/index.js';
|
|
17
|
+
import { createPlanningTools, createExecutionBuiltinTools, createUpdateStateTool, getBuiltinToolDefinitions, } from './process/builtin-tools.js';
|
|
18
18
|
import { queryWithTools, rethrowAsWorkflowError } from './process/query-with-tools.js';
|
|
19
19
|
const logger = new Logger({ prefix: 'process', context: 'agentic' });
|
|
20
20
|
/**
|
|
@@ -77,9 +77,9 @@ function getBuiltinToolsForTask(taskType, taskList, currentIndex, context) {
|
|
|
77
77
|
/**
|
|
78
78
|
* Execute a single task.
|
|
79
79
|
*/
|
|
80
|
-
async function executeTask(driver, userModule, context, task, taskIndex, taskList, externalTools
|
|
80
|
+
async function executeTask(driver, userModule, context, task, taskIndex, taskList, externalTools) {
|
|
81
81
|
const taskLogger = logger.context(`agentic:task:${taskIndex + 1}:${task.taskType}`);
|
|
82
|
-
taskLogger.info(
|
|
82
|
+
taskLogger.info(`[start] (${task.taskType})`, task.instruction);
|
|
83
83
|
const taskConfig = getTaskTypeConfig(task.taskType);
|
|
84
84
|
// Build workflowBase from resolved userModule
|
|
85
85
|
// output tasks get the full userModule; other tasks get objective/terms/state only
|
|
@@ -90,21 +90,21 @@ async function executeTask(driver, userModule, context, task, taskIndex, taskLis
|
|
|
90
90
|
terms: userModule.terms,
|
|
91
91
|
state: userModule.state,
|
|
92
92
|
};
|
|
93
|
-
// Merge and resolve
|
|
94
|
-
const resolved =
|
|
93
|
+
// Merge and resolve: planning has its own terms/methodology, others use taskCommon
|
|
94
|
+
const resolved = task.taskType === 'planning'
|
|
95
|
+
? resolve(merge(workflowBase, taskConfig.module), context)
|
|
96
|
+
: resolve(merge(workflowBase, taskCommon, taskConfig.module), context);
|
|
95
97
|
const builtinTools = getBuiltinToolsForTask(task.taskType, taskList, taskIndex, context);
|
|
96
98
|
const externalToolDefs = externalTools.map(t => t.definition);
|
|
97
99
|
const allToolNames = [...builtinTools.map(t => t.definition.name), ...externalToolDefs.map(t => t.name)];
|
|
98
100
|
taskLogger.verbose('[prompt]', JSON.stringify(resolved), allToolNames.length > 0 ? `tools: [${allToolNames.join(', ')}]` : '');
|
|
99
101
|
const driverRole = task.driverRole || DEFAULT_DRIVER_ROLE[task.taskType];
|
|
100
102
|
try {
|
|
101
|
-
const
|
|
102
|
-
const toolChoice = isPlanning ? 'required' : 'auto';
|
|
103
|
+
const maxTokens = MAX_TOKENS_VALUES[taskConfig.maxTokensTier];
|
|
103
104
|
const result = await queryWithTools(resolveDriver(driver, driverRole), resolved, builtinTools, {
|
|
104
105
|
externalToolDefs: externalToolDefs.length > 0 ? externalToolDefs : undefined,
|
|
105
|
-
toolChoice,
|
|
106
|
-
|
|
107
|
-
stopAfterToolCall: isPlanning,
|
|
106
|
+
toolChoice: 'auto',
|
|
107
|
+
maxTokens,
|
|
108
108
|
logger: taskLogger,
|
|
109
109
|
});
|
|
110
110
|
taskLogger.info('[end]');
|
|
@@ -112,6 +112,7 @@ async function executeTask(driver, userModule, context, task, taskIndex, taskLis
|
|
|
112
112
|
taskType: task.taskType,
|
|
113
113
|
instruction: task.instruction,
|
|
114
114
|
result: stripThinkBlocks(result.content),
|
|
115
|
+
toolCallLog: result.toolCallLog.length > 0 ? result.toolCallLog : undefined,
|
|
115
116
|
pendingToolCalls: result.pendingToolCalls,
|
|
116
117
|
metadata: {
|
|
117
118
|
usage: result.usage,
|
|
@@ -130,16 +131,23 @@ async function executeTask(driver, userModule, context, task, taskIndex, taskLis
|
|
|
130
131
|
// ---------------------------------------------------------------------------
|
|
131
132
|
export async function agenticProcess(driver, module, context, options = {}) {
|
|
132
133
|
logger.info('[start] agentic workflow');
|
|
133
|
-
const { maxTasks = 10, tools = [],
|
|
134
|
+
const { maxTasks = 10, tools = [], enablePlanning = true, includeThinking = false, resumeState, } = options;
|
|
134
135
|
// Resolve user module: DynamicContent → static values
|
|
135
|
-
// userModule is available throughout the workflow via context.userModule
|
|
136
136
|
const userModule = resolve(module, context);
|
|
137
|
-
context
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
? [...
|
|
142
|
-
:
|
|
137
|
+
// Build internal context (mutable — shared across tasks)
|
|
138
|
+
const internalContext = {
|
|
139
|
+
userModule,
|
|
140
|
+
taskList: resumeState?.taskList ?? bootstrap(userModule, enablePlanning),
|
|
141
|
+
executionLog: resumeState?.executionLog ? [...resumeState.executionLog] : [],
|
|
142
|
+
currentTaskIndex: 0,
|
|
143
|
+
state: resumeState?.state,
|
|
144
|
+
// planningがタスク設計時にツールの存在を把握し、適切なtoolCallタスクを計画できるようにする
|
|
145
|
+
availableTools: [
|
|
146
|
+
...getBuiltinToolDefinitions(),
|
|
147
|
+
...tools.map(t => t.definition),
|
|
148
|
+
],
|
|
149
|
+
};
|
|
150
|
+
const { taskList, executionLog } = internalContext;
|
|
143
151
|
const startIndex = executionLog.length;
|
|
144
152
|
// Task loop
|
|
145
153
|
for (let i = startIndex; i < taskList.length; i++) {
|
|
@@ -149,13 +157,8 @@ export async function agenticProcess(driver, module, context, options = {}) {
|
|
|
149
157
|
break;
|
|
150
158
|
}
|
|
151
159
|
const task = taskList[i];
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
taskList,
|
|
155
|
-
executionLog,
|
|
156
|
-
currentTaskIndex: i,
|
|
157
|
-
};
|
|
158
|
-
const logEntry = await executeTask(driver, userModule, currentContext, task, i, taskList, tools, maxToolCalls);
|
|
160
|
+
internalContext.currentTaskIndex = i;
|
|
161
|
+
const logEntry = await executeTask(driver, userModule, internalContext, task, i, taskList, tools);
|
|
159
162
|
executionLog.push(logEntry);
|
|
160
163
|
// Stop workflow if external tool calls are pending
|
|
161
164
|
if (logEntry.pendingToolCalls && logEntry.pendingToolCalls.length > 0) {
|
|
@@ -174,13 +177,8 @@ export async function agenticProcess(driver, module, context, options = {}) {
|
|
|
174
177
|
};
|
|
175
178
|
taskList.push(outputTask);
|
|
176
179
|
const outputIndex = taskList.length - 1;
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
taskList,
|
|
180
|
-
executionLog,
|
|
181
|
-
currentTaskIndex: outputIndex,
|
|
182
|
-
};
|
|
183
|
-
const outputLog = await executeTask(driver, userModule, outputContext, outputTask, outputIndex, taskList, tools, maxToolCalls);
|
|
180
|
+
internalContext.currentTaskIndex = outputIndex;
|
|
181
|
+
const outputLog = await executeTask(driver, userModule, internalContext, outputTask, outputIndex, taskList, tools);
|
|
184
182
|
executionLog.push(outputLog);
|
|
185
183
|
}
|
|
186
184
|
// Final output
|
|
@@ -205,10 +203,9 @@ export async function agenticProcess(driver, module, context, options = {}) {
|
|
|
205
203
|
return {
|
|
206
204
|
output,
|
|
207
205
|
context: {
|
|
208
|
-
...context,
|
|
209
206
|
taskList,
|
|
210
207
|
executionLog,
|
|
211
|
-
|
|
208
|
+
state: internalContext.state,
|
|
212
209
|
},
|
|
213
210
|
metadata: {
|
|
214
211
|
planTasks: taskList.length,
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"agentic-workflow.js","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/agentic-workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { agenticProcess } from './agentic-workflow.js';
|
|
2
|
-
export type { AgenticWorkflowContext, AgenticWorkflowOptions, AgenticTask, AgenticTaskExecutionLog, TaskType, ToolSpec, ToolCallLog, } from './types.js';
|
|
2
|
+
export type { AgenticWorkflowContext, AgenticWorkflowOptions, AgenticResumeState, AgenticTask, AgenticTaskExecutionLog, TaskType, ToolSpec, ToolCallLog, } from './types.js';
|
|
3
3
|
export { DEFAULT_DRIVER_ROLE, DEFAULT_DATA_OPTIONS } from './types.js';
|
|
4
4
|
export { BUILTIN_TOOL_PREFIX, isBuiltinTool } from './process/builtin-tools.js';
|
|
5
5
|
export { getTaskTypeConfig, taskCommon } from './task-types/index.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,YAAY,EACV,sBAAsB,EACtB,sBAAsB,EACtB,WAAW,EACX,uBAAuB,EACvB,QAAQ,EACR,QAAQ,EACR,WAAW,GACZ,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGvE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGhF,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACtE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,YAAY,EACV,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,EAClB,WAAW,EACX,uBAAuB,EACvB,QAAQ,EACR,QAAQ,EACR,WAAW,GACZ,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAGvE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAGhF,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACtE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/index.ts"],"names":[],"mappings":"AAAA,mBAAmB;AACnB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workflows/agentic-workflow/index.ts"],"names":[],"mappings":"AAAA,mBAAmB;AACnB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAcvD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvE,gBAAgB;AAChB,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEhF,qBAAqB;AACrB,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* - __update_state: ワークフロー状態の更新
|
|
6
6
|
* - __time: 現在時刻取得
|
|
7
7
|
*/
|
|
8
|
+
import type { ToolDefinition } from '@modular-prompt/driver';
|
|
8
9
|
import type { ToolSpec, AgenticTask } from '../types.js';
|
|
9
10
|
export declare const BUILTIN_TOOL_PREFIX = "__";
|
|
10
11
|
/**
|
|
@@ -24,6 +25,14 @@ export declare function createPlanningTools(taskList: AgenticTask[], currentInde
|
|
|
24
25
|
export declare function createUpdateStateTool(context: {
|
|
25
26
|
state?: string;
|
|
26
27
|
}): ToolSpec;
|
|
28
|
+
/**
|
|
29
|
+
* ビルトインツールの定義一覧（planning向け情報提供用）
|
|
30
|
+
*
|
|
31
|
+
* planningタスクが適切なタスク設計を行うには、各タスクで利用可能な
|
|
32
|
+
* ツールの全体像が必要。「できないことリスト」ではなく「ツールが
|
|
33
|
+
* 存在するから使う」形で、必要なtoolCallタスクを計画させる。
|
|
34
|
+
*/
|
|
35
|
+
export declare function getBuiltinToolDefinitions(): ToolDefinition[];
|
|
27
36
|
/**
|
|
28
37
|
* Execution フェーズ用の組み込みツールを生成
|
|
29
38
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAY,MAAM,aAAa,CAAC;AAInE,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AA4ED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,QAAQ,EAAE,CAiC7F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,QAAQ,CAmB3E;
|
|
1
|
+
{"version":3,"file":"builtin-tools.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAY,MAAM,aAAa,CAAC;AAInE,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AA4ED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,MAAM,GAAG,QAAQ,EAAE,CAiC7F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,QAAQ,CAmB3E;AA2BD;;;;;;GAMG;AACH,wBAAgB,yBAAyB,IAAI,cAAc,EAAE,CAS5D;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,WAAW,EAAE,EACvB,YAAY,EAAE,MAAM,GACnB,QAAQ,EAAE,CAKZ"}
|
|
@@ -32,15 +32,15 @@ const TASK_ENTRY_SCHEMA = {
|
|
|
32
32
|
},
|
|
33
33
|
withInputs: {
|
|
34
34
|
type: 'boolean',
|
|
35
|
-
description: 'Include
|
|
35
|
+
description: 'Include user inputs in data. Defaults per task type.',
|
|
36
36
|
},
|
|
37
37
|
withMessages: {
|
|
38
38
|
type: 'boolean',
|
|
39
|
-
description: 'Include
|
|
39
|
+
description: 'Include user messages in data. Defaults per task type.',
|
|
40
40
|
},
|
|
41
41
|
withMaterials: {
|
|
42
42
|
type: 'boolean',
|
|
43
|
-
description: 'Include
|
|
43
|
+
description: 'Include user materials in data. Defaults per task type.',
|
|
44
44
|
},
|
|
45
45
|
insertAt: {
|
|
46
46
|
type: 'number',
|
|
@@ -143,9 +143,34 @@ const timeTool = {
|
|
|
143
143
|
},
|
|
144
144
|
},
|
|
145
145
|
handler: async () => {
|
|
146
|
-
|
|
146
|
+
const now = new Date();
|
|
147
|
+
const locale = Intl.DateTimeFormat().resolvedOptions().locale;
|
|
148
|
+
const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
|
149
|
+
return {
|
|
150
|
+
utc: now.toISOString(),
|
|
151
|
+
local: now.toLocaleString(locale, { timeZone }),
|
|
152
|
+
locale,
|
|
153
|
+
timeZone,
|
|
154
|
+
};
|
|
147
155
|
},
|
|
148
156
|
};
|
|
157
|
+
/**
|
|
158
|
+
* ビルトインツールの定義一覧（planning向け情報提供用）
|
|
159
|
+
*
|
|
160
|
+
* planningタスクが適切なタスク設計を行うには、各タスクで利用可能な
|
|
161
|
+
* ツールの全体像が必要。「できないことリスト」ではなく「ツールが
|
|
162
|
+
* 存在するから使う」形で、必要なtoolCallタスクを計画させる。
|
|
163
|
+
*/
|
|
164
|
+
export function getBuiltinToolDefinitions() {
|
|
165
|
+
return [
|
|
166
|
+
timeTool.definition,
|
|
167
|
+
{
|
|
168
|
+
name: '__update_state',
|
|
169
|
+
description: 'Update the workflow state. The state is a free-form string that persists across tasks and is visible to all subsequent tasks.',
|
|
170
|
+
parameters: { type: 'object', properties: { state: { type: 'string' } }, required: ['state'] },
|
|
171
|
+
},
|
|
172
|
+
];
|
|
173
|
+
}
|
|
149
174
|
/**
|
|
150
175
|
* Execution フェーズ用の組み込みツールを生成
|
|
151
176
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"builtin-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/builtin-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,15 +6,13 @@ import type { ToolChoice, FinishReason, ToolDefinition } from '@modular-prompt/d
|
|
|
6
6
|
import { Logger } from '@modular-prompt/utils';
|
|
7
7
|
import type { AIDriver } from '../../types.js';
|
|
8
8
|
import type { QueryResult } from '@modular-prompt/driver';
|
|
9
|
-
import type { ToolSpec, ToolCallLog
|
|
9
|
+
import type { ToolSpec, ToolCallLog } from '../types.js';
|
|
10
10
|
export interface QueryWithToolsOptions {
|
|
11
11
|
/** External tool definitions (passed to driver, NOT executed internally) */
|
|
12
12
|
externalToolDefs?: ToolDefinition[];
|
|
13
13
|
toolChoice?: ToolChoice;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
stopAfterToolCall?: boolean;
|
|
17
|
-
logPrefix?: string;
|
|
14
|
+
/** Maximum output tokens per query */
|
|
15
|
+
maxTokens?: number;
|
|
18
16
|
logger?: Logger;
|
|
19
17
|
}
|
|
20
18
|
export interface QueryWithToolsResult {
|
|
@@ -26,12 +24,13 @@ export interface QueryWithToolsResult {
|
|
|
26
24
|
finishReason?: FinishReason;
|
|
27
25
|
}
|
|
28
26
|
/**
|
|
29
|
-
* Run a query
|
|
27
|
+
* Run a single query and handle tool calls.
|
|
30
28
|
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
29
|
+
* Each task queries the model exactly once.
|
|
30
|
+
* Builtin tools (__ prefix) are executed and their results recorded.
|
|
31
|
+
* External tool calls are returned as pending for the caller to handle.
|
|
32
|
+
* Tool results are passed to subsequent tasks via preparationNote.
|
|
34
33
|
*/
|
|
35
34
|
export declare function queryWithTools(driver: AIDriver, resolved: ResolvedModule, builtinTools: ToolSpec[], options?: QueryWithToolsOptions): Promise<QueryWithToolsResult>;
|
|
36
|
-
export declare function rethrowAsWorkflowError(error: unknown, context:
|
|
35
|
+
export declare function rethrowAsWorkflowError(error: unknown, context: unknown, details: Record<string, unknown>): never;
|
|
37
36
|
//# sourceMappingURL=query-with-tools.d.ts.map
|
|
@@ -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;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"query-with-tools.d.ts","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/query-with-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAA4B,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE/F,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,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;AAwCzD,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,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,KAAK,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IAC7B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;;;;;GAOG;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,CAyD/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"}
|
|
@@ -22,7 +22,7 @@ async function executeBuiltinToolCalls(toolCalls, builtinTools, logger) {
|
|
|
22
22
|
}
|
|
23
23
|
try {
|
|
24
24
|
const result = await spec.handler(tc.arguments);
|
|
25
|
-
logger.
|
|
25
|
+
logger.info('[tool:result]', tc.name, result);
|
|
26
26
|
results.push({
|
|
27
27
|
type: 'message', role: 'tool', toolCallId: tc.id, name: tc.name,
|
|
28
28
|
kind: typeof result === 'string' ? 'text' : 'data', value: result
|
|
@@ -38,77 +38,60 @@ async function executeBuiltinToolCalls(toolCalls, builtinTools, logger) {
|
|
|
38
38
|
return results;
|
|
39
39
|
}
|
|
40
40
|
/**
|
|
41
|
-
* Run a query
|
|
41
|
+
* Run a single query and handle tool calls.
|
|
42
42
|
*
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
*
|
|
43
|
+
* Each task queries the model exactly once.
|
|
44
|
+
* Builtin tools (__ prefix) are executed and their results recorded.
|
|
45
|
+
* External tool calls are returned as pending for the caller to handle.
|
|
46
|
+
* Tool results are passed to subsequent tasks via preparationNote.
|
|
46
47
|
*/
|
|
47
48
|
export async function queryWithTools(driver, resolved, builtinTools, options = {}) {
|
|
48
|
-
const { externalToolDefs = [],
|
|
49
|
+
const { externalToolDefs = [], logger: qLogger = logger } = options;
|
|
49
50
|
const allToolDefs = [
|
|
50
51
|
...builtinTools.map(t => t.definition),
|
|
51
52
|
...externalToolDefs,
|
|
52
53
|
];
|
|
53
|
-
const conversation = [];
|
|
54
54
|
const toolCallLog = [];
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
for (
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
for (let j = 0; j < builtinCalls.length; j++) {
|
|
85
|
-
toolCallLog.push({
|
|
86
|
-
name: builtinCalls[j].name,
|
|
87
|
-
arguments: builtinCalls[j].arguments,
|
|
88
|
-
result: toolResults[j].value,
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
conversation.push({
|
|
92
|
-
type: 'message', role: 'assistant',
|
|
93
|
-
content: queryResult.content || '',
|
|
94
|
-
toolCalls: builtinCalls,
|
|
95
|
-
}, ...toolResults);
|
|
96
|
-
// Stop after first tool call if requested (e.g. planning)
|
|
97
|
-
if (options.stopAfterToolCall) {
|
|
98
|
-
return { content, toolCallLog, usage: lastResult.usage, finishReason: lastResult.finishReason };
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
// External tool calls → stop immediately and return them
|
|
102
|
-
if (externalCalls.length > 0) {
|
|
103
|
-
return {
|
|
104
|
-
content, toolCallLog,
|
|
105
|
-
pendingToolCalls: externalCalls,
|
|
106
|
-
usage: lastResult.usage, finishReason: lastResult.finishReason
|
|
107
|
-
};
|
|
55
|
+
// Single query
|
|
56
|
+
const prompt = distribute(resolved);
|
|
57
|
+
const queryResult = await driver.query(prompt, {
|
|
58
|
+
tools: allToolDefs.length > 0 ? allToolDefs : undefined,
|
|
59
|
+
toolChoice: options.toolChoice ?? 'auto',
|
|
60
|
+
...(options.maxTokens ? { maxTokens: options.maxTokens } : {}),
|
|
61
|
+
});
|
|
62
|
+
qLogger.verbose('[output]', queryResult.content);
|
|
63
|
+
const content = queryResult.content || '';
|
|
64
|
+
// No tool calls → return immediately
|
|
65
|
+
if (!queryResult.toolCalls || queryResult.toolCalls.length === 0) {
|
|
66
|
+
return { content, toolCallLog, usage: queryResult.usage, finishReason: queryResult.finishReason };
|
|
67
|
+
}
|
|
68
|
+
// Partition tool calls into builtin and external
|
|
69
|
+
const builtinCalls = queryResult.toolCalls.filter(tc => isBuiltinTool(tc.name));
|
|
70
|
+
const externalCalls = queryResult.toolCalls.filter(tc => !isBuiltinTool(tc.name));
|
|
71
|
+
// Log tool calls
|
|
72
|
+
for (const tc of queryResult.toolCalls) {
|
|
73
|
+
qLogger.info('[tool:call]', tc.name, JSON.stringify(tc.arguments));
|
|
74
|
+
}
|
|
75
|
+
// Execute builtin tools and record results
|
|
76
|
+
if (builtinCalls.length > 0) {
|
|
77
|
+
const toolResults = await executeBuiltinToolCalls(builtinCalls, builtinTools, qLogger);
|
|
78
|
+
for (let j = 0; j < builtinCalls.length; j++) {
|
|
79
|
+
toolCallLog.push({
|
|
80
|
+
name: builtinCalls[j].name,
|
|
81
|
+
arguments: builtinCalls[j].arguments,
|
|
82
|
+
result: toolResults[j].value,
|
|
83
|
+
});
|
|
108
84
|
}
|
|
109
|
-
// conversation is accumulated; next iteration will distribute with updated messages
|
|
110
85
|
}
|
|
111
|
-
|
|
86
|
+
// External tool calls → return as pending
|
|
87
|
+
if (externalCalls.length > 0) {
|
|
88
|
+
return {
|
|
89
|
+
content, toolCallLog,
|
|
90
|
+
pendingToolCalls: externalCalls,
|
|
91
|
+
usage: queryResult.usage, finishReason: queryResult.finishReason,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
return { content, toolCallLog, usage: queryResult.usage, finishReason: queryResult.finishReason };
|
|
112
95
|
}
|
|
113
96
|
export function rethrowAsWorkflowError(error, context, details) {
|
|
114
97
|
if (error instanceof WorkflowExecutionError)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-with-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/query-with-tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;AAErE;;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,CAAC,CAAC;YAChD,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"query-with-tools.js","sourceRoot":"","sources":["../../../../src/workflows/agentic-workflow/process/query-with-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
* → レジストリ登録・ツール定義は自動的に反映される
|
|
12
12
|
*/
|
|
13
13
|
import type { ModelRole } from '../../driver-input.js';
|
|
14
|
-
import type { TaskTypeConfig } from './index.js';
|
|
14
|
+
import type { TaskTypeConfig, MaxTokensTier } from './index.js';
|
|
15
15
|
interface ExecutionTaskDef {
|
|
16
16
|
/** Task-specific objective line (falls back to generic if omitted) */
|
|
17
17
|
objective?: string;
|
|
@@ -27,6 +27,10 @@ interface ExecutionTaskDef {
|
|
|
27
27
|
};
|
|
28
28
|
/** Description for __insert_tasks tool enum */
|
|
29
29
|
toolDescription: string;
|
|
30
|
+
/** maxTokens tier (default: 'middle') */
|
|
31
|
+
maxTokensTier: MaxTokensTier;
|
|
32
|
+
/** Builtin tool names (default: ['__insert_tasks', '__update_state', '__time']) */
|
|
33
|
+
builtinToolNames?: string[];
|
|
30
34
|
}
|
|
31
35
|
export declare const EXECUTION_TASK_DEFS: Record<string, ExecutionTaskDef>;
|
|
32
36
|
/** All execution task configs, keyed by task type name */
|
|
@@ -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,MAAM,YAAY,CAAC;
|
|
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;AAOhE,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,2BAA2B;IAC3B,QAAQ,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAC;QAAC,aAAa,EAAE,OAAO,CAAA;KAAE,CAAC;IACjF,+CAA+C;IAC/C,eAAe,EAAE,MAAM,CAAC;IACxB,yCAAyC;IACzC,aAAa,EAAE,aAAa,CAAC;IAC7B,mFAAmF;IACnF,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;AAMD,eAAO,MAAM,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CA4EhE,CAAC;AA+EF,0DAA0D;AAC1D,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAE/D,CAAC"}
|