@push.rocks/smartagent 1.1.0 → 1.1.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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartagent',
6
- version: '1.1.0',
6
+ version: '1.1.1',
7
7
  description: 'an agentic framework built on top of @push.rocks/smartai'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDBEQUEwRDtDQUN4RSxDQUFBIn0=
package/npmextra.json CHANGED
@@ -14,5 +14,14 @@
14
14
  "npmci": {
15
15
  "npmGlobalTools": [],
16
16
  "npmAccessLevel": "public"
17
+ },
18
+ "@git.zone/cli": {
19
+ "release": {
20
+ "registries": [
21
+ "https://verdaccio.lossless.digital",
22
+ "https://registry.npmjs.org"
23
+ ],
24
+ "accessLevel": "public"
25
+ }
17
26
  }
18
- }
27
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartagent",
3
- "version": "1.1.0",
3
+ "version": "1.1.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,12 +8,17 @@
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
+ },
11
16
  "devDependencies": {
12
- "@git.zone/tsbuild": "^3.1.2",
13
- "@git.zone/tsbundle": "^2.6.2",
14
- "@git.zone/tsrun": "^2.0.0",
17
+ "@git.zone/tsbuild": "^4.0.2",
18
+ "@git.zone/tsbundle": "^2.6.3",
19
+ "@git.zone/tsrun": "^2.0.1",
15
20
  "@git.zone/tstest": "^3.1.3",
16
- "@types/node": "^24.10.1"
21
+ "@types/node": "^25.0.2"
17
22
  },
18
23
  "dependencies": {
19
24
  "@push.rocks/smartai": "^0.8.0",
@@ -23,6 +28,7 @@
23
28
  "@push.rocks/smartrequest": "^5.0.1",
24
29
  "@push.rocks/smartshell": "^3.3.0"
25
30
  },
31
+ "packageManager": "pnpm@10.18.1+sha512.77a884a165cbba2d8d1c19e3b4880eee6d2fcabd0d879121e282196b80042351d5eb3ca0935fa599da1dc51265cc68816ad2bddd2a2de5ea9fdf92adbec7cd34",
26
32
  "repository": {
27
33
  "type": "git",
28
34
  "url": "https://code.foss.global/push.rocks/smartagent.git"
@@ -43,9 +49,7 @@
43
49
  "npmextra.json",
44
50
  "readme.md"
45
51
  ],
46
- "scripts": {
47
- "test": "(tstest test/ --web)",
48
- "build": "(tsbuild --web --allowimplicitany)",
49
- "buildDocs": "(tsdoc)"
52
+ "pnpm": {
53
+ "overrides": {}
50
54
  }
51
- }
55
+ }
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartagent',
6
- version: '1.1.0',
6
+ version: '1.1.1',
7
7
  description: 'an agentic framework built on top of @push.rocks/smartai'
8
8
  }
