@push.rocks/smartagent 1.5.0 → 1.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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartagent',
6
- version: '1.5.0',
6
+ version: '1.5.2',
7
7
  description: 'an agentic framework built on top of @push.rocks/smartai'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDBEQUEwRDtDQUN4RSxDQUFBIn0=
@@ -92,4 +92,41 @@ export declare class DriverAgent {
92
92
  * Reset the conversation state
93
93
  */
94
94
  reset(): void;
95
+ /**
96
+ * Start a task with native tool calling support
97
+ * Uses Ollama's native tool calling API instead of XML parsing
98
+ * @param task The task description
99
+ * @param images Optional base64-encoded images for vision tasks
100
+ * @returns Response with content, reasoning, and any tool calls
101
+ */
102
+ startTaskWithNativeTools(task: string, images?: string[]): Promise<{
103
+ message: interfaces.IAgentMessage;
104
+ toolCalls?: interfaces.INativeToolCall[];
105
+ }>;
106
+ /**
107
+ * Continue conversation with native tool calling support
108
+ * @param message The message to continue with (e.g., tool result)
109
+ * @returns Response with content, reasoning, and any tool calls
110
+ */
111
+ continueWithNativeTools(message: string): Promise<{
112
+ message: interfaces.IAgentMessage;
113
+ toolCalls?: interfaces.INativeToolCall[];
114
+ }>;
115
+ /**
116
+ * Get system message for native tool calling mode
117
+ * Simplified prompt that lets the model use tools naturally
118
+ */
119
+ private getNativeToolsSystemMessage;
120
+ /**
121
+ * Convert registered tools to Ollama JSON Schema format for native tool calling
122
+ * Each tool action becomes a separate function with name format: "toolName_actionName"
123
+ * @returns Array of IOllamaTool compatible tool definitions
124
+ */
125
+ getToolsAsJsonSchema(): plugins.smartai.IOllamaTool[];
126
+ /**
127
+ * Parse native tool calls from provider response into IToolCallProposal format
128
+ * @param toolCalls Array of native tool calls from the provider
129
+ * @returns Array of IToolCallProposal ready for execution
130
+ */
131
+ parseNativeToolCalls(toolCalls: interfaces.INativeToolCall[]): interfaces.IToolCallProposal[];
95
132
  }
@@ -382,5 +382,219 @@ Your complete output here
382
382
  reset() {
383
383
  this.messageHistory = [];
384
384
  }
