@push.rocks/smartagent 1.1.1 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -63,6 +63,11 @@ export declare class DriverAgent {
63
63
  * Get the default system message for the driver
64
64
  */
65
65
  private getDefaultSystemMessage;
66
+ /**
67
+ * Get the system message when no tools are available
68
+ * Used for direct task completion without tool usage
69
+ */
70
+ private getNoToolsSystemMessage;
66
71
  /**
67
72
  * Reset the conversation state
68
73
  */
@@ -31,16 +31,30 @@ export class DriverAgent {
31
31
  async startTask(task) {
32
32
  // Reset message history
33
33
  this.messageHistory = [];
34
- // Build the user message
35
- const userMessage = `TASK: ${task}\n\nAnalyze this task and determine what actions are needed. If you need to use a tool, provide a tool call proposal.`;
34
+ // Build the user message based on available tools
35
+ const hasTools = this.tools.size > 0;
36
+ let userMessage;
37
+ if (hasTools) {
38
+ userMessage = `TASK: ${task}\n\nAnalyze this task and determine what actions are needed. If you need to use a tool, provide a tool call proposal.`;
39
+ }
40
+ else {
41
+ userMessage = `TASK: ${task}\n\nComplete this task directly. When done, wrap your final output in <task_complete>your output here</task_complete> tags.`;
42
+ }
36
43
  // Add to history
37
44
  this.messageHistory.push({
38
45
  role: 'user',
39
46
  content: userMessage,
40
47
  });
41
- // Build tool descriptions for the system message
42
- const toolDescriptions = this.buildToolDescriptions();
43
- const fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
48
+ // Build the system message - adapt based on available tools
49
+ let fullSystemMessage;
50
+ if (hasTools) {
51
+ const toolDescriptions = this.buildToolDescriptions();
52
+ fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
53
+ }
54
+ else {
55
+ // Use a simpler system message when no tools are available
56
+ fullSystemMessage = this.getNoToolsSystemMessage();
57
+ }
44
58
  // Get response from provider
45
59
  const response = await this.provider.chat({
46
60
  systemMessage: fullSystemMessage,
@@ -66,9 +80,16 @@ export class DriverAgent {
66
80
  role: 'user',
67
81
  content: message,
68
82
  });
69
- // Build tool descriptions for the system message
70
- const toolDescriptions = this.buildToolDescriptions();
71
- const fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
83
+ // Build the system message - adapt based on available tools
84
+ const hasTools = this.tools.size > 0;
85
+ let fullSystemMessage;
86
+ if (hasTools) {
87
+ const toolDescriptions = this.buildToolDescriptions();
88
+ fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
89
+ }
90
+ else {
91
+ fullSystemMessage = this.getNoToolsSystemMessage();
92
+ }
72
93
  // Get response from provider (pass all but last user message as history)
73
94
  const historyForChat = this.messageHistory.slice(0, -1);
74
95
  const response = await this.provider.chat({
@@ -263,6 +284,33 @@ When you need to use a tool, output a tool call proposal in this format:
263
284
  - Wait for the result before proposing the next action
264
285
  - If you encounter an error, analyze it and try an alternative approach
265
286
  - If you need clarification, ask using <needs_clarification>your question</needs_clarification>`;
287
+ }
288
+ /**
289
+ * Get the system message when no tools are available
290
+ * Used for direct task completion without tool usage
291
+ */
292
+ getNoToolsSystemMessage() {
293
+ // Use custom system message if provided, otherwise use a simple default
294
+ if (this.systemMessage && this.systemMessage !== this.getDefaultSystemMessage()) {
295
+ return this.systemMessage;
296
+ }
297
+ return `You are an AI assistant that completes tasks directly.
298
+
299
+ ## Your Role
300
+ You analyze tasks and provide complete, high-quality outputs.
301
+
302
+ ## Output Format
303
+ When you have completed the task, wrap your final output in task_complete tags:
304
+
305
+ <task_complete>
306
+ Your complete output here
307
+ </task_complete>
308
+
309
+ ## Guidelines
310
+ 1. Analyze the task requirements carefully
311
+ 2. Provide a complete and accurate response
312
+ 3. Always wrap your final output in <task_complete></task_complete> tags
313
+ 4. If you need clarification, ask using <needs_clarification>your question</needs_clarification>`;
266
314
  }
267
315
  /**
268
316
  * Reset the conversation state
@@ -271,4 +319,4 @@ When you need to use a tool, output a tool call proposal in this format:
271
319
  this.messageHistory = [];
272
320
  }
273
321
  }
274
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5jbGFzc2VzLmRyaXZlcmFnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC5jbGFzc2VzLmRyaXZlcmFnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxVQUFVLE1BQU0sNEJBQTRCLENBQUM7QUFHekQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFdBQVc7SUFDZCxRQUFRLENBQWtDO0lBQzFDLGFBQWEsQ0FBUztJQUN0QixjQUFjLEdBQWtDLEVBQUUsQ0FBQztJQUNuRCxLQUFLLEdBQWlDLElBQUksR0FBRyxFQUFFLENBQUM7SUFFeEQsWUFDRSxRQUF5QyxFQUN6QyxhQUFzQjtRQUV0QixJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztRQUN6QixJQUFJLENBQUMsYUFBYSxHQUFHLGFBQWEsSUFBSSxJQUFJLENBQUMsdUJBQXVCLEVBQUUsQ0FBQztJQUN2RSxDQUFDO0lBRUQ7O09BRUc7SUFDSSxZQUFZLENBQUMsSUFBcUI7UUFDdkMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNsQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxRQUFRO1FBQ2IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDO0lBQ3BCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxTQUFTLENBQUMsSUFBWTtRQUNqQyx3QkFBd0I7UUFDeEIsSUFBSSxDQUFDLGNBQWMsR0FBRyxFQUFFLENBQUM7UUFFekIseUJBQXlCO1FBQ3pCLE1BQU0sV0FBVyxHQUFHLFNBQVMsSUFBSSx1SEFBdUgsQ0FBQztRQUV6SixpQkFBaUI7UUFDakIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxJQUFJLENBQUM7WUFDdkIsSUFBSSxFQUFFLE1BQU07WUFDWixPQUFPLEVBQUUsV0FB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
322
+ //# 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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"}
@@ -14,6 +14,7 @@ export declare class DualAgentOrchestrator {
14
14
  private tools;
15
15
  private isRunning;
16
16
  private conversationHistory;
17
+ private ownsSmartAi;
17
18
  constructor(options: interfaces.IDualAgentOptions);
18
19
  /**
19
20
  * Get provider by name
@@ -22,6 +22,7 @@ export class DualAgentOrchestrator {
22
22
  tools = new Map();
23
23
  isRunning = false;
24
24
  conversationHistory = [];
25
+ ownsSmartAi = true; // true if we created the SmartAi instance, false if it was provided
25
26
  constructor(options) {
26
27
  this.options = {
27
28
  maxIterations: 20,
@@ -29,16 +30,16 @@ export class DualAgentOrchestrator {
29
30
  defaultProvider: 'openai',
30
31
  ...options,
31
32
  };
32
- // Create SmartAi instance
33
- this.smartai = new plugins.smartai.SmartAi(options);
34
- // Get providers
35
- this.driverProvider = this.getProviderByName(this.options.defaultProvider);
36
- this.guardianProvider = this.options.guardianProvider
37
- ? this.getProviderByName(this.options.guardianProvider)
38
- : this.driverProvider;
39
- // Create agents
40
- this.driver = new DriverAgent(this.driverProvider, options.driverSystemMessage);
41
- this.guardian = new GuardianAgent(this.guardianProvider, options.guardianPolicyPrompt);
33
+ // Use existing SmartAi instance if provided, otherwise create a new one
34
+ if (options.smartAiInstance) {
35
+ this.smartai = options.smartAiInstance;
36
+ this.ownsSmartAi = false; // Don't manage lifecycle of provided instance
37
+ }
38
+ else {
39
+ this.smartai = new plugins.smartai.SmartAi(options);
40
+ this.ownsSmartAi = true;
41
+ }
42
+ // Note: Don't access providers here - they don't exist until start() is called
42
43
  }
43
44
  /**
44
45
  * Get provider by name
@@ -68,8 +69,13 @@ export class DualAgentOrchestrator {
68
69
  */
69
70
  registerTool(tool) {
70
71
  this.tools.set(tool.name, tool);
71
- this.driver.registerTool(tool);
72
- this.guardian.registerTool(tool);
72
+ // Register with agents if they exist (they're created in start())
73
+ if (this.driver) {
74
+ this.driver.registerTool(tool);
75
+ }
76
+ if (this.guardian) {
77
+ this.guardian.registerTool(tool);
78
+ }
73
79
  }
74
80
  /**
75
81
  * Register all standard tools
@@ -90,8 +96,23 @@ export class DualAgentOrchestrator {
90
96
  * Initialize all tools (eager loading)
91
97
  */
92
98
  async start() {
93
- // Start smartai
94
- await this.smartai.start();
99
+ // Start smartai only if we created it (external instances should already be started)
100
+ if (this.ownsSmartAi) {
101
+ await this.smartai.start();
102
+ }
103
+ // NOW get providers (after they've been initialized by smartai.start())
104
+ this.driverProvider = this.getProviderByName(this.options.defaultProvider);
105
+ this.guardianProvider = this.options.guardianProvider
106
+ ? this.getProviderByName(this.options.guardianProvider)
107
+ : this.driverProvider;
108
+ // NOW create agents with initialized providers
109
+ this.driver = new DriverAgent(this.driverProvider, this.options.driverSystemMessage);
110
+ this.guardian = new GuardianAgent(this.guardianProvider, this.options.guardianPolicyPrompt);
111
+ // Register any tools that were added before start() with the agents
112
+ for (const tool of this.tools.values()) {
113
+ this.driver.registerTool(tool);
114
+ this.guardian.registerTool(tool);
115
+ }
95
116
  // Initialize all tools
96
117
  const initPromises = [];
97
118
  for (const tool of this.tools.values()) {
@@ -109,9 +130,14 @@ export class DualAgentOrchestrator {
109
130
  cleanupPromises.push(tool.cleanup());
110
131
  }
111
132
  await Promise.all(cleanupPromises);
112
- await this.smartai.stop();
133
+ // Only stop smartai if we created it (don't stop external instances)
134
+ if (this.ownsSmartAi) {
135
+ await this.smartai.stop();
136
+ }
113
137
  this.isRunning = false;
114
- this.driver.reset();
138
+ if (this.driver) {
139
+ this.driver.reset();
140
+ }
115
141
  }
116
142
  /**
117
143
  * Run a task through the dual-agent system
@@ -297,4 +323,4 @@ export class DualAgentOrchestrator {
297
323
  return Array.from(this.tools.keys());
298
324
  }
299
325
  }
300
- //# 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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"}
326
+ //# 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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"}
@@ -3,6 +3,8 @@ import * as plugins from './plugins.js';
3
3
  * Configuration options for the DualAgentOrchestrator
4
4
  */
5
5
  export interface IDualAgentOptions extends plugins.smartai.ISmartAiOptions {
6
+ /** Existing SmartAi instance to reuse (avoids creating duplicate providers) */
7
+ smartAiInstance?: plugins.smartai.SmartAi;
6
8
  /** Name of the agent system */
7
9
  name?: string;
8
10
  /** Default AI provider for both Driver and Guardian */
@@ -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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5pbnRlcmZhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC5pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBNE14Qzs7R0FFRztBQUNILE1BQU0sVUFBVSxrQkFBa0I7SUFDaEMsT0FBTyxZQUFZLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNoRixDQUFDIn0=
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRhZ2VudC5pbnRlcmZhY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRhZ2VudC5pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBOE14Qzs7R0FFRztBQUNILE1BQU0sVUFBVSxrQkFBa0I7SUFDaEMsT0FBTyxZQUFZLElBQUksQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQztBQUNoRixDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartagent",
3
- "version": "1.1.1",
3
+ "version": "1.2.1",
4
4
  "private": false,
5
5
  "description": "an agentic framework built on top of @push.rocks/smartai",
6
6
  "main": "dist_ts/index.js",
@@ -8,11 +8,6 @@
8
8
  "type": "module",
9
9
  "author": "Task Venture Capital GmbH",
10
10
  "license": "MIT",
11
- "scripts": {
12
- "test": "(tstest test/ --verbose)",
13
- "build": "(tsbuild --web --allowimplicitany)",
14
- "buildDocs": "(tsdoc)"
15
- },
16
11
  "devDependencies": {
17
12
  "@git.zone/tsbuild": "^4.0.2",
18
13
  "@git.zone/tsbundle": "^2.6.3",
@@ -28,7 +23,6 @@
28
23
  "@push.rocks/smartrequest": "^5.0.1",
29
24
  "@push.rocks/smartshell": "^3.3.0"
30
25
  },
31
- "packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34",
32
26
  "repository": {
33
27
  "type": "git",
34
28
  "url": "https://code.foss.global/push.rocks/smartagent.git"
@@ -49,7 +43,9 @@
49
43
  "npmextra.json",
50
44
  "readme.md"
51
45
  ],
52
- "pnpm": {
53
- "overrides": {}
46
+ "scripts": {
47
+ "test": "(tstest test/ --verbose)",
48
+ "build": "(tsbuild --web --allowimplicitany)",
49
+ "buildDocs": "(tsdoc)"
54
50
  }
55
- }
51
+ }
@@ -41,8 +41,14 @@ export class DriverAgent {
41
41
  // Reset message history
42
42
  this.messageHistory = [];
43
43
 
44
- // Build the user message
45
- const userMessage = `TASK: ${task}\n\nAnalyze this task and determine what actions are needed. If you need to use a tool, provide a tool call proposal.`;
44
+ // Build the user message based on available tools
45
+ const hasTools = this.tools.size > 0;
46
+ let userMessage: string;
47
+ if (hasTools) {
48
+ userMessage = `TASK: ${task}\n\nAnalyze this task and determine what actions are needed. If you need to use a tool, provide a tool call proposal.`;
49
+ } else {
50
+ userMessage = `TASK: ${task}\n\nComplete this task directly. When done, wrap your final output in <task_complete>your output here</task_complete> tags.`;
51
+ }
46
52
 
47
53
  // Add to history
48
54
  this.messageHistory.push({
@@ -50,9 +56,15 @@ export class DriverAgent {
50
56
  content: userMessage,
51
57
  });
52
58
 
53
- // Build tool descriptions for the system message
54
- const toolDescriptions = this.buildToolDescriptions();
55
- const fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
59
+ // Build the system message - adapt based on available tools
60
+ let fullSystemMessage: string;
61
+ if (hasTools) {
62
+ const toolDescriptions = this.buildToolDescriptions();
63
+ fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
64
+ } else {
65
+ // Use a simpler system message when no tools are available
66
+ fullSystemMessage = this.getNoToolsSystemMessage();
67
+ }
56
68
 
57
69
  // Get response from provider
58
70
  const response = await this.provider.chat({
@@ -83,9 +95,15 @@ export class DriverAgent {
83
95
  content: message,
84
96
  });
85
97
 
86
- // Build tool descriptions for the system message
87
- const toolDescriptions = this.buildToolDescriptions();
88
- const fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
98
+ // Build the system message - adapt based on available tools
99
+ const hasTools = this.tools.size > 0;
100
+ let fullSystemMessage: string;
101
+ if (hasTools) {
102
+ const toolDescriptions = this.buildToolDescriptions();
103
+ fullSystemMessage = `${this.systemMessage}\n\n## Available Tools\n${toolDescriptions}`;
104
+ } else {
105
+ fullSystemMessage = this.getNoToolsSystemMessage();
106
+ }
89
107
 
90
108
  // Get response from provider (pass all but last user message as history)
91
109
  const historyForChat = this.messageHistory.slice(0, -1);
@@ -312,6 +330,35 @@ When you need to use a tool, output a tool call proposal in this format:
312
330
  - If you need clarification, ask using <needs_clarification>your question</needs_clarification>`;
313
331
  }
314
332
 
333
+ /**
334
+ * Get the system message when no tools are available
335
+ * Used for direct task completion without tool usage
336
+ */
337
+ private getNoToolsSystemMessage(): string {
338
+ // Use custom system message if provided, otherwise use a simple default
339
+ if (this.systemMessage && this.systemMessage !== this.getDefaultSystemMessage()) {
340
+ return this.systemMessage;
341
+ }
342
+
343
+ return `You are an AI assistant that completes tasks directly.
344
+
345
+ ## Your Role
346
+ You analyze tasks and provide complete, high-quality outputs.
347
+
348
+ ## Output Format
349
+ When you have completed the task, wrap your final output in task_complete tags:
350
+
351
+ <task_complete>
352
+ Your complete output here
353
+ </task_complete>
354
+
355
+ ## Guidelines
356
+ 1. Analyze the task requirements carefully
357
+ 2. Provide a complete and accurate response
358
+ 3. Always wrap your final output in <task_complete></task_complete> tags
359
+ 4. If you need clarification, ask using <needs_clarification>your question</needs_clarification>`;
360
+ }
361
+
315
362
  /**
316
363
  * Reset the conversation state
317
364
  */
@@ -23,6 +23,7 @@ export class DualAgentOrchestrator {
23
23
  private tools: Map<string, BaseToolWrapper> = new Map();
24
24
  private isRunning = false;
25
25
  private conversationHistory: interfaces.IAgentMessage[] = [];
26
+ private ownsSmartAi = true; // true if we created the SmartAi instance, false if it was provided
26
27
 
27
28
  constructor(options: interfaces.IDualAgentOptions) {
28
29
  this.options = {
@@ -32,18 +33,15 @@ export class DualAgentOrchestrator {
32
33
  ...options,
33
34
  };
34
35
 
35
- // Create SmartAi instance
36
- this.smartai = new plugins.smartai.SmartAi(options);
37
-
38
- // Get providers
39
- this.driverProvider = this.getProviderByName(this.options.defaultProvider!);
40
- this.guardianProvider = this.options.guardianProvider
41
- ? this.getProviderByName(this.options.guardianProvider)
42
- : this.driverProvider;
43
-
44
- // Create agents
45
- this.driver = new DriverAgent(this.driverProvider, options.driverSystemMessage);
46
- this.guardian = new GuardianAgent(this.guardianProvider, options.guardianPolicyPrompt);
36
+ // Use existing SmartAi instance if provided, otherwise create a new one
37
+ if (options.smartAiInstance) {
38
+ this.smartai = options.smartAiInstance;
39
+ this.ownsSmartAi = false; // Don't manage lifecycle of provided instance
40
+ } else {
41
+ this.smartai = new plugins.smartai.SmartAi(options);
42
+ this.ownsSmartAi = true;
43
+ }
44
+ // Note: Don't access providers here - they don't exist until start() is called
47
45
  }
48
46
 
49
47
  /**
@@ -75,8 +73,13 @@ export class DualAgentOrchestrator {
75
73
  */
76
74
  public registerTool(tool: BaseToolWrapper): void {
77
75
  this.tools.set(tool.name, tool);
78
- this.driver.registerTool(tool);
79
- this.guardian.registerTool(tool);
76
+ // Register with agents if they exist (they're created in start())
77
+ if (this.driver) {
78
+ this.driver.registerTool(tool);
79
+ }
80
+ if (this.guardian) {
81
+ this.guardian.registerTool(tool);
82
+ }
80
83
  }
81
84
 
82
85
  /**
@@ -100,8 +103,26 @@ export class DualAgentOrchestrator {
100
103
  * Initialize all tools (eager loading)
101
104
  */
102
105
  public async start(): Promise<void> {
103
- // Start smartai
104
- await this.smartai.start();
106
+ // Start smartai only if we created it (external instances should already be started)
107
+ if (this.ownsSmartAi) {
108
+ await this.smartai.start();
109
+ }
110
+
111
+ // NOW get providers (after they've been initialized by smartai.start())
112
+ this.driverProvider = this.getProviderByName(this.options.defaultProvider!);
113
+ this.guardianProvider = this.options.guardianProvider
114
+ ? this.getProviderByName(this.options.guardianProvider)
115
+ : this.driverProvider;
116
+
117
+ // NOW create agents with initialized providers
118
+ this.driver = new DriverAgent(this.driverProvider, this.options.driverSystemMessage);
119
+ this.guardian = new GuardianAgent(this.guardianProvider, this.options.guardianPolicyPrompt);
120
+
121
+ // Register any tools that were added before start() with the agents
122
+ for (const tool of this.tools.values()) {
123
+ this.driver.registerTool(tool);
124
+ this.guardian.registerTool(tool);
125
+ }
105
126
 
106
127
  // Initialize all tools
107
128
  const initPromises: Promise<void>[] = [];
@@ -124,9 +145,16 @@ export class DualAgentOrchestrator {
124
145
  }
125
146
 
126
147
  await Promise.all(cleanupPromises);
127
- await this.smartai.stop();
148
+
149
+ // Only stop smartai if we created it (don't stop external instances)
150
+ if (this.ownsSmartAi) {
151
+ await this.smartai.stop();
152
+ }
153
+
128
154
  this.isRunning = false;
129
- this.driver.reset();
155
+ if (this.driver) {
156
+ this.driver.reset();
157
+ }
130
158
  }
131
159
 
132
160
  /**
@@ -8,6 +8,8 @@ import * as plugins from './plugins.js';
8
8
  * Configuration options for the DualAgentOrchestrator
9
9
  */
10
10
  export interface IDualAgentOptions extends plugins.smartai.ISmartAiOptions {
11
+ /** Existing SmartAi instance to reuse (avoids creating duplicate providers) */
12
+ smartAiInstance?: plugins.smartai.SmartAi;
11
13
  /** Name of the agent system */
12
14
  name?: string;
13
15
  /** Default AI provider for both Driver and Guardian */