@push.rocks/smartagent 1.2.7 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartagent',
6
- version: '1.2.7',
6
+ version: '1.3.0',
7
7
  description: 'an agentic framework built on top of @push.rocks/smartai'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDBEQUEwRDtDQUN4RSxDQUFBIn0=
@@ -7,5 +7,6 @@ export { HttpTool } from './smartagent.tools.http.js';
7
7
  export { ShellTool } from './smartagent.tools.shell.js';
8
8
  export { BrowserTool } from './smartagent.tools.browser.js';
9
9
  export { DenoTool, type TDenoPermission } from './smartagent.tools.deno.js';
10
+ export { JsonValidatorTool } from './smartagent.tools.json.js';
10
11
  export * from './smartagent.interfaces.js';
11
12
  export { type ISmartAiOptions, type TProvider, type ChatMessage, type ChatOptions, type ChatResponse, } from '@push.rocks/smartai';
package/dist_ts/index.js CHANGED
@@ -12,8 +12,9 @@ export { HttpTool } from './smartagent.tools.http.js';
12
12
  export { ShellTool } from './smartagent.tools.shell.js';
13
13
  export { BrowserTool } from './smartagent.tools.browser.js';
14
14
  export { DenoTool } from './smartagent.tools.deno.js';
15
+ export { JsonValidatorTool } from './smartagent.tools.json.js';
15
16
  // Export all interfaces
16
17
  export * from './smartagent.interfaces.js';
17
18
  // Re-export useful types from smartai
18
19
  export {} from '@push.rocks/smartai';
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4Qyx3REFBd0Q7QUFDeEQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFMUUsMkJBQTJCO0FBQzNCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFdEUsa0RBQWtEO0FBQ2xELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUU3RCx3QkFBd0I7QUFDeEIsT0FBTyxFQUFFLGNBQWMsRUFBK0IsTUFBTSxrQ0FBa0MsQ0FBQztBQUMvRixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3hELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM1RCxPQUFPLEVBQUUsUUFBUSxFQUF3QixNQUFNLDRCQUE0QixDQUFDO0FBRTVFLHdCQUF3QjtBQUN4QixjQUFjLDRCQUE0QixDQUFDO0FBRTNDLHNDQUFzQztBQUN0QyxPQUFPLEVBTU4sTUFBTSxxQkFBcUIsQ0FBQyJ9
20
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4Qyx3REFBd0Q7QUFDeEQsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFMUUsMkJBQTJCO0FBQzNCLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUNsRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFdEUsa0RBQWtEO0FBQ2xELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUU3RCx3QkFBd0I7QUFDeEIsT0FBTyxFQUFFLGNBQWMsRUFBK0IsTUFBTSxrQ0FBa0MsQ0FBQztBQUMvRixPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3hELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUM1RCxPQUFPLEVBQUUsUUFBUSxFQUF3QixNQUFNLDRCQUE0QixDQUFDO0FBQzVFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRS9ELHdCQUF3QjtBQUN4QixjQUFjLDRCQUE0QixDQUFDO0FBRTNDLHNDQUFzQztBQUN0QyxPQUFPLEVBTU4sTUFBTSxxQkFBcUIsQ0FBQyJ9
@@ -9,6 +9,8 @@ export interface IDriverAgentOptions {
9
9
  systemMessage?: string;
10
10
  /** Maximum history messages to pass to API (default: 20). Set to 0 for unlimited. */
11
11
  maxHistoryMessages?: number;
12
+ /** Callback fired for each token during LLM generation */
13
+ onToken?: (token: string) => void;
12
14
  }
13
15
  /**
14
16
  * DriverAgent - Executes tasks by reasoning and proposing tool calls
@@ -20,7 +22,13 @@ export declare class DriverAgent {
20
22
  private maxHistoryMessages;
21
23
  private messageHistory;
22
24
  private tools;
25
+ private onToken?;
23
26
  constructor(provider: plugins.smartai.MultiModalModel, options?: IDriverAgentOptions | string);
27
+ /**
28
+ * Set the token callback for streaming mode
29
+ * @param callback Function to call for each generated token
30
+ */
31
+ setOnToken(callback: (token: string) => void): void;
24
32
  /**
25
33
  * Register a tool for use by the driver
26
34
  */