385
+ // ================================
386
+ // Native Tool Calling Support
387
+ // ================================
388
+ /**
389
+ * Start a task with native tool calling support
390
+ * Uses Ollama's native tool calling API instead of XML parsing
391
+ * @param task The task description
392
+ * @param images Optional base64-encoded images for vision tasks
393
+ * @returns Response with content, reasoning, and any tool calls
394
+ */
395
+ async startTaskWithNativeTools(task, images) {
396
+ // Reset message history
397
+ this.messageHistory = [];
398
+ // Build simple user message (no XML instructions needed for native tool calling)
399
+ const userMessage = `TASK: ${task}\n\nComplete this task using the available tools. When done, provide your final output.`;
400
+ // Add to history
401
+ this.messageHistory.push({
402
+ role: 'user',
403
+ content: userMessage,
404
+ });
405
+ // Build system message for native tool calling
406
+ const fullSystemMessage = this.getNativeToolsSystemMessage();
407
+ // Get tools in JSON schema format
408
+ const tools = this.getToolsAsJsonSchema();
409
+ // Check if provider supports native tool calling (Ollama)
410
+ const provider = this.provider;
411
+ if (typeof provider.collectStreamResponse !== 'function') {
412
+ throw new Error('Provider does not support native tool calling. Use startTask() instead.');
413
+ }
414
+ // Use collectStreamResponse for streaming support with tools
415
+ const response = await provider.collectStreamResponse({
416
+ systemMessage: fullSystemMessage,
417
+ userMessage: userMessage,
418
+ messageHistory: [],
419
+ images: images,
420
+ tools: tools.length > 0 ? tools : undefined,
421
+ },
422
+ // Pass onToken callback through onChunk for streaming
423
+ this.onToken ? (chunk) => {
424
+ if (chunk.thinking && this.onToken)
425
+ this.onToken(chunk.thinking);
426
+ if (chunk.content && this.onToken)
427
+ this.onToken(chunk.content);
428
+ } : undefined);
429
+ // Add assistant response to history
430
+ const historyMessage = {
431
+ role: 'assistant',
432
+ content: response.message || '',
433
+ reasoning: response.thinking || response.reasoning,
434
+ };
435
+ this.messageHistory.push(historyMessage);
436
+ // Convert Ollama tool calls to our format
437
+ let toolCalls;
438
+ if (response.toolCalls && response.toolCalls.length > 0) {
439
+ toolCalls = response.toolCalls.map((tc) => ({
440
+ function: {
441
+ name: tc.function.name,
442
+ arguments: tc.function.arguments,
443
+ index: tc.function.index,
444
+ },
445
+ }));
446
+ }
447
+ return {
448
+ message: {
449
+ role: 'assistant',
450
+ content: response.message || '',
451
+ },
452
+ toolCalls,
453
+ };
454
+ }
455
+ /**
456
+ * Continue conversation with native tool calling support
457
+ * @param message The message to continue with (e.g., tool result)
458
+ * @returns Response with content, reasoning, and any tool calls
459
+ */
460
+ async continueWithNativeTools(message) {
461
+ // Add the new message to history
462
+ this.messageHistory.push({
463
+ role: 'user',
464
+ content: message,
465
+ });
466
+ // Build system message
467
+ const fullSystemMessage = this.getNativeToolsSystemMessage();
468
+ // Get tools in JSON schema format
469
+ const tools = this.getToolsAsJsonSchema();
470
+ // Get response from provider with history windowing
471
+ let historyForChat;
472
+ const fullHistory = this.messageHistory.slice(0, -1);
473
+ if (this.maxHistoryMessages > 0 && fullHistory.length > this.maxHistoryMessages) {
474
+ historyForChat = [
475
+ fullHistory[0],
476
+ ...fullHistory.slice(-(this.maxHistoryMessages - 1)),
477
+ ];
478
+ }
479
+ else {
480
+ historyForChat = fullHistory;
481
+ }
482
+ // Check if provider supports native tool calling
483
+ const provider = this.provider;
484
+ if (typeof provider.collectStreamResponse !== 'function') {
485
+ throw new Error('Provider does not support native tool calling. Use continueWithMessage() instead.');
486
+ }
487
+ // Use collectStreamResponse for streaming support with tools
488
+ const response = await provider.collectStreamResponse({
489
+ systemMessage: fullSystemMessage,
490
+ userMessage: message,
491
+ messageHistory: historyForChat,
492
+ tools: tools.length > 0 ? tools : undefined,
493
+ },
494
+ // Pass onToken callback through onChunk for streaming
495
+ this.onToken ? (chunk) => {
496
+ if (chunk.thinking && this.onToken)
497
+ this.onToken(chunk.thinking);
498
+ if (chunk.content && this.onToken)
499
+ this.onToken(chunk.content);
500
+ } : undefined);
501
+ // Add assistant response to history
502
+ this.messageHistory.push({
503
+ role: 'assistant',
504
+ content: response.message || '',
505
+ reasoning: response.thinking || response.reasoning,
506
+ });
507
+ // Convert Ollama tool calls to our format
508
+ let toolCalls;
509
+ if (response.toolCalls && response.toolCalls.length > 0) {
510
+ toolCalls = response.toolCalls.map((tc) => ({
511
+ function: {
512
+ name: tc.function.name,
513
+ arguments: tc.function.arguments,
514
+ index: tc.function.index,
515
+ },
516
+ }));
517
+ }
518
+ return {
519
+ message: {
520
+ role: 'assistant',
521
+ content: response.message || '',
522
+ },
523
+ toolCalls,
524
+ };
525
+ }
526
+ /**
527
+ * Get system message for native tool calling mode
528
+ * Simplified prompt that lets the model use tools naturally
529
+ */
530
+ getNativeToolsSystemMessage() {
531
+ return `You are an AI assistant that executes tasks by using available tools.
532
+
533
+ ## Your Role
534
+ You analyze tasks, break them down into steps, and use tools to accomplish goals.
535
+
536
+ ## Guidelines
537
+ 1. Think step by step about what needs to be done
538
+ 2. Use the available tools to complete the task
539
+ 3. Process tool results and continue until the task is complete
540
+ 4. When the task is complete, provide a final summary
541
+
542
+ ## Important
543
+ - Use tools when needed to gather information or perform actions
544
+ - If you need clarification, ask the user
545
+ - Always verify your work before marking the task complete`;
546
+ }
547
+ /**
548
+ * Convert registered tools to Ollama JSON Schema format for native tool calling
549
+ * Each tool action becomes a separate function with name format: "toolName_actionName"
550
+ * @returns Array of IOllamaTool compatible tool definitions
551
+ */
552
+ getToolsAsJsonSchema() {
553
+ const tools = [];
554
+ for (const tool of this.tools.values()) {
555
+ for (const action of tool.actions) {
556
+ // Build the tool definition in Ollama format
557
+ const toolDef = {
558
+ type: 'function',
559
+ function: {
560
+ name: `${tool.name}_${action.name}`, // e.g., "json_validate"
561
+ description: `[${tool.name}] ${action.description}`,
562
+ parameters: action.parameters,
563
+ },
564
+ };
565
+ tools.push(toolDef);
566
+ }
567
+ }
568
+ return tools;
569
+ }
570
+ /**
571
+ * Parse native tool calls from provider response into IToolCallProposal format
572
+ * @param toolCalls Array of native tool calls from the provider
573
+ * @returns Array of IToolCallProposal ready for execution
574
+ */
575
+ parseNativeToolCalls(toolCalls) {
576
+ return toolCalls.map(tc => {
577
+ // Split "json_validate" -> toolName="json", action="validate"
578
+ const fullName = tc.function.name;
579
+ const underscoreIndex = fullName.indexOf('_');
580
+ let toolName;
581
+ let action;
582
+ if (underscoreIndex > 0) {
583
+ toolName = fullName.substring(0, underscoreIndex);
584
+ action = fullName.substring(underscoreIndex + 1);
585
+ }
586
+ else {
587
+ // Fallback: treat entire name as tool name with empty action
588
+ toolName = fullName;
589
+ action = '';
590
+ }
591
+ return {
592
+ proposalId: this.generateProposalId(),
593
+ toolName,
594
+ action,
595
+ params: tc.function.arguments,
596
+ };
597
+ });
598
+ }
385
599
  }