@@ -1,123 +0,0 @@
1
- import * as plugins from './plugins.js';
2
- /**
3
- * Configuration options for SmartAgent
4
- */
5
- export interface ISmartAgentOptions extends plugins.smartai.ISmartAiOptions {
6
- /** Name of the agent for identification */
7
- name?: string;
8
- /** Default provider to use for agent operations */
9
- defaultProvider?: plugins.smartai.TProvider;
10
- /** System message that defines the agent's behavior */
11
- systemMessage?: string;
12
- /** Maximum number of reasoning steps before forcing completion */
13
- maxIterations?: number;
14
- }
15
- /**
16
- * Represents a tool that an agent can use
17
- */
18
- export interface IAgentTool {
19
- /** Unique name for the tool */
20
- name: string;
21
- /** Description of what the tool does (used by the AI to decide when to use it) */
22
- description: string;
23
- /** JSON schema defining the tool's parameters */
24
- parameters: Record<string, unknown>;
25
- /** The function to execute when the tool is called */
26
- execute: (params: Record<string, unknown>) => Promise<unknown>;
27
- }
28
- /**
29
- * Represents a message in the agent's conversation history
30
- */
31
- export interface IAgentMessage {
32
- role: 'system' | 'user' | 'assistant' | 'tool';
33
- content: string;
34
- toolName?: string;
35
- toolResult?: unknown;
36
- }
37
- /**
38
- * Result of an agent run
39
- */
40
- export interface IAgentRunResult {
41
- /** The final response from the agent */
42
- response: string;
43
- /** Number of iterations the agent took */
44
- iterations: number;
45
- /** Full message history from this run */
46
- messages: IAgentMessage[];
47
- /** Whether the agent completed successfully or hit max iterations */
48
- completed: boolean;
49
- }
50
- /**
51
- * SmartAgent - An agentic framework built on top of @push.rocks/smartai
52
- *
53
- * Provides autonomous agent capabilities including:
54
- * - Tool use and function calling
55
- * - Multi-step reasoning
56
- * - Conversation memory
57
- * - Multiple AI provider support
58
- */
59
- export declare class SmartAgent {
60
- options: ISmartAgentOptions;
61
- smartai: plugins.smartai.SmartAi;
62
- tools: Map<string, IAgentTool>;
63
- messageHistory: IAgentMessage[];
64
- private isStarted;
65
- constructor(optionsArg: ISmartAgentOptions);
66
- /**
67
- * Starts the agent and initializes the underlying SmartAi instance
68
- */
69
- start(): Promise<void>;
70
- /**
71
- * Stops the agent and cleans up resources
72
- */
73
- stop(): Promise<void>;
74
- /**
75
- * Registers a tool that the agent can use
76
- */
77
- registerTool(tool: IAgentTool): void;
78
- /**
79
- * Removes a tool from the agent
80
- */
81
- unregisterTool(toolName: string): void;
82
- /**
83
- * Gets all registered tools
84
- */
85
- getTools(): IAgentTool[];
86
- /**
87
- * Sets or updates the system message
88
- */
89
- setSystemMessage(message: string): void;
90
- /**
91
- * Clears the conversation history (except system message)
92
- */
93
- clearHistory(): void;
94
- /**
95
- * Runs the agent with a user message
96
- * The agent will reason, use tools, and respond autonomously
97
- */
98
- run(userMessage: string): Promise<IAgentRunResult>;
99
- /**
100
- * Simple chat without tool use
101
- */
102
- chat(message: string): Promise<string>;
103
- /**
104
- * Gets the AI provider based on configuration
105
- */
106
- private getProvider;
107
- /**
108
- * Builds tool descriptions for the system prompt
109
- */
110
- private buildToolDescriptions;
111
- /**
112
- * Builds the system prompt including tool descriptions
113
- */
114
- private buildSystemPrompt;
115
- /**
116
- * Builds the contextual prompt from message history
117
- */
118
- private buildContextualPrompt;
119
- /**
120
- * Parses a tool call from the AI response
121
- */
122
- private parseToolCall;
123
- }
@@ -1,274 +0,0 @@
1
- import * as plugins from './plugins.js';
2
- /**
3
- * SmartAgent - An agentic framework built on top of @push.rocks/smartai
4
- *
5
- * Provides autonomous agent capabilities including:
6
- * - Tool use and function calling
7
- * - Multi-step reasoning
8
- * - Conversation memory
9
- * - Multiple AI provider support
10
- */
11
- export class SmartAgent {
12
- options;
13
- smartai;
14
- tools = new Map();
15
- messageHistory = [];
16
- isStarted = false;
17
- constructor(optionsArg) {
18
- this.options = {
19
- name: 'SmartAgent',
20
- defaultProvider: 'openai',
21
- maxIterations: 10,
22
- ...optionsArg,
23
- };
24
- this.smartai = new plugins.smartai.SmartAi(this.options);
25
- if (this.options.systemMessage) {
26
- this.messageHistory.push({
27
- role: 'system',
28
- content: this.options.systemMessage,
29
- });
30
- }
31
- }
32
- /**
33
- * Starts the agent and initializes the underlying SmartAi instance
34
- */
35
- async start() {
36
- if (this.isStarted)
37
- return;
38
- await this.smartai.start();
39
- this.isStarted = true;
40
- }
41
- /**
42
- * Stops the agent and cleans up resources
43
- */
44
- async stop() {
45
- if (!this.isStarted)
46
- return;
47
- await this.smartai.stop();
48
- this.isStarted = false;
49
- }
50
- /**
51
- * Registers a tool that the agent can use
52
- */
53
- registerTool(tool) {
54
- this.tools.set(tool.name, tool);
55
- }
56
- /**
57
- * Removes a tool from the agent
58
- */
59
- unregisterTool(toolName) {
60
- this.tools.delete(toolName);
61
- }
62
- /**
63
- * Gets all registered tools
64
- */
65
- getTools() {
66
- return Array.from(this.tools.values());
67
- }
68
- /**
69
- * Sets or updates the system message
70
- */
71
- setSystemMessage(message) {
72
- const existingIndex = this.messageHistory.findIndex(m => m.role === 'system');
73
- if (existingIndex >= 0) {
74
- this.messageHistory[existingIndex].content = message;
75
- }
76
- else {
77
- this.messageHistory.unshift({
78
- role: 'system',
79
- content: message,
80
- });
81
- }
82
- }
83
- /**
84
- * Clears the conversation history (except system message)
85
- */
86
- clearHistory() {
87
- this.messageHistory = this.messageHistory.filter(m => m.role === 'system');
88
- }
89
- /**
90
- * Runs the agent with a user message
91
- * The agent will reason, use tools, and respond autonomously
92
- */
93
- async run(userMessage) {
94
- if (!this.isStarted) {
95
- await this.start();
96
- }
97
- // Add user message to history
98
- this.messageHistory.push({
99
- role: 'user',
100
- content: userMessage,
101
- });
102
- let iterations = 0;
103
- let completed = false;
104
- let response = '';
105
- while (iterations < (this.options.maxIterations || 10) && !completed) {
106
- iterations++;
107
- // Build the prompt with tool descriptions if tools are available
108
- const toolDescriptions = this.buildToolDescriptions();
109
- const systemPrompt = this.buildSystemPrompt(toolDescriptions);
110
- // Get response from AI
111
- const provider = this.getProvider();
112
- const chatResponse = await provider.chat({
113
- systemMessage: systemPrompt,
114
- userMessage: this.buildContextualPrompt(),
115
- messageHistory: [],
116
- });
117
- response = chatResponse.message;
118
- // Check if the response contains a tool call
119
- const toolCall = this.parseToolCall(response);
120
- if (toolCall) {
121
- // Execute the tool
122
- const tool = this.tools.get(toolCall.name);
123
- if (tool) {
124
- try {
125
- const toolResult = await tool.execute(toolCall.params);
126
- // Add tool interaction to history
127
- this.messageHistory.push({
128
- role: 'assistant',
129
- content: response,
130
- });
131
- this.messageHistory.push({
132
- role: 'tool',
133
- content: JSON.stringify(toolResult),
134
- toolName: toolCall.name,
135
- toolResult,
136
- });
137
- }
138
- catch (error) {
139
- // Add error to history
140
- this.messageHistory.push({
141
- role: 'tool',
142
- content: `Error executing tool ${toolCall.name}: ${error}`,
143
- toolName: toolCall.name,
144
- });
145
- }
146
- }
147
- else {
148
- // Unknown tool
149
- this.messageHistory.push({
150
- role: 'tool',
151
- content: `Unknown tool: ${toolCall.name}`,
152
- toolName: toolCall.name,
153
- });
154
- }
155
- }
156
- else {
157
- // No tool call, this is the final response
158
- this.messageHistory.push({
159
- role: 'assistant',
160
- content: response,
161
- });
162
- completed = true;
163
- }
164
- }
165
- return {
166
- response,
167
- iterations,
168
- messages: [...this.messageHistory],
169
- completed,
170
- };
171
- }
172
- /**
173
- * Simple chat without tool use
174
- */
175
- async chat(message) {
176
- if (!this.isStarted) {
177
- await this.start();
178
- }
179
- const systemMessage = this.messageHistory.find(m => m.role === 'system')?.content || 'You are a helpful assistant.';
180
- const provider = this.getProvider();
181
- const response = await provider.chat({
182
- systemMessage,
183
- userMessage: message,
184
- messageHistory: this.messageHistory
185
- .filter(m => m.role !== 'system')
186
- .map(m => ({
187
- role: m.role === 'tool' ? 'user' : m.role,
188
- content: m.content,
189
- })),
190
- });
191
- this.messageHistory.push({ role: 'user', content: message });
192
- this.messageHistory.push({ role: 'assistant', content: response.message });
193
- return response.message;
194
- }
195
- /**
196
- * Gets the AI provider based on configuration
197
- */
198
- getProvider() {
199
- const providerName = this.options.defaultProvider || 'openai';
200
- switch (providerName) {
201
- case 'openai':
202
- return this.smartai.openaiProvider;
203
- case 'anthropic':
204
- return this.smartai.anthropicProvider;
205
- case 'perplexity':
206
- return this.smartai.perplexityProvider;
207
- case 'groq':
208
- return this.smartai.groqProvider;
209
- case 'ollama':
210
- return this.smartai.ollamaProvider;
211
- case 'xai':
212
- return this.smartai.xaiProvider;
213
- case 'exo':
214
- return this.smartai.exoProvider;
215
- default:
216
- return this.smartai.openaiProvider;
217
- }
218
- }
219
- /**
220
- * Builds tool descriptions for the system prompt
221
- */
222
- buildToolDescriptions() {
223
- if (this.tools.size === 0)
224
- return '';
225
- const toolList = Array.from(this.tools.values())
226
- .map(tool => `- ${tool.name}: ${tool.description}\n Parameters: ${JSON.stringify(tool.parameters)}`)
227
- .join('\n');
228
- return `\nYou have access to the following tools:\n${toolList}\n\nTo use a tool, respond with:\n<tool_call>\n{"name": "tool_name", "params": {...}}\n</tool_call>\n\nAfter receiving the tool result, continue your reasoning or provide a final response.`;
229
- }
230
- /**
231
- * Builds the system prompt including tool descriptions
232
- */
233
- buildSystemPrompt(toolDescriptions) {
234
- const baseSystemMessage = this.messageHistory.find(m => m.role === 'system')?.content ||
235
- 'You are a helpful AI assistant.';
236
- return baseSystemMessage + toolDescriptions;
237
- }
238
- /**
239
- * Builds the contextual prompt from message history
240
- */
241
- buildContextualPrompt() {
242
- return this.messageHistory
243
- .filter(m => m.role !== 'system')
244
- .map(m => {
245
- if (m.role === 'tool') {
246
- return `[Tool Result from ${m.toolName}]: ${m.content}`;
247
- }
248
- return `[${m.role}]: ${m.content}`;
249
- })
250
- .join('\n\n');
251
- }
252
- /**
253
- * Parses a tool call from the AI response
254
- */
255
- parseToolCall(response) {
256
- const toolCallMatch = response.match(/<tool_call>\s*(\{[\s\S]*?\})\s*<\/tool_call>/);
257
- if (!toolCallMatch)
258
- return null;
259
- try {
260
- const parsed = JSON.parse(toolCallMatch[1]);
261
- if (parsed.name && typeof parsed.name === 'string') {
262
- return {
263
- name: parsed.name,
264
- params: parsed.params || {},
265
- };
266
- }
267
- }
268
- catch {
269
- return null;
270
- }
271
- return null;
272
- }
273
- }
274
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartagent.classes.smartagent.js","sourceRoot":"","sources":["../ts/smartagent.classes.smartagent.ts"],"names":[],"mappings":"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"}