@@ -31,8 +39,10 @@ export declare class DriverAgent {
31
39
  getTools(): Map<string, BaseToolWrapper>;
32
40
  /**
33
41
  * Initialize a new conversation for a task
42
+ * @param task The task description
43
+ * @param images Optional base64-encoded images for vision tasks
34
44
  */
35
- startTask(task: string): Promise<interfaces.IAgentMessage>;
45
+ startTask(task: string, images?: string[]): Promise<interfaces.IAgentMessage>;
36
46
  /**
37
47
  * Continue the conversation with feedback or results
38
48
  */
@@ -10,6 +10,7 @@ export class DriverAgent {
10
10
  maxHistoryMessages;
11
11
  messageHistory = [];
12
12
  tools = new Map();
13
+ onToken;
13
14
  constructor(provider, options) {
14
15
  this.provider = provider;
15
16
  // Support both legacy string systemMessage and new options object
@@ -20,8 +21,16 @@ export class DriverAgent {
20
21
  else {
21
22
  this.systemMessage = options?.systemMessage || this.getDefaultSystemMessage();
22
23
  this.maxHistoryMessages = options?.maxHistoryMessages ?? 20;
24
+ this.onToken = options?.onToken;
23
25
  }
24
26
  }
27
+ /**
28
+ * Set the token callback for streaming mode
29
+ * @param callback Function to call for each generated token
30
+ */
31
+ setOnToken(callback) {
32
+ this.onToken = callback;
33
+ }
25
34
  /**
26
35
  * Register a tool for use by the driver
27
36
  */
@@ -36,8 +45,10 @@ export class DriverAgent {
36
45
  }
37
46
  /**
38
47
  * Initialize a new conversation for a task
48
+ * @param task The task description
49
+ * @param images Optional base64-encoded images for vision tasks
39
50
  */
40
- async startTask(task) {
51
+ async startTask(task, images) {
41
52
  // Reset message history
42
53
  this.messageHistory = [];
43
54
  // Build the user message based on available tools
@@ -64,17 +75,33 @@ export class DriverAgent {
64
75
  // Use a simpler system message when no tools are available
65
76
  fullSystemMessage = this.getNoToolsSystemMessage();
66
77
  }
67
- // Get response from provider
68
- const response = await this.provider.chat({
69
- systemMessage: fullSystemMessage,
70
- userMessage: userMessage,
71
- messageHistory: [],
72
- });
73
- // Add assistant response to history
74
- this.messageHistory.push({
78
+ // Get response from provider - use streaming if available and callback is set
79
+ let response;
80
+ if (this.onToken && typeof this.provider.chatStreaming === 'function') {
81
+ // Use streaming mode with token callback
82
+ response = await this.provider.chatStreaming({
83
+ systemMessage: fullSystemMessage,
84
+ userMessage: userMessage,
85
+ messageHistory: [],
86
+ images: images,
87
+ onToken: this.onToken,
88
+ });
89
+ }
90
+ else {
91
+ // Fallback to non-streaming mode
92
+ response = await this.provider.chat({
93
+ systemMessage: fullSystemMessage,
94
+ userMessage: userMessage,
95
+ messageHistory: [],
96
+ images: images,
97
+ });
98
+ }
99
+ // Add assistant response to history (store images if provided)
100
+ const historyMessage = {
75
101
  role: 'assistant',
76
102
  content: response.message,
77
- });
103
+ };
104
+ this.messageHistory.push(historyMessage);
78
105
  return {
79
106
  role: 'assistant',
80
107
  content: response.message,
@@ -113,11 +140,25 @@ export class DriverAgent {
113
140
  else {
114
141
  historyForChat = fullHistory;
115
142
  }
116
- const response = await this.provider.chat({
117
- systemMessage: fullSystemMessage,
118
- userMessage: message,
119
- messageHistory: historyForChat,
120
- });
143
+ // Get response from provider - use streaming if available and callback is set
144
+ let response;
145
+ if (this.onToken && typeof this.provider.chatStreaming === 'function') {
146
+ // Use streaming mode with token callback
147
+ response = await this.provider.chatStreaming({
148
+ systemMessage: fullSystemMessage,
149
+ userMessage: message,
150
+ messageHistory: historyForChat,
151
+ onToken: this.onToken,
152
+ });
153
+ }
154
+ else {
155
+ // Fallback to non-streaming mode
156
+ response = await this.provider.chat({
157
+ systemMessage: fullSystemMessage,
158
+ userMessage: message,
159
+ messageHistory: historyForChat,
160
+ });
161
+ }
121
162
  // Add assistant response to history
122
163
  this.messageHistory.push({
123
164
  role: 'assistant',
@@ -340,4 +381,4 @@ Your complete output here
340
381
  this.messageHistory = [];
341
382
  }
342
383
  }
343
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.classes.driveragent.js","sourceRoot":"","sources":["../ts/smartagent.classes.driveragent.ts"],"names":[],"mappings":"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"}
384
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.classes.driveragent.js","sourceRoot":"","sources":["../ts/smartagent.classes.driveragent.ts"],"names":[],"mappings":"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"}
@@ -52,8 +52,10 @@ export declare class DualAgentOrchestrator {
52
52
  stop(): Promise<void>;
53
53
  /**
54
54
  * Run a task through the dual-agent system
55
+ * @param task The task description
56
+ * @param options Optional task run options (e.g., images for vision tasks)
55
57
  */
56
- run(task: string): Promise<interfaces.IDualAgentRunResult>;
58
+ run(task: string, options?: interfaces.ITaskRunOptions): Promise<interfaces.IDualAgentRunResult>;
57
59
  /**
58
60
  * Continue an existing task with user input
59
61
  */
@@ -165,9 +165,14 @@ export class DualAgentOrchestrator {
165
165
  ? this.getProviderByName(this.options.guardianProvider)
166
166
  : this.driverProvider;
167
167
  // NOW create agents with initialized providers
168
+ // Set up token callback wrapper if streaming is enabled
169
+ const driverOnToken = this.options.onToken
170
+ ? (token) => this.options.onToken(token, 'driver')
171
+ : undefined;
168
172
  this.driver = new DriverAgent(this.driverProvider, {
169
173
  systemMessage: this.options.driverSystemMessage,
170
174
  maxHistoryMessages: this.options.maxHistoryMessages,
175
+ onToken: driverOnToken,
171
176
  });
172
177
  this.guardian = new GuardianAgent(this.guardianProvider, this.options.guardianPolicyPrompt);
173
178
  // Register any tools that were added before start() with the agents
@@ -203,8 +208,10 @@ export class DualAgentOrchestrator {
203
208
  }
204
209
  /**
205
210
  * Run a task through the dual-agent system
211
+ * @param task The task description
212
+ * @param options Optional task run options (e.g., images for vision tasks)
206
213
  */
207
- async run(task) {
214
+ async run(task, options) {
208
215
  if (!this.isRunning) {
209
216
  throw new Error('Orchestrator not started. Call start() first.');
210
217
  }
@@ -213,13 +220,15 @@ export class DualAgentOrchestrator {
213
220
  let consecutiveRejections = 0;
214
221
  let completed = false;
215
222
  let finalResult = null;
223
+ // Extract images from options
224
+ const images = options?.images;
216
225
  // Add initial task to history
217
226
  this.conversationHistory.push({
218
227
  role: 'user',
219
228
  content: task,
220
229
  });
221
- // Start the driver with the task
222
- let driverResponse = await this.driver.startTask(task);
230
+ // Start the driver with the task and optional images
231
+ let driverResponse = await this.driver.startTask(task, images);
223
232
  this.conversationHistory.push(driverResponse);
224
233
  // Emit task started event
225
234
  this.emitProgress({
@@ -487,4 +496,4 @@ export class DualAgentOrchestrator {
487
496
  return Array.from(this.tools.keys());
488
497
  }
489
498
  }
490
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.classes.dualagent.js","sourceRoot":"","sources":["../ts/smartagent.classes.dualagent.ts"],"names":[],"mappings":"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"}
499
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.classes.dualagent.js","sourceRoot":"","sources":["../ts/smartagent.classes.dualagent.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,11 @@
1
1
  import * as plugins from './plugins.js';
2
+ /**
3
+ * Options for running a task with the DualAgentOrchestrator
4
+ */
5
+ export interface ITaskRunOptions {
6
+ /** Base64-encoded images to include with the task (for vision-capable models) */
7
+ images?: string[];
8
+ }
2
9
  /**
3
10
  * Configuration options for the DualAgentOrchestrator
4
11
  */
@@ -29,6 +36,8 @@ export interface IDualAgentOptions extends plugins.smartai.ISmartAiOptions {
29
36
  onProgress?: (event: IProgressEvent) => void;
30
37
  /** Prefix for log messages (e.g., "[README]", "[Commit]"). Default: empty */
31
38
  logPrefix?: string;
39
+ /** Callback fired for each token during LLM generation (streaming mode) */
40
+ onToken?: (token: string, source: 'driver' | 'guardian') => void;
32
41
  }
33
42
  /**
34
43
  * Represents a message in the agent's conversation history
@@ -5,4 +5,4 @@ import * as plugins from './plugins.js';
5
5
  export function generateProposalId() {
6
6
  return `proposal_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`;
7
7
  }
8
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5pbnRlcmZhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC5pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBNFF4Qzs7R0FFRztBQUNILE1BQU0sVUFBVSxrQkFBa0I7SUFDaEMsT0FBTyxZQUFZLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNoRixDQUFDIn0=
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5pbnRlcmZhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC5pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBMFJ4Qzs7R0FFRztBQUNILE1BQU0sVUFBVSxrQkFBa0I7SUFDaEMsT0FBTyxZQUFZLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNoRixDQUFDIn0=
@@ -0,0 +1,23 @@
1
+ import * as interfaces from './smartagent.interfaces.js';
2
+ import { BaseToolWrapper } from './smartagent.tools.base.js';
3
+ /**
4
+ * JsonValidatorTool - Validates and formats JSON data
5
+ * Useful for agents to self-validate their JSON output before completing a task
6
+ */
7
+ export declare class JsonValidatorTool extends BaseToolWrapper {
8
+ name: string;
9
+ description: string;
10
+ actions: interfaces.IToolAction[];
11
+ initialize(): Promise<void>;
12
+ cleanup(): Promise<void>;
13
+ execute(action: string, params: Record<string, unknown>): Promise<interfaces.IToolExecutionResult>;
14
+ /**
15
+ * Validate JSON string and optionally check for required fields
16
+ */
17
+ private validateJson;
18
+ /**
19
+ * Format/pretty-print JSON string
20
+ */
21
+ private formatJson;
22
+ getCallSummary(action: string, params: Record<string, unknown>): string;
23
+ }
@@ -0,0 +1,172 @@
1
+ import * as interfaces from './smartagent.interfaces.js';
2
+ import { BaseToolWrapper } from './smartagent.tools.base.js';
3
+ /**
4
+ * JsonValidatorTool - Validates and formats JSON data
5
+ * Useful for agents to self-validate their JSON output before completing a task
6
+ */
7
+ export class JsonValidatorTool extends BaseToolWrapper {
8
+ name = 'json';
9
+ description = 'Validate and format JSON data. Use this to verify your JSON output is valid before completing a task.';
10
+ actions = [
11
+ {
12
+ name: 'validate',
13
+ description: 'Validate that a string is valid JSON and optionally check required fields',
14
+ parameters: {
15
+ type: 'object',
16
+ properties: {
17
+ jsonString: {
18
+ type: 'string',
19
+ description: 'The JSON string to validate',
20
+ },
21
+ requiredFields: {
22
+ type: 'array',
23
+ items: { type: 'string' },
24
+ description: 'Optional list of field names that must be present at the root level',
25
+ },
26
+ },
27
+ required: ['jsonString'],
28
+ },
29
+ },
30
+ {
31
+ name: 'format',
32
+ description: 'Parse and pretty-print JSON string',
33
+ parameters: {
34
+ type: 'object',
35
+ properties: {
36
+ jsonString: {
37
+ type: 'string',
38
+ description: 'The JSON string to format',
39
+ },
40
+ },
41
+ required: ['jsonString'],
42
+ },
43
+ },
44
+ ];
45
+ async initialize() {
46
+ this.isInitialized = true;
47
+ }
48
+ async cleanup() {
49
+ this.isInitialized = false;
50
+ }
51
+ async execute(action, params) {
52
+ this.validateAction(action);
53
+ switch (action) {
54
+ case 'validate':
55
+ return this.validateJson(params);
56
+ case 'format':
57
+ return this.formatJson(params);
58
+ default:
59
+ return { success: false, error: `Unknown action: ${action}` };
60
+ }
61
+ }
62
+ /**
63
+ * Validate JSON string and optionally check for required fields
64
+ */
65
+ validateJson(params) {
66
+ const jsonString = params.jsonString;
67
+ const requiredFields = params.requiredFields;
68
+ if (!jsonString || typeof jsonString !== 'string') {
69
+ return {
70
+ success: false,
71
+ error: 'jsonString parameter is required and must be a string',
72
+ };
73
+ }
74
+ try {
75
+ const parsed = JSON.parse(jsonString);
76
+ // Check required fields if specified
77
+ if (requiredFields && Array.isArray(requiredFields)) {
78
+ const missingFields = requiredFields.filter((field) => {
79
+ if (typeof parsed !== 'object' || parsed === null) {
80
+ return true;
81
+ }
82
+ return !(field in parsed);
83
+ });
84
+ if (missingFields.length > 0) {
85
+ return {
86
+ success: false,
87
+ error: `Missing required fields: ${missingFields.join(', ')}`,
88
+ result: {
89
+ valid: false,
90
+ missingFields,
91
+ presentFields: Object.keys(parsed || {}),
92
+ },
93
+ };
94
+ }
95
+ }
96
+ return {
97
+ success: true,
98
+ result: {
99
+ valid: true,
100
+ parsed,
101
+ type: Array.isArray(parsed) ? 'array' : typeof parsed,
102
+ fieldCount: typeof parsed === 'object' && parsed !== null ? Object.keys(parsed).length : undefined,
103
+ },
104
+ summary: `JSON is valid (${Array.isArray(parsed) ? 'array' : typeof parsed})`,
105
+ };
106
+ }
107
+ catch (error) {
108
+ const errorMessage = error.message;
109
+ // Extract position from error message if available
110
+ const posMatch = errorMessage.match(/position\s*(\d+)/i);
111
+ const position = posMatch ? parseInt(posMatch[1]) : undefined;
112
+ // Provide context around the error position
113
+ let context;
114
+ if (position !== undefined) {
115
+ const start = Math.max(0, position - 20);
116
+ const end = Math.min(jsonString.length, position + 20);
117
+ context = jsonString.substring(start, end);
118
+ }
119
+ return {
120
+ success: false,
121
+ error: `Invalid JSON: ${errorMessage}`,
122
+ result: {
123
+ valid: false,
124
+ errorPosition: position,
125
+ errorContext: context,
126
+ },
127
+ };
128
+ }
129
+ }
130
+ /**
131
+ * Format/pretty-print JSON string
132
+ */
133
+ formatJson(params) {
134
+ const jsonString = params.jsonString;
135
+ if (!jsonString || typeof jsonString !== 'string') {
136
+ return {
137
+ success: false,
138
+ error: 'jsonString parameter is required and must be a string',
139
+ };
140
+ }
141
+ try {
142
+ const parsed = JSON.parse(jsonString);
143
+ const formatted = JSON.stringify(parsed, null, 2);
144
+ return {
145
+ success: true,
146
+ result: formatted,
147
+ summary: `Formatted JSON (${formatted.length} chars)`,
148
+ };
149
+ }
150
+ catch (error) {
151
+ return {
152
+ success: false,
153
+ error: `Cannot format invalid JSON: ${error.message}`,
154
+ };
155
+ }
156
+ }
157
+ getCallSummary(action, params) {
158
+ const jsonStr = params.jsonString || '';
159
+ const preview = jsonStr.length > 50 ? jsonStr.substring(0, 50) + '...' : jsonStr;
160
+ switch (action) {
161
+ case 'validate':
162
+ const fields = params.requiredFields;
163
+ const fieldInfo = fields ? ` (checking fields: ${fields.join(', ')})` : '';
164
+ return `Validate JSON: ${preview}${fieldInfo}`;
165
+ case 'format':
166
+ return `Format JSON: ${preview}`;
167
+ default:
168
+ return `JSON ${action}: ${preview}`;
169
+ }
170
+ }
171
+ }
172
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC50b29scy5qc29uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC50b29scy5qc29uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxVQUFVLE1BQU0sNEJBQTRCLENBQUM7QUFDekQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBRTdEOzs7R0FHRztBQUNILE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxlQUFlO0lBQzdDLElBQUksR0FBRyxNQUFNLENBQUM7SUFDZCxXQUFXLEdBQUcsdUdBQXVHLENBQUM7SUFFdEgsT0FBTyxHQUE2QjtRQUN6QztZQUNFLElBQUksRUFBRSxVQUFVO1lBQ2hCLFdBQVcsRUFBRSwyRUFBMkU7WUFDeEYsVUFBVSxFQUFFO2dCQUNWLElBQUksRUFBRSxRQUFRO2dCQUNkLFVBQVUsRUFBRTtvQkFDVixVQUFVLEVBQUU7d0JBQ1YsSUFBSSxFQUFFLFFBQVE7d0JBQ2QsV0FBVyxFQUFFLDZCQUE2QjtxQkFDM0M7b0JBQ0QsY0FBYyxFQUFFO3dCQUNkLElBQUksRUFBRSxPQUFPO3dCQUNiLEtBQUssRUFBRSxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUU7d0JBQ3pCLFdBQVcsRUFBRSxxRUFBcUU7cUJBQ25GO2lCQUNGO2dCQUNELFFBQVEsRUFBRSxDQUFDLFlBQVksQ0FBQzthQUN6QjtTQUNGO1FBQ0Q7WUFDRSxJQUFJLEVBQUUsUUFBUTtZQUNkLFdBQVcsRUFBRSxvQ0FBb0M7WUFDakQsVUFBVSxFQUFFO2dCQUNWLElBQUksRUFBRSxRQUFRO2dCQUNkLFVBQVUsRUFBRTtvQkFDVixVQUFVLEVBQUU7d0JBQ1YsSUFBSSxFQUFFLFFBQVE7d0JBQ2QsV0FBVyxFQUFFLDJCQUEyQjtxQkFDekM7aUJBQ0Y7Z0JBQ0QsUUFBUSxFQUFFLENBQUMsWUFBWSxDQUFDO2FBQ3pCO1NBQ0Y7S0FDRixDQUFDO0lBRUYsS0FBSyxDQUFDLFVBQVU7UUFDZCxJQUFJLENBQUMsYUFBYSxHQUFHLElBQUksQ0FBQztJQUM1QixDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU87UUFDWCxJQUFJLENBQUMsYUFBYSxHQUFHLEtBQUssQ0FBQztJQUM3QixDQUFDO0lBRUQsS0FBSyxDQUFDLE9BQU8sQ0FDWCxNQUFjLEVBQ2QsTUFBK0I7UUFFL0IsSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUU1QixRQUFRLE1BQU0sRUFBRSxDQUFDO1lBQ2YsS0FBSyxVQUFVO2dCQUNiLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNuQyxLQUFLLFFBQVE7Z0JBQ1gsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ2pDO2dCQUNFLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxtQkFBbUIsTUFBTSxFQUFFLEVBQUUsQ0FBQztRQUNsRSxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ssWUFBWSxDQUFDLE1BQStCO1FBQ2xELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxVQUFvQixDQUFDO1FBQy9DLE1BQU0sY0FBYyxHQUFHLE1BQU0sQ0FBQyxjQUFzQyxDQUFDO1FBRXJFLElBQUksQ0FBQyxVQUFVLElBQUksT0FBTyxVQUFVLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDbEQsT0FBTztnQkFDTCxPQUFPLEVBQUUsS0FBSztnQkFDZCxLQUFLLEVBQUUsdURBQXVEO2FBQy9ELENBQUM7UUFDSixDQUFDO1FBRUQsSUFBSSxDQUFDO1lBQ0gsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUV0QyxxQ0FBcUM7WUFDckMsSUFBSSxjQUFjLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsRUFBRSxDQUFDO2dCQUNwRCxNQUFNLGFBQWEsR0FBRyxjQUFjLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7b0JBQ3BELElBQUksT0FBTyxNQUFNLEtBQUssUUFBUSxJQUFJLE1BQU0sS0FBSyxJQUFJLEVBQUUsQ0FBQzt3QkFDbEQsT0FBTyxJQUFJLENBQUM7b0JBQ2QsQ0FBQztvQkFDRCxPQUFPLENBQUMsQ0FBQyxLQUFLLElBQUksTUFBTSxDQUFDLENBQUM7Z0JBQzVCLENBQUMsQ0FBQyxDQUFDO2dCQUVILElBQUksYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztvQkFDN0IsT0FBTzt3QkFDTCxPQUFPLEVBQUUsS0FBSzt3QkFDZCxLQUFLLEVBQUUsNEJBQTRCLGFBQWEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUU7d0JBQzdELE1BQU0sRUFBRTs0QkFDTixLQUFLLEVBQUUsS0FBSzs0QkFDWixhQUFhOzRCQUNiLGFBQWEsRUFBRSxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUM7eUJBQ3pDO3FCQUNGLENBQUM7Z0JBQ0osQ0FBQztZQUNILENBQUM7WUFFRCxPQUFPO2dCQUNMLE9BQU8sRUFBRSxJQUFJO2dCQUNiLE1BQU0sRUFBRTtvQkFDTixLQUFLLEVBQUUsSUFBSTtvQkFDWCxNQUFNO29CQUNOLElBQUksRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sTUFBTTtvQkFDckQsVUFBVSxFQUFFLE9BQU8sTUFBTSxLQUFLLFFBQVEsSUFBSSxNQUFNLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsU0FBUztpQkFDbkc7Z0JBQ0QsT0FBTyxFQUFFLGtCQUFrQixLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sTUFBTSxHQUFHO2FBQzlFLENBQUM7UUFDSixDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLE1BQU0sWUFBWSxHQUFJLEtBQWUsQ0FBQyxPQUFPLENBQUM7WUFFOUMsbURBQW1EO1lBQ25ELE1BQU0sUUFBUSxHQUFHLFlBQVksQ0FBQyxLQUFLLENBQUMsbUJBQW1CLENBQUMsQ0FBQztZQUN6RCxNQUFNLFFBQVEsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1lBRTlELDRDQUE0QztZQUM1QyxJQUFJLE9BQTJCLENBQUM7WUFDaEMsSUFBSSxRQUFRLEtBQUssU0FBUyxFQUFFLENBQUM7Z0JBQzNCLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLFFBQVEsR0FBRyxFQUFFLENBQUMsQ0FBQztnQkFDekMsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLFFBQVEsR0FBRyxFQUFFLENBQUMsQ0FBQztnQkFDdkQsT0FBTyxHQUFHLFVBQVUsQ0FBQyxTQUFTLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBQzdDLENBQUM7WUFFRCxPQUFPO2dCQUNMLE9BQU8sRUFBRSxLQUFLO2dCQUNkLEtBQUssRUFBRSxpQkFBaUIsWUFBWSxFQUFFO2dCQUN0QyxNQUFNLEVBQUU7b0JBQ04sS0FBSyxFQUFFLEtBQUs7b0JBQ1osYUFBYSxFQUFFLFFBQVE7b0JBQ3ZCLFlBQVksRUFBRSxPQUFPO2lCQUN0QjthQUNGLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ssVUFBVSxDQUFDLE1BQStCO1FBQ2hELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxVQUFvQixDQUFDO1FBRS9DLElBQUksQ0FBQyxVQUFVLElBQUksT0FBTyxVQUFVLEtBQUssUUFBUSxFQUFFLENBQUM7WUFDbEQsT0FBTztnQkFDTCxPQUFPLEVBQUUsS0FBSztnQkFDZCxLQUFLLEVBQUUsdURBQXVEO2FBQy9ELENBQUM7UUFDSixDQUFDO1FBRUQsSUFBSSxDQUFDO1lBQ0gsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUN0QyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFFbEQsT0FBTztnQkFDTCxPQUFPLEVBQUUsSUFBSTtnQkFDYixNQUFNLEVBQUUsU0FBUztnQkFDakIsT0FBTyxFQUFFLG1CQUFtQixTQUFTLENBQUMsTUFBTSxTQUFTO2FBQ3RELENBQUM7UUFDSixDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLE9BQU87Z0JBQ0wsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsS0FBSyxFQUFFLCtCQUFnQyxLQUFlLENBQUMsT0FBTyxFQUFFO2FBQ2pFLENBQUM7UUFDSixDQUFDO0lBQ0gsQ0FBQztJQUVELGNBQWMsQ0FBQyxNQUFjLEVBQUUsTUFBK0I7UUFDNUQsTUFBTSxPQUFPLEdBQUksTUFBTSxDQUFDLFVBQXFCLElBQUksRUFBRSxDQUFDO1FBQ3BELE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQztRQUVqRixRQUFRLE1BQU0sRUFBRSxDQUFDO1lBQ2YsS0FBSyxVQUFVO2dCQUNiLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxjQUFzQyxDQUFDO2dCQUM3RCxNQUFNLFNBQVMsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDLHNCQUFzQixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDM0UsT0FBTyxrQkFBa0IsT0FBTyxHQUFHLFNBQVMsRUFBRSxDQUFDO1lBQ2pELEtBQUssUUFBUTtnQkFDWCxPQUFPLGdCQUFnQixPQUFPLEVBQUUsQ0FBQztZQUNuQztnQkFDRSxPQUFPLFFBQVEsTUFBTSxLQUFLLE9BQU8sRUFBRSxDQUFDO1FBQ3hDLENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartagent",
3
- "version": "1.2.7",
3
+ "version": "1.3.0",
4
4
  "private": false,
5
5
  "description": "an agentic framework built on top of @push.rocks/smartai",
6
6
  "main": "dist_ts/index.js",
@@ -21,7 +21,7 @@
21
21
  "@types/node": "^25.0.2"
22
22
  },
23
23
  "dependencies": {
24
- "@push.rocks/smartai": "^0.11.0",
24
+ "@push.rocks/smartai": "^0.12.0",
25
25
  "@push.rocks/smartbrowser": "^2.0.8",
26
26
  "@push.rocks/smartdeno": "^1.2.0",
27
27
  "@push.rocks/smartfs": "^1.2.0",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartagent',
6
- version: '1.2.7',
6
+ version: '1.3.0',
7
7
  description: 'an agentic framework built on top of @push.rocks/smartai'
8
8
  }
package/ts/index.ts CHANGED
@@ -16,6 +16,7 @@ export { HttpTool } from './smartagent.tools.http.js';
16
16
  export { ShellTool } from './smartagent.tools.shell.js';
17
17
  export { BrowserTool } from './smartagent.tools.browser.js';
18
18
  export { DenoTool, type TDenoPermission } from './smartagent.tools.deno.js';
19
+ export { JsonValidatorTool } from './smartagent.tools.json.js';
19
20
 
20
21
  // Export all interfaces
21
22
  export * from './smartagent.interfaces.js';
@@ -10,6 +10,8 @@ export interface IDriverAgentOptions {
10
10
  systemMessage?: string;
11
11
  /** Maximum history messages to pass to API (default: 20). Set to 0 for unlimited. */
12
12
  maxHistoryMessages?: number;
13
+ /** Callback fired for each token during LLM generation */
14
+ onToken?: (token: string) => void;
13
15
  }
14
16
 
15
17
  /**
@@ -22,6 +24,7 @@ export class DriverAgent {
22
24
  private maxHistoryMessages: number;
23
25
  private messageHistory: plugins.smartai.ChatMessage[] = [];
24
26
  private tools: Map<string, BaseToolWrapper> = new Map();
27
+ private onToken?: (token: string) => void;
25
28
 
26
29
  constructor(
27
30
  provider: plugins.smartai.MultiModalModel,
@@ -36,9 +39,18 @@ export class DriverAgent {
36
39
  } else {
37
40
  this.systemMessage = options?.systemMessage || this.getDefaultSystemMessage();
38
41
  this.maxHistoryMessages = options?.maxHistoryMessages ?? 20;
42
+ this.onToken = options?.onToken;
39
43
  }
40
44
  }
41
45
 
46
+ /**
47
+ * Set the token callback for streaming mode
48
+ * @param callback Function to call for each generated token
49
+ */
50
+ public setOnToken(callback: (token: string) => void): void {
51
+ this.onToken = callback;
52
+ }
53
+
42
54
  /**
43
55
  * Register a tool for use by the driver
44
56
  */
@@ -55,8 +67,10 @@ export class DriverAgent {
55
67
 
56
68
  /**
57
69
  * Initialize a new conversation for a task
70
+ * @param task The task description
71
+ * @param images Optional base64-encoded images for vision tasks
58
72
  */
59
- public async startTask(task: string): Promise<interfaces.IAgentMessage> {
73
+ public async startTask(task: string, images?: string[]): Promise<interfaces.IAgentMessage> {
60
74
  // Reset message history
61
75
  this.messageHistory = [];
62
76
 
@@ -85,18 +99,34 @@ export class DriverAgent {
85
99
  fullSystemMessage = this.getNoToolsSystemMessage();
86
100
  }
87
101
 
88
- // Get response from provider
89
- const response = await this.provider.chat({
90
- systemMessage: fullSystemMessage,
91
- userMessage: userMessage,
92
- messageHistory: [],
93
- });
102
+ // Get response from provider - use streaming if available and callback is set
103
+ let response: plugins.smartai.ChatResponse;
104
+
105
+ if (this.onToken && typeof (this.provider as any).chatStreaming === 'function') {
106
+ // Use streaming mode with token callback
107
+ response = await (this.provider as any).chatStreaming({
108
+ systemMessage: fullSystemMessage,
109
+ userMessage: userMessage,
110
+ messageHistory: [],
111
+ images: images,
112
+ onToken: this.onToken,
113
+ });
114
+ } else {
115
+ // Fallback to non-streaming mode
116
+ response = await this.provider.chat({
117
+ systemMessage: fullSystemMessage,
118
+ userMessage: userMessage,
119
+ messageHistory: [],
120
+ images: images,
121
+ });
122
+ }
94
123
 
95
- // Add assistant response to history
96
- this.messageHistory.push({
124
+ // Add assistant response to history (store images if provided)
125
+ const historyMessage: plugins.smartai.ChatMessage = {
97
126
  role: 'assistant',
98
127
  content: response.message,
99
- });
128
+ };
129
+ this.messageHistory.push(historyMessage);
100
130
 
101
131
  return {
102
132
  role: 'assistant',
@@ -139,11 +169,25 @@ export class DriverAgent {
139
169
  historyForChat = fullHistory;
140
170
  }
141
171
 
142
- const response = await this.provider.chat({
143
- systemMessage: fullSystemMessage,
144
- userMessage: message,
145
- messageHistory: historyForChat,
146
- });
172
+ // Get response from provider - use streaming if available and callback is set
173
+ let response: plugins.smartai.ChatResponse;
174
+
175
+ if (this.onToken && typeof (this.provider as any).chatStreaming === 'function') {
176
+ // Use streaming mode with token callback
177
+ response = await (this.provider as any).chatStreaming({
178
+ systemMessage: fullSystemMessage,
179
+ userMessage: message,
180
+ messageHistory: historyForChat,
181
+ onToken: this.onToken,
182
+ });
183
+ } else {
184
+ // Fallback to non-streaming mode
185
+ response = await this.provider.chat({
186
+ systemMessage: fullSystemMessage,
187
+ userMessage: message,
188
+ messageHistory: historyForChat,
189
+ });
190
+ }
147
191
 
148
192
  // Add assistant response to history
149
193
  this.messageHistory.push({
@@ -181,9 +181,15 @@ export class DualAgentOrchestrator {
181
181
  : this.driverProvider;
182
182
 
183
183
  // NOW create agents with initialized providers
184
+ // Set up token callback wrapper if streaming is enabled
185
+ const driverOnToken = this.options.onToken
186
+ ? (token: string) => this.options.onToken!(token, 'driver')
187
+ : undefined;
188
+
184
189
  this.driver = new DriverAgent(this.driverProvider, {
185
190
  systemMessage: this.options.driverSystemMessage,
186
191
  maxHistoryMessages: this.options.maxHistoryMessages,
192
+ onToken: driverOnToken,
187
193
  });
188
194
  this.guardian = new GuardianAgent(this.guardianProvider, this.options.guardianPolicyPrompt);
189
195
 
@@ -228,8 +234,10 @@ export class DualAgentOrchestrator {
228
234
 
229
235
  /**
230
236
  * Run a task through the dual-agent system
237
+ * @param task The task description
238
+ * @param options Optional task run options (e.g., images for vision tasks)
231
239
  */
232
- public async run(task: string): Promise<interfaces.IDualAgentRunResult> {
240
+ public async run(task: string, options?: interfaces.ITaskRunOptions): Promise<interfaces.IDualAgentRunResult> {
233
241
  if (!this.isRunning) {
234
242
  throw new Error('Orchestrator not started. Call start() first.');
235
243
  }
@@ -240,14 +248,17 @@ export class DualAgentOrchestrator {
240
248
  let completed = false;
241
249
  let finalResult: string | null = null;
242
250
 
251
+ // Extract images from options
252
+ const images = options?.images;
253
+
243
254
  // Add initial task to history
244
255
  this.conversationHistory.push({
245
256
  role: 'user',
246
257
  content: task,
247
258
  });
248
259
 
249
- // Start the driver with the task
250
- let driverResponse = await this.driver.startTask(task);
260
+ // Start the driver with the task and optional images
261
+ let driverResponse = await this.driver.startTask(task, images);
251
262
  this.conversationHistory.push(driverResponse);
252
263
 
253
264
  // Emit task started event
@@ -1,5 +1,17 @@
1
1
  import * as plugins from './plugins.js';
2
2
 
3
+ // ================================
4
+ // Task Run Options
5
+ // ================================
6
+
7
+ /**
8
+ * Options for running a task with the DualAgentOrchestrator
9
+ */
10
+ export interface ITaskRunOptions {
11
+ /** Base64-encoded images to include with the task (for vision-capable models) */
12
+ images?: string[];
13
+ }
14
+
3
15
  // ================================
4
16
  // Agent Configuration Interfaces
5
17
  // ================================
@@ -34,6 +46,8 @@ export interface IDualAgentOptions extends plugins.smartai.ISmartAiOptions {
34
46
  onProgress?: (event: IProgressEvent) => void;
35
47
  /** Prefix for log messages (e.g., "[README]", "[Commit]"). Default: empty */
36
48
  logPrefix?: string;
49
+ /** Callback fired for each token during LLM generation (streaming mode) */
50
+ onToken?: (token: string, source: 'driver' | 'guardian') => void;
37
51
  }
38
52
 
39
53
  // ================================
@@ -0,0 +1,193 @@
1
+ import * as interfaces from './smartagent.interfaces.js';
2
+ import { BaseToolWrapper } from './smartagent.tools.base.js';
3
+
4
+ /**
5
+ * JsonValidatorTool - Validates and formats JSON data
6
+ * Useful for agents to self-validate their JSON output before completing a task
7
+ */
8
+ export class JsonValidatorTool extends BaseToolWrapper {
9
+ public name = 'json';
10
+ public description = 'Validate and format JSON data. Use this to verify your JSON output is valid before completing a task.';
11
+
12
+ public actions: interfaces.IToolAction[] = [
13
+ {
14
+ name: 'validate',
15
+ description: 'Validate that a string is valid JSON and optionally check required fields',
16
+ parameters: {
17
+ type: 'object',
18
+ properties: {
19
+ jsonString: {
20
+ type: 'string',
21
+ description: 'The JSON string to validate',
22
+ },
23
+ requiredFields: {
24
+ type: 'array',
25
+ items: { type: 'string' },
26
+ description: 'Optional list of field names that must be present at the root level',
27
+ },
28
+ },
29
+ required: ['jsonString'],
30
+ },
31
+ },
32
+ {
33
+ name: 'format',
34
+ description: 'Parse and pretty-print JSON string',
35
+ parameters: {
36
+ type: 'object',
37
+ properties: {
38
+ jsonString: {
39
+ type: 'string',
40
+ description: 'The JSON string to format',
41
+ },
42
+ },
43
+ required: ['jsonString'],
44
+ },
45
+ },
46
+ ];
47
+
48
+ async initialize(): Promise<void> {
49
+ this.isInitialized = true;
50
+ }
51
+
52
+ async cleanup(): Promise<void> {
53
+ this.isInitialized = false;
54
+ }
55
+
56
+ async execute(
57
+ action: string,
58
+ params: Record<string, unknown>
59
+ ): Promise<interfaces.IToolExecutionResult> {
60
+ this.validateAction(action);
61
+
62
+ switch (action) {
63
+ case 'validate':
64
+ return this.validateJson(params);
65
+ case 'format':
66
+ return this.formatJson(params);
67
+ default:
68
+ return { success: false, error: `Unknown action: ${action}` };
69
+ }
70
+ }
71
+
72
+ /**
73
+ * Validate JSON string and optionally check for required fields
74
+ */
75
+ private validateJson(params: Record<string, unknown>): interfaces.IToolExecutionResult {
76
+ const jsonString = params.jsonString as string;
77
+ const requiredFields = params.requiredFields as string[] | undefined;
78
+
79
+ if (!jsonString || typeof jsonString !== 'string') {
80
+ return {
81
+ success: false,
82
+ error: 'jsonString parameter is required and must be a string',
83
+ };
84
+ }
85
+
86
+ try {
87
+ const parsed = JSON.parse(jsonString);
88
+
89
+ // Check required fields if specified
90
+ if (requiredFields && Array.isArray(requiredFields)) {
91
+ const missingFields = requiredFields.filter((field) => {
92
+ if (typeof parsed !== 'object' || parsed === null) {
93
+ return true;
94
+ }
95
+ return !(field in parsed);
96
+ });
97
+
98
+ if (missingFields.length > 0) {
99
+ return {
100
+ success: false,
101
+ error: `Missing required fields: ${missingFields.join(', ')}`,
102
+ result: {
103
+ valid: false,
104
+ missingFields,
105
+ presentFields: Object.keys(parsed || {}),
106
+ },
107
+ };
108
+ }
109
+ }
110
+
111
+ return {
112
+ success: true,
113
+ result: {
114
+ valid: true,
115
+ parsed,
116
+ type: Array.isArray(parsed) ? 'array' : typeof parsed,
117
+ fieldCount: typeof parsed === 'object' && parsed !== null ? Object.keys(parsed).length : undefined,
118
+ },
119
+ summary: `JSON is valid (${Array.isArray(parsed) ? 'array' : typeof parsed})`,
120
+ };
121
+ } catch (error) {
122
+ const errorMessage = (error as Error).message;
123
+
124
+ // Extract position from error message if available
125
+ const posMatch = errorMessage.match(/position\s*(\d+)/i);
126
+ const position = posMatch ? parseInt(posMatch[1]) : undefined;
127
+
128
+ // Provide context around the error position
129
+ let context: string | undefined;
130
+ if (position !== undefined) {
131
+ const start = Math.max(0, position - 20);
132
+ const end = Math.min(jsonString.length, position + 20);
133
+ context = jsonString.substring(start, end);
134
+ }
135
+
136
+ return {
137
+ success: false,
138
+ error: `Invalid JSON: ${errorMessage}`,
139
+ result: {
140
+ valid: false,
141
+ errorPosition: position,
142
+ errorContext: context,
143
+ },
144
+ };
145
+ }
146
+ }
147
+
148
+ /**
149
+ * Format/pretty-print JSON string
150
+ */
151
+ private formatJson(params: Record<string, unknown>): interfaces.IToolExecutionResult {
152
+ const jsonString = params.jsonString as string;
153
+
154
+ if (!jsonString || typeof jsonString !== 'string') {
155
+ return {
156
+ success: false,
157
+ error: 'jsonString parameter is required and must be a string',
158
+ };
159
+ }
160
+
161
+ try {
162
+ const parsed = JSON.parse(jsonString);
163
+ const formatted = JSON.stringify(parsed, null, 2);
164
+
165
+ return {
166
+ success: true,
167
+ result: formatted,
168
+ summary: `Formatted JSON (${formatted.length} chars)`,
169
+ };
170
+ } catch (error) {
171
+ return {
172
+ success: false,
173
+ error: `Cannot format invalid JSON: ${(error as Error).message}`,
174
+ };
175
+ }
176
+ }
177
+
178
+ getCallSummary(action: string, params: Record<string, unknown>): string {
179
+ const jsonStr = (params.jsonString as string) || '';
180
+ const preview = jsonStr.length > 50 ? jsonStr.substring(0, 50) + '...' : jsonStr;
181
+
182
+ switch (action) {
183
+ case 'validate':
184
+ const fields = params.requiredFields as string[] | undefined;
185
+ const fieldInfo = fields ? ` (checking fields: ${fields.join(', ')})` : '';
186
+ return `Validate JSON: ${preview}${fieldInfo}`;
187
+ case 'format':
188
+ return `Format JSON: ${preview}`;
189
+ default:
190
+ return `JSON ${action}: ${preview}`;
191
+ }
192
+ }
193
+ }