386
- //# 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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"}
600
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.classes.driveragent.js","sourceRoot":"","sources":["../ts/smartagent.classes.driveragent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AAezD;;;GAGG;AACH,MAAM,OAAO,WAAW;IACd,QAAQ,CAAkC;IAC1C,aAAa,CAAS;IACtB,kBAAkB,CAAS;IAC3B,cAAc,GAAkC,EAAE,CAAC;IACnD,KAAK,GAAiC,IAAI,GAAG,EAAE,CAAC;IAChD,OAAO,CAA2B;IAE1C,YACE,QAAyC,EACzC,OAAsC;QAEtC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,kEAAkE;QAClE,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,IAAI,CAAC,aAAa,GAAG,OAAO,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC/D,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,aAAa,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC9E,IAAI,CAAC,kBAAkB,GAAG,OAAO,EAAE,kBAAkB,IAAI,EAAE,CAAC;YAC5D,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;QAClC,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,UAAU,CAAC,QAAiC;QACjD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED;;OAEG;IACI,YAAY,CAAC,IAAqB;QACvC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,SAAS,CAAC,IAAY,EAAE,MAAiB;QACpD,wBAAwB;QACxB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAEzB,kDAAkD;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QACrC,IAAI,WAAmB,CAAC;QACxB,IAAI,QAAQ,EAAE,CAAC;YACb,WAAW,GAAG,SAAS,IAAI,uHAAuH,CAAC;QACrJ,CAAC;aAAM,CAAC;YACN,WAAW,GAAG,SAAS,IAAI,6HAA6H,CAAC;QAC3J,CAAC;QAED,iBAAiB;QACjB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;QAEH,4DAA4D;QAC5D,IAAI,iBAAyB,CAAC;QAC9B,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACtD,iBAAiB,GAAG,GAAG,IAAI,CAAC,aAAa,2BAA2B,gBAAgB,EAAE,CAAC;QACzF,CAAC;aAAM,CAAC;YACN,2DAA2D;YAC3D,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrD,CAAC;QAED,8EAA8E;QAC9E,IAAI,QAAsC,CAAC;QAE3C,IAAI,IAAI,CAAC,OAAO,IAAI,OAAQ,IAAI,CAAC,QAAgB,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;YAC/E,yCAAyC;YACzC,QAAQ,GAAG,MAAO,IAAI,CAAC,QAAgB,CAAC,aAAa,CAAC;gBACpD,aAAa,EAAE,iBAAiB;gBAChC,WAAW,EAAE,WAAW;gBACxB,cAAc,EAAE,EAAE;gBAClB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAClC,aAAa,EAAE,iBAAiB;gBAChC,WAAW,EAAE,WAAW;gBACxB,cAAc,EAAE,EAAE;gBAClB,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;QACL,CAAC;QAED,+FAA+F;QAC/F,MAAM,cAAc,GAAgC;YAClD,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEzC,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,mBAAmB,CAAC,OAAe;QAC9C,iCAAiC;QACjC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,4DAA4D;QAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QACrC,IAAI,iBAAyB,CAAC;QAC9B,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACtD,iBAAiB,GAAG,GAAG,IAAI,CAAC,aAAa,2BAA2B,gBAAgB,EAAE,CAAC;QACzF,CAAC;aAAM,CAAC;YACN,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrD,CAAC;QAED,oDAAoD;QACpD,uEAAuE;QACvE,IAAI,cAA6C,CAAC;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,iCAAiC;QAEvF,IAAI,IAAI,CAAC,kBAAkB,GAAG,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAChF,kEAAkE;YAClE,cAAc,GAAG;gBACf,WAAW,CAAC,CAAC,CAAC,EAAE,gBAAgB;gBAChC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,EAAE,kBAAkB;aACzE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,WAAW,CAAC;QAC/B,CAAC;QAED,8EAA8E;QAC9E,IAAI,QAAsC,CAAC;QAE3C,IAAI,IAAI,CAAC,OAAO,IAAI,OAAQ,IAAI,CAAC,QAAgB,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;YAC/E,yCAAyC;YACzC,QAAQ,GAAG,MAAO,IAAI,CAAC,QAAgB,CAAC,aAAa,CAAC;gBACpD,aAAa,EAAE,iBAAiB;gBAChC,WAAW,EAAE,OAAO;gBACpB,cAAc,EAAE,cAAc;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAClC,aAAa,EAAE,iBAAiB;gBAChC,WAAW,EAAE,OAAO;gBACpB,cAAc,EAAE,cAAc;aAC/B,CAAC,CAAC;QACL,CAAC;QAED,qEAAqE;QACrE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAC;QAEH,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO;SAC1B,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,sBAAsB,CAAC,QAAgB;QAC5C,MAAM,SAAS,GAAmC,EAAE,CAAC;QAErD,0CAA0C;QAC1C,MAAM,aAAa,GAAG,qCAAqC,CAAC;QAC5D,IAAI,KAAK,CAAC;QAEV,OAAO,CAAC,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACvD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAEzB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;gBACpD,IAAI,QAAQ,EAAE,CAAC;oBACb,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,4BAA4B;gBAC5B,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,OAAe;QAC1C,oBAAoB;QACpB,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACxD,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAErC,iBAAiB;QACjB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9D,IAAI,CAAC,WAAW;YAAE,OAAO,IAAI,CAAC;QAC9B,MAAM,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAErC,wBAAwB;QACxB,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClE,IAAI,MAAM,GAA4B,EAAE,CAAC;QACzC,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7C,CAAC;YAAC,MAAM,CAAC;gBACP,qDAAqD;gBACrD,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,CAAC;QACH,CAAC;QAED,+BAA+B;QAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;QAC3E,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,kBAAkB,EAAE;YACrC,QAAQ;YACR,MAAM;YACN,MAAM;YACN,SAAS;SACV,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,OAAe;QAC1C,MAAM,MAAM,GAA4B,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,0BAA0B,CAAC;QAC9C,IAAI,KAAK,CAAC;QAEV,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;YACnD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,KAAK,GAAY,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAErC,0CAA0C;YAC1C,IAAI,CAAC;gBACH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;YACtC,CAAC;YAAC,MAAM,CAAC;gBACP,mCAAmC;YACrC,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,cAAc,CAAC,QAAgB;QACpC,wCAAwC;QACxC,MAAM,iBAAiB,GAAG;YACxB,iBAAiB;YACjB,kBAAkB;YAClB,eAAe;YACf,6BAA6B;SAC9B,CAAC;QAEF,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC7C,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CACrC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAC7C,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,kBAAkB,CAAC,QAAgB;QACxC,MAAM,oBAAoB,GAAG;YAC3B,uBAAuB;YACvB,YAAY;YACZ,gBAAgB;YAChB,mBAAmB;YACnB,qBAAqB;SACtB,CAAC;QAEF,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;QAC7C,OAAO,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CACxC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAC7C,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,iBAAiB,CAAC,QAAgB;QACvC,kCAAkC;QAClC,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC7E,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;QAED,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QACnF,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACjC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACK,qBAAqB;QAC3B,MAAM,YAAY,GAAa,EAAE,CAAC;QAElC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACK,kBAAkB;QACxB,OAAO,QAAQ,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IAC5E,CAAC;IAED;;OAEG;IACK,uBAAuB;QAC7B,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gGAgCqF,CAAC;IAC/F,CAAC;IAED;;;OAGG;IACK,uBAAuB;QAC7B,wEAAwE;QACxE,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC,uBAAuB,EAAE,EAAE,CAAC;YAChF,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;QAED,OAAO;;;;;;;;;;;;;;;;iGAgBsF,CAAC;IAChG,CAAC;IAED;;OAEG;IACI,KAAK;QACV,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;IAC3B,CAAC;IAED,mCAAmC;IACnC,8BAA8B;IAC9B,mCAAmC;IAEnC;;;;;;OAMG;IACI,KAAK,CAAC,wBAAwB,CACnC,IAAY,EACZ,MAAiB;QAEjB,wBAAwB;QACxB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QAEzB,iFAAiF;QACjF,MAAM,WAAW,GAAG,SAAS,IAAI,yFAAyF,CAAC;QAE3H,iBAAiB;QACjB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,WAAW;SACrB,CAAC,CAAC;QAEH,+CAA+C;QAC/C,MAAM,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAE7D,kCAAkC;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE1C,0DAA0D;QAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAe,CAAC;QACtC,IAAI,OAAO,QAAQ,CAAC,qBAAqB,KAAK,UAAU,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;QAC7F,CAAC;QAED,6DAA6D;QAC7D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,qBAAqB,CACnD;YACE,aAAa,EAAE,iBAAiB;YAChC,WAAW,EAAE,WAAW;YACxB,cAAc,EAAE,EAAE;YAClB,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;SAC5C;QACD,sDAAsD;QACtD,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5B,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACjE,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC,CAAC,SAAS,CACd,CAAC;QAEF,oCAAoC;QACpC,MAAM,cAAc,GAAgC;YAClD,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;YAC/B,SAAS,EAAE,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS;SACnD,CAAC;QACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEzC,0CAA0C;QAC1C,IAAI,SAAmD,CAAC;QACxD,IAAI,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,CAAC;gBAC/C,QAAQ,EAAE;oBACR,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;oBACtB,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;oBAChC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK;iBACzB;aACF,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO;YACL,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;aAChC;YACD,SAAS;SACV,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,uBAAuB,CAClC,OAAe;QAEf,iCAAiC;QACjC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QAEH,uBAAuB;QACvB,MAAM,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAE7D,kCAAkC;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAE1C,oDAAoD;QACpD,IAAI,cAA6C,CAAC;QAClD,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAErD,IAAI,IAAI,CAAC,kBAAkB,GAAG,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAChF,cAAc,GAAG;gBACf,WAAW,CAAC,CAAC,CAAC;gBACd,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC;aACrD,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,WAAW,CAAC;QAC/B,CAAC;QAED,iDAAiD;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAe,CAAC;QACtC,IAAI,OAAO,QAAQ,CAAC,qBAAqB,KAAK,UAAU,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,mFAAmF,CAAC,CAAC;QACvG,CAAC;QAED,6DAA6D;QAC7D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,qBAAqB,CACnD;YACE,aAAa,EAAE,iBAAiB;YAChC,WAAW,EAAE,OAAO;YACpB,cAAc,EAAE,cAAc;YAC9B,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;SAC5C;QACD,sDAAsD;QACtD,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5B,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACjE,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC,CAAC,SAAS,CACd,CAAC;QAEF,oCAAoC;QACpC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;YAC/B,SAAS,EAAE,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS;SACnD,CAAC,CAAC;QAEH,0CAA0C;QAC1C,IAAI,SAAmD,CAAC;QACxD,IAAI,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxD,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAO,EAAE,EAAE,CAAC,CAAC;gBAC/C,QAAQ,EAAE;oBACR,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;oBACtB,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;oBAChC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK;iBACzB;aACF,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO;YACL,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;aAChC;YACD,SAAS;SACV,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,2BAA2B;QACjC,OAAO;;;;;;;;;;;;;;2DAcgD,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACI,oBAAoB;QACzB,MAAM,KAAK,GAAkC,EAAE,CAAC;QAEhD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACvC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClC,6CAA6C;gBAC7C,MAAM,OAAO,GAAgC;oBAC3C,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE;wBACR,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,EAAG,wBAAwB;wBAC9D,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,WAAW,EAAE;wBACnD,UAAU,EAAE,MAAM,CAAC,UAAmE;qBACvF;iBACF,CAAC;gBACF,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACI,oBAAoB,CACzB,SAAuC;QAEvC,OAAO,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACxB,8DAA8D;YAC9D,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;YAClC,MAAM,eAAe,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAE9C,IAAI,QAAgB,CAAC;YACrB,IAAI,MAAc,CAAC;YAEnB,IAAI,eAAe,GAAG,CAAC,EAAE,CAAC;gBACxB,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;gBAClD,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,6DAA6D;gBAC7D,QAAQ,GAAG,QAAQ,CAAC;gBACpB,MAAM,GAAG,EAAE,CAAC;YACd,CAAC;YAED,OAAO;gBACL,UAAU,EAAE,IAAI,CAAC,kBAAkB,EAAE;gBACrC,QAAQ;gBACR,MAAM;gBACN,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS;aAC9B,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
@@ -215,11 +215,15 @@ export class DualAgentOrchestrator {
215
215
  if (!this.isRunning) {
216
216
  throw new Error('Orchestrator not started. Call start() first.');
217
217
  }
218
+ // Use native tool calling if enabled
219
+ const useNativeTools = this.options.useNativeToolCalling === true;
218
220
  this.conversationHistory = [];
219
221
  let iterations = 0;
220
222
  let consecutiveRejections = 0;
221
223
  let completed = false;
222
224
  let finalResult = null;
225
+ // Track pending native tool calls
226
+ let pendingNativeToolCalls;
223
227
  // Extract images from options
224
228
  const images = options?.images;
225
229
  // Add initial task to history
@@ -228,7 +232,17 @@ export class DualAgentOrchestrator {
228
232
  content: task,
229
233
  });
230
234
  // Start the driver with the task and optional images
231
- let driverResponse = await this.driver.startTask(task, images);
235
+ let driverResponse;
236
+ if (useNativeTools) {
237
+ // Native tool calling mode
238
+ const result = await this.driver.startTaskWithNativeTools(task, images);
239
+ driverResponse = result.message;
240
+ pendingNativeToolCalls = result.toolCalls;
241
+ }
242
+ else {
243
+ // XML parsing mode
244
+ driverResponse = await this.driver.startTask(task, images);
245
+ }
232
246
  this.conversationHistory.push(driverResponse);
233
247
  // Emit task started event
234
248
  this.emitProgress({
@@ -245,10 +259,15 @@ export class DualAgentOrchestrator {
245
259
  iteration: iterations,
246
260
  maxIterations: this.options.maxIterations,
247
261
  });
248
- // Check if task is complete
249
- if (this.driver.isTaskComplete(driverResponse.content)) {
262
+ // Check if task is complete (for native mode, no pending tool calls and has content)
263
+ const isComplete = useNativeTools
264
+ ? (!pendingNativeToolCalls || pendingNativeToolCalls.length === 0) && driverResponse.content.length > 0
265
+ : this.driver.isTaskComplete(driverResponse.content);
266
+ if (isComplete) {
250
267
  completed = true;
251
- finalResult = this.driver.extractTaskResult(driverResponse.content) || driverResponse.content;
268
+ finalResult = useNativeTools
269
+ ? driverResponse.content
270
+ : (this.driver.extractTaskResult(driverResponse.content) || driverResponse.content);
252
271
  // Emit task completed event
253
272
  this.emitProgress({
254
273
  type: 'task_completed',
@@ -275,11 +294,32 @@ export class DualAgentOrchestrator {
275
294
  status: 'clarification_needed',
276
295
  };
277
296
  }
278
- // Parse tool call proposals
279
- const proposals = this.driver.parseToolCallProposals(driverResponse.content);
297
+ // Parse tool call proposals - native mode uses pendingNativeToolCalls, XML mode parses content
298
+ let proposals;
299
+ if (useNativeTools && pendingNativeToolCalls && pendingNativeToolCalls.length > 0) {
300
+ // Native tool calling mode - convert native tool calls to proposals
301
+ proposals = this.driver.parseNativeToolCalls(pendingNativeToolCalls);
302
+ pendingNativeToolCalls = undefined; // Clear after processing
303
+ }
304
+ else if (!useNativeTools) {
305
+ // XML parsing mode
306
+ proposals = this.driver.parseToolCallProposals(driverResponse.content);
307
+ }
308
+ else {
309
+ proposals = [];
310
+ }
280
311
  if (proposals.length === 0) {
281
- // No tool calls found - remind the model of the exact XML format
282
- driverResponse = await this.driver.continueWithMessage(`No valid tool call was found in your response. To use a tool, you MUST output the exact XML format:
312
+ if (useNativeTools) {
313
+ // Native mode: no tool calls and no content means we should continue
314
+ const result = await this.driver.continueWithNativeTools('Please continue with the task. Use the available tools or provide your final output.');
315
+ driverResponse = result.message;
316
+ pendingNativeToolCalls = result.toolCalls;
317
+ this.conversationHistory.push(driverResponse);
318
+ continue;
319
+ }
320
+ else {
321
+ // XML mode: remind the model of the exact XML format
322
+ driverResponse = await this.driver.continueWithMessage(`No valid tool call was found in your response. To use a tool, you MUST output the exact XML format:
283
323
 
284
324
  <tool_call>
285
325
  <tool>tool_name</tool>
@@ -298,8 +338,9 @@ Or to complete the task:
298
338
  <task_complete>your final JSON output here</task_complete>
299
339
 
300
340
  Please output the exact XML format above.`);
301
- this.conversationHistory.push(driverResponse);
302
- continue;
341
+ this.conversationHistory.push(driverResponse);
342
+ continue;
343
+ }
303
344
  }
304
345
  // Process the first proposal (one at a time)
305
346
  const proposal = proposals[0];
@@ -393,12 +434,27 @@ Please output the exact XML format above.`);
393
434
  toolCall: proposal,
394
435
  toolResult: result,
395
436
  });
396
- driverResponse = await this.driver.continueWithMessage(resultMessage);
437
+ // Continue with appropriate method based on mode
438
+ if (useNativeTools) {
439
+ const continueResult = await this.driver.continueWithNativeTools(resultMessage);
440
+ driverResponse = continueResult.message;
441
+ pendingNativeToolCalls = continueResult.toolCalls;
442
+ }
443
+ else {
444
+ driverResponse = await this.driver.continueWithMessage(resultMessage);
445
+ }
397
446
  this.conversationHistory.push(driverResponse);
398
447
  }
399
448
  catch (error) {
400
449
  const errorMessage = `Tool execution failed: ${error instanceof Error ? error.message : String(error)}`;
401
- driverResponse = await this.driver.continueWithMessage(`TOOL ERROR: ${errorMessage}\n\nPlease try a different approach.`);
450
+ if (useNativeTools) {
451
+ const continueResult = await this.driver.continueWithNativeTools(`TOOL ERROR: ${errorMessage}\n\nPlease try a different approach.`);
452
+ driverResponse = continueResult.message;
453
+ pendingNativeToolCalls = continueResult.toolCalls;
454
+ }
455
+ else {
456
+ driverResponse = await this.driver.continueWithMessage(`TOOL ERROR: ${errorMessage}\n\nPlease try a different approach.`);
457
+ }
402
458
  this.conversationHistory.push(driverResponse);
403
459
  }
404
460
  }
@@ -429,7 +485,15 @@ Please output the exact XML format above.`);
429
485
  toolCall: proposal,
430
486
  guardianDecision: decision,
431
487
  });
432
- driverResponse = await this.driver.continueWithMessage(feedback);
488
+ // Continue with appropriate method based on mode
489
+ if (useNativeTools) {
490
+ const continueResult = await this.driver.continueWithNativeTools(feedback);
491
+ driverResponse = continueResult.message;
492
+ pendingNativeToolCalls = continueResult.toolCalls;
493
+ }
494
+ else {
495
+ driverResponse = await this.driver.continueWithMessage(feedback);
496
+ }
433
497
  this.conversationHistory.push(driverResponse);
434
498
  }
435
499
  }
@@ -514,4 +578,4 @@ Please output the exact XML format above.`);
514
578
  return Array.from(this.tools.keys());
515
579
  }
516
580
  }
517
- //# 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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"}
581
+ //# 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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"}
@@ -38,6 +38,12 @@ export interface IDualAgentOptions extends plugins.smartai.ISmartAiOptions {
38
38
  logPrefix?: string;
39
39
  /** Callback fired for each token during LLM generation (streaming mode) */
40
40
  onToken?: (token: string, source: 'driver' | 'guardian') => void;
41
+ /**
42
+ * Enable native tool calling mode (default: false)
43
+ * When enabled, uses Ollama's native tool calling API instead of XML parsing
44
+ * This is more efficient for models that support it (e.g., GPT-OSS with Harmony format)
45
+ */
46
+ useNativeToolCalling?: boolean;
41
47
  }
42
48
  /**
43
49
  * Represents a message in the agent's conversation history
@@ -62,6 +68,17 @@ export interface IToolAction {
62
68
  /** JSON schema for action parameters */
63
69
  parameters: Record<string, unknown>;
64
70
  }
71
+ /**
72
+ * Native tool call from provider (matches Ollama's tool calling format)
73
+ * Format: function name is "toolName_actionName" (e.g., "json_validate")
74
+ */
75
+ export interface INativeToolCall {
76
+ function: {
77
+ name: string;
78
+ arguments: Record<string, unknown>;
79
+ index?: number;
80
+ };
81
+ }
65
82
  /**
66
83
  * Proposed tool call from the Driver
67
84
  */
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5pbnRlcmZhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC5pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBMFJ4Qzs7R0FFRztBQUNILE1BQU0sVUFBVSxrQkFBa0I7SUFDaEMsT0FBTyxZQUFZLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNoRixDQUFDIn0=
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5pbnRlcmZhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC5pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBNFN4Qzs7R0FFRztBQUNILE1BQU0sVUFBVSxrQkFBa0I7SUFDaEMsT0FBTyxZQUFZLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNoRixDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartagent",
3
- "version": "1.5.0",
3
+ "version": "1.5.2",
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.13.0",
24
+ "@push.rocks/smartai": "^0.13.1",
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.5.0',
6
+ version: '1.5.2',
7
7
  description: 'an agentic framework built on top of @push.rocks/smartai'
8
8
  }
@@ -442,4 +442,252 @@ Your complete output here
442
442
  public reset(): void {
443
443
  this.messageHistory = [];
444
444
  }
445
+
446
+ // ================================
447
+ // Native Tool Calling Support
448
+ // ================================
449
+
450
+ /**
451
+ * Start a task with native tool calling support
452
+ * Uses Ollama's native tool calling API instead of XML parsing
453
+ * @param task The task description
454
+ * @param images Optional base64-encoded images for vision tasks
455
+ * @returns Response with content, reasoning, and any tool calls
456
+ */
457
+ public async startTaskWithNativeTools(
458
+ task: string,
459
+ images?: string[]
460
+ ): Promise<{ message: interfaces.IAgentMessage; toolCalls?: interfaces.INativeToolCall[] }> {
461
+ // Reset message history
462
+ this.messageHistory = [];
463
+
464
+ // Build simple user message (no XML instructions needed for native tool calling)
465
+ const userMessage = `TASK: ${task}\n\nComplete this task using the available tools. When done, provide your final output.`;
466
+
467
+ // Add to history
468
+ this.messageHistory.push({
469
+ role: 'user',
470
+ content: userMessage,
471
+ });
472
+
473
+ // Build system message for native tool calling
474
+ const fullSystemMessage = this.getNativeToolsSystemMessage();
475
+
476
+ // Get tools in JSON schema format
477
+ const tools = this.getToolsAsJsonSchema();
478
+
479
+ // Check if provider supports native tool calling (Ollama)
480
+ const provider = this.provider as any;
481
+ if (typeof provider.collectStreamResponse !== 'function') {
482
+ throw new Error('Provider does not support native tool calling. Use startTask() instead.');
483
+ }
484
+
485
+ // Use collectStreamResponse for streaming support with tools
486
+ const response = await provider.collectStreamResponse(
487
+ {
488
+ systemMessage: fullSystemMessage,
489
+ userMessage: userMessage,
490
+ messageHistory: [],
491
+ images: images,
492
+ tools: tools.length > 0 ? tools : undefined,
493
+ },
494
+ // Pass onToken callback through onChunk for streaming
495
+ this.onToken ? (chunk: any) => {
496
+ if (chunk.thinking && this.onToken) this.onToken(chunk.thinking);
497
+ if (chunk.content && this.onToken) this.onToken(chunk.content);
498
+ } : undefined
499
+ );
500
+
501
+ // Add assistant response to history
502
+ const historyMessage: plugins.smartai.ChatMessage = {
503
+ role: 'assistant',
504
+ content: response.message || '',
505
+ reasoning: response.thinking || response.reasoning,
506
+ };
507
+ this.messageHistory.push(historyMessage);
508
+
509
+ // Convert Ollama tool calls to our format
510
+ let toolCalls: interfaces.INativeToolCall[] | undefined;
511
+ if (response.toolCalls && response.toolCalls.length > 0) {
512
+ toolCalls = response.toolCalls.map((tc: any) => ({
513
+ function: {
514
+ name: tc.function.name,
515
+ arguments: tc.function.arguments,
516
+ index: tc.function.index,
517
+ },
518
+ }));
519
+ }
520
+
521
+ return {
522
+ message: {
523
+ role: 'assistant',
524
+ content: response.message || '',
525
+ },
526
+ toolCalls,
527
+ };
528
+ }
529
+
530
+ /**
531
+ * Continue conversation with native tool calling support
532
+ * @param message The message to continue with (e.g., tool result)
533
+ * @returns Response with content, reasoning, and any tool calls
534
+ */
535
+ public async continueWithNativeTools(
536
+ message: string
537
+ ): Promise<{ message: interfaces.IAgentMessage; toolCalls?: interfaces.INativeToolCall[] }> {
538
+ // Add the new message to history
539
+ this.messageHistory.push({
540
+ role: 'user',
541
+ content: message,
542
+ });
543
+
544
+ // Build system message
545
+ const fullSystemMessage = this.getNativeToolsSystemMessage();
546
+
547
+ // Get tools in JSON schema format
548
+ const tools = this.getToolsAsJsonSchema();
549
+
550
+ // Get response from provider with history windowing
551
+ let historyForChat: plugins.smartai.ChatMessage[];
552
+ const fullHistory = this.messageHistory.slice(0, -1);
553
+
554
+ if (this.maxHistoryMessages > 0 && fullHistory.length > this.maxHistoryMessages) {
555
+ historyForChat = [
556
+ fullHistory[0],
557
+ ...fullHistory.slice(-(this.maxHistoryMessages - 1)),
558
+ ];
559
+ } else {
560
+ historyForChat = fullHistory;
561
+ }
562
+
563
+ // Check if provider supports native tool calling
564
+ const provider = this.provider as any;
565
+ if (typeof provider.collectStreamResponse !== 'function') {
566
+ throw new Error('Provider does not support native tool calling. Use continueWithMessage() instead.');
567
+ }
568
+
569
+ // Use collectStreamResponse for streaming support with tools
570
+ const response = await provider.collectStreamResponse(
571
+ {
572
+ systemMessage: fullSystemMessage,
573
+ userMessage: message,
574
+ messageHistory: historyForChat,
575
+ tools: tools.length > 0 ? tools : undefined,
576
+ },
577
+ // Pass onToken callback through onChunk for streaming
578
+ this.onToken ? (chunk: any) => {
579
+ if (chunk.thinking && this.onToken) this.onToken(chunk.thinking);
580
+ if (chunk.content && this.onToken) this.onToken(chunk.content);
581
+ } : undefined
582
+ );
583
+
584
+ // Add assistant response to history
585
+ this.messageHistory.push({
586
+ role: 'assistant',
587
+ content: response.message || '',
588
+ reasoning: response.thinking || response.reasoning,
589
+ });
590
+
591
+ // Convert Ollama tool calls to our format
592
+ let toolCalls: interfaces.INativeToolCall[] | undefined;
593
+ if (response.toolCalls && response.toolCalls.length > 0) {
594
+ toolCalls = response.toolCalls.map((tc: any) => ({
595
+ function: {
596
+ name: tc.function.name,
597
+ arguments: tc.function.arguments,
598
+ index: tc.function.index,
599
+ },
600
+ }));
601
+ }
602
+
603
+ return {
604
+ message: {
605
+ role: 'assistant',
606
+ content: response.message || '',
607
+ },
608
+ toolCalls,
609
+ };
610
+ }
611
+
612
+ /**
613
+ * Get system message for native tool calling mode
614
+ * Simplified prompt that lets the model use tools naturally
615
+ */
616
+ private getNativeToolsSystemMessage(): string {
617
+ return `You are an AI assistant that executes tasks by using available tools.
618
+
619
+ ## Your Role
620
+ You analyze tasks, break them down into steps, and use tools to accomplish goals.
621
+
622
+ ## Guidelines
623
+ 1. Think step by step about what needs to be done
624
+ 2. Use the available tools to complete the task
625
+ 3. Process tool results and continue until the task is complete
626
+ 4. When the task is complete, provide a final summary
627
+
628
+ ## Important
629
+ - Use tools when needed to gather information or perform actions
630
+ - If you need clarification, ask the user
631
+ - Always verify your work before marking the task complete`;
632
+ }
633
+
634
+ /**
635
+ * Convert registered tools to Ollama JSON Schema format for native tool calling
636
+ * Each tool action becomes a separate function with name format: "toolName_actionName"
637
+ * @returns Array of IOllamaTool compatible tool definitions
638
+ */
639
+ public getToolsAsJsonSchema(): plugins.smartai.IOllamaTool[] {
640
+ const tools: plugins.smartai.IOllamaTool[] = [];
641
+
642
+ for (const tool of this.tools.values()) {
643
+ for (const action of tool.actions) {
644
+ // Build the tool definition in Ollama format
645
+ const toolDef: plugins.smartai.IOllamaTool = {
646
+ type: 'function',
647
+ function: {
648
+ name: `${tool.name}_${action.name}`, // e.g., "json_validate"
649
+ description: `[${tool.name}] ${action.description}`,
650
+ parameters: action.parameters as plugins.smartai.IOllamaTool['function']['parameters'],
651
+ },
652
+ };
653
+ tools.push(toolDef);
654
+ }
655
+ }
656
+
657
+ return tools;
658
+ }
659
+
660
+ /**
661
+ * Parse native tool calls from provider response into IToolCallProposal format
662
+ * @param toolCalls Array of native tool calls from the provider
663
+ * @returns Array of IToolCallProposal ready for execution
664
+ */
665
+ public parseNativeToolCalls(
666
+ toolCalls: interfaces.INativeToolCall[]
667
+ ): interfaces.IToolCallProposal[] {
668
+ return toolCalls.map(tc => {
669
+ // Split "json_validate" -> toolName="json", action="validate"
670
+ const fullName = tc.function.name;
671
+ const underscoreIndex = fullName.indexOf('_');
672
+
673
+ let toolName: string;
674
+ let action: string;
675
+
676
+ if (underscoreIndex > 0) {
677
+ toolName = fullName.substring(0, underscoreIndex);
678
+ action = fullName.substring(underscoreIndex + 1);
679
+ } else {
680
+ // Fallback: treat entire name as tool name with empty action
681
+ toolName = fullName;
682
+ action = '';
683
+ }
684
+
685
+ return {
686
+ proposalId: this.generateProposalId(),
687
+ toolName,
688
+ action,
689
+ params: tc.function.arguments,
690
+ };
691
+ });
692
+ }
445
693
  }
@@ -242,12 +242,18 @@ export class DualAgentOrchestrator {
242
242
  throw new Error('Orchestrator not started. Call start() first.');
243
243
  }
244
244
 
245
+ // Use native tool calling if enabled
246
+ const useNativeTools = this.options.useNativeToolCalling === true;
247
+
245
248
  this.conversationHistory = [];
246
249
  let iterations = 0;
247
250
  let consecutiveRejections = 0;
248
251
  let completed = false;
249
252
  let finalResult: string | null = null;
250
253
 
254
+ // Track pending native tool calls
255
+ let pendingNativeToolCalls: interfaces.INativeToolCall[] | undefined;
256
+
251
257
  // Extract images from options
252
258
  const images = options?.images;
253
259
 
@@ -258,7 +264,17 @@ export class DualAgentOrchestrator {
258
264
  });
259
265
 
260
266
  // Start the driver with the task and optional images
261
- let driverResponse = await this.driver.startTask(task, images);
267
+ let driverResponse: interfaces.IAgentMessage;
268
+
269
+ if (useNativeTools) {
270
+ // Native tool calling mode
271
+ const result = await this.driver.startTaskWithNativeTools(task, images);
272
+ driverResponse = result.message;
273
+ pendingNativeToolCalls = result.toolCalls;
274
+ } else {
275
+ // XML parsing mode
276
+ driverResponse = await this.driver.startTask(task, images);
277
+ }
262
278
  this.conversationHistory.push(driverResponse);
263
279
 
264
280
  // Emit task started event
@@ -281,10 +297,16 @@ export class DualAgentOrchestrator {
281
297
  maxIterations: this.options.maxIterations,
282
298
  });
283
299
 
284
- // Check if task is complete
285
- if (this.driver.isTaskComplete(driverResponse.content)) {
300
+ // Check if task is complete (for native mode, no pending tool calls and has content)
301
+ const isComplete = useNativeTools
302
+ ? (!pendingNativeToolCalls || pendingNativeToolCalls.length === 0) && driverResponse.content.length > 0
303
+ : this.driver.isTaskComplete(driverResponse.content);
304
+
305
+ if (isComplete) {
286
306
  completed = true;
287
- finalResult = this.driver.extractTaskResult(driverResponse.content) || driverResponse.content;
307
+ finalResult = useNativeTools
308
+ ? driverResponse.content
309
+ : (this.driver.extractTaskResult(driverResponse.content) || driverResponse.content);
288
310
 
289
311
  // Emit task completed event
290
312
  this.emitProgress({
@@ -315,13 +337,34 @@ export class DualAgentOrchestrator {
315
337
  };
316
338
  }
317
339
 
318
- // Parse tool call proposals
319
- const proposals = this.driver.parseToolCallProposals(driverResponse.content);
340
+ // Parse tool call proposals - native mode uses pendingNativeToolCalls, XML mode parses content
341
+ let proposals: interfaces.IToolCallProposal[];
342
+
343
+ if (useNativeTools && pendingNativeToolCalls && pendingNativeToolCalls.length > 0) {
344
+ // Native tool calling mode - convert native tool calls to proposals
345
+ proposals = this.driver.parseNativeToolCalls(pendingNativeToolCalls);
346
+ pendingNativeToolCalls = undefined; // Clear after processing
347
+ } else if (!useNativeTools) {
348
+ // XML parsing mode
349
+ proposals = this.driver.parseToolCallProposals(driverResponse.content);
350
+ } else {
351
+ proposals = [];
352
+ }
320
353
 
321
354
  if (proposals.length === 0) {
322
- // No tool calls found - remind the model of the exact XML format
323
- driverResponse = await this.driver.continueWithMessage(
324
- `No valid tool call was found in your response. To use a tool, you MUST output the exact XML format:
355
+ if (useNativeTools) {
356
+ // Native mode: no tool calls and no content means we should continue
357
+ const result = await this.driver.continueWithNativeTools(
358
+ 'Please continue with the task. Use the available tools or provide your final output.'
359
+ );
360
+ driverResponse = result.message;
361
+ pendingNativeToolCalls = result.toolCalls;
362
+ this.conversationHistory.push(driverResponse);
363
+ continue;
364
+ } else {
365
+ // XML mode: remind the model of the exact XML format
366
+ driverResponse = await this.driver.continueWithMessage(
367
+ `No valid tool call was found in your response. To use a tool, you MUST output the exact XML format:
325
368
 
326
369
  <tool_call>
327
370
  <tool>tool_name</tool>
@@ -340,9 +383,10 @@ Or to complete the task:
340
383
  <task_complete>your final JSON output here</task_complete>
341
384
 
342
385
  Please output the exact XML format above.`
343
- );
344
- this.conversationHistory.push(driverResponse);
345
- continue;
386
+ );
387
+ this.conversationHistory.push(driverResponse);
388
+ continue;
389
+ }
346
390
  }
347
391
 
348
392
  // Process the first proposal (one at a time)
@@ -449,13 +493,28 @@ Please output the exact XML format above.`
449
493
  toolResult: result,
450
494
  });
451
495
 
452
- driverResponse = await this.driver.continueWithMessage(resultMessage);
496
+ // Continue with appropriate method based on mode
497
+ if (useNativeTools) {
498
+ const continueResult = await this.driver.continueWithNativeTools(resultMessage);
499
+ driverResponse = continueResult.message;
500
+ pendingNativeToolCalls = continueResult.toolCalls;
501
+ } else {
502
+ driverResponse = await this.driver.continueWithMessage(resultMessage);
503
+ }
453
504
  this.conversationHistory.push(driverResponse);
454
505
  } catch (error) {
455
506
  const errorMessage = `Tool execution failed: ${error instanceof Error ? error.message : String(error)}`;
456
- driverResponse = await this.driver.continueWithMessage(
457
- `TOOL ERROR: ${errorMessage}\n\nPlease try a different approach.`
458
- );
507
+ if (useNativeTools) {
508
+ const continueResult = await this.driver.continueWithNativeTools(
509
+ `TOOL ERROR: ${errorMessage}\n\nPlease try a different approach.`
510
+ );
511
+ driverResponse = continueResult.message;
512
+ pendingNativeToolCalls = continueResult.toolCalls;
513
+ } else {
514
+ driverResponse = await this.driver.continueWithMessage(
515
+ `TOOL ERROR: ${errorMessage}\n\nPlease try a different approach.`
516
+ );
517
+ }
459
518
  this.conversationHistory.push(driverResponse);
460
519
  }
461
520
  } else {
@@ -492,7 +551,14 @@ Please output the exact XML format above.`
492
551
  guardianDecision: decision,
493
552
  });
494
553
 
495
- driverResponse = await this.driver.continueWithMessage(feedback);
554
+ // Continue with appropriate method based on mode
555
+ if (useNativeTools) {
556
+ const continueResult = await this.driver.continueWithNativeTools(feedback);
557
+ driverResponse = continueResult.message;
558
+ pendingNativeToolCalls = continueResult.toolCalls;
559
+ } else {
560
+ driverResponse = await this.driver.continueWithMessage(feedback);
561
+ }
496
562
  this.conversationHistory.push(driverResponse);
497
563
  }
498
564
  }
@@ -48,6 +48,12 @@ export interface IDualAgentOptions extends plugins.smartai.ISmartAiOptions {
48
48
  logPrefix?: string;
49
49
  /** Callback fired for each token during LLM generation (streaming mode) */
50
50
  onToken?: (token: string, source: 'driver' | 'guardian') => void;
51
+ /**
52
+ * Enable native tool calling mode (default: false)
53
+ * When enabled, uses Ollama's native tool calling API instead of XML parsing
54
+ * This is more efficient for models that support it (e.g., GPT-OSS with Harmony format)
55
+ */
56
+ useNativeToolCalling?: boolean;
51
57
  }
52
58
 
53
59
  // ================================
@@ -83,6 +89,18 @@ export interface IToolAction {
83
89
  parameters: Record<string, unknown>;
84
90
  }
85
91
 
92
+ /**
93
+ * Native tool call from provider (matches Ollama's tool calling format)
94
+ * Format: function name is "toolName_actionName" (e.g., "json_validate")
95
+ */
96
+ export interface INativeToolCall {
97
+ function: {
98
+ name: string; // Format: "toolName_actionName"
99
+ arguments: Record<string, unknown>;
100
+ index?: number;
101
+ };
102
+ }
103
+
86
104
  /**
87
105
  * Proposed tool call from the Driver
88
106
  */