@ariaflowagents/core 0.6.1 → 0.7.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.
- package/README.md +58 -5
- package/dist/agents/Agent.d.ts +1 -0
- package/dist/agents/Agent.d.ts.map +1 -1
- package/dist/agents/Agent.js +10 -1
- package/dist/agents/Agent.js.map +1 -1
- package/dist/agents/CompositeAgent.d.ts +8 -12
- package/dist/agents/CompositeAgent.d.ts.map +1 -1
- package/dist/agents/CompositeAgent.js +30 -16
- package/dist/agents/CompositeAgent.js.map +1 -1
- package/dist/agents/FlowAgent.js +2 -2
- package/dist/agents/FlowAgent.js.map +1 -1
- package/dist/agents/LLMAgent.d.ts.map +1 -1
- package/dist/agents/LLMAgent.js +4 -25
- package/dist/agents/LLMAgent.js.map +1 -1
- package/dist/agents/TriageAgent.d.ts.map +1 -1
- package/dist/agents/TriageAgent.js +8 -29
- package/dist/agents/TriageAgent.js.map +1 -1
- package/dist/callbacks/httpCallback.d.ts +1 -0
- package/dist/callbacks/httpCallback.d.ts.map +1 -1
- package/dist/callbacks/httpCallback.js +20 -6
- package/dist/callbacks/httpCallback.js.map +1 -1
- package/dist/callbacks/streamCallback.d.ts +26 -0
- package/dist/callbacks/streamCallback.d.ts.map +1 -0
- package/dist/callbacks/streamCallback.js +281 -0
- package/dist/callbacks/streamCallback.js.map +1 -0
- package/dist/flows/FlowManager.d.ts +19 -4
- package/dist/flows/FlowManager.d.ts.map +1 -1
- package/dist/flows/FlowManager.js +355 -131
- package/dist/flows/FlowManager.js.map +1 -1
- package/dist/flows/extraction.d.ts +17 -0
- package/dist/flows/extraction.d.ts.map +1 -0
- package/dist/flows/extraction.js +56 -0
- package/dist/flows/extraction.js.map +1 -0
- package/dist/flows/index.d.ts +1 -2
- package/dist/flows/index.d.ts.map +1 -1
- package/dist/flows/index.js +1 -1
- package/dist/flows/index.js.map +1 -1
- package/dist/flows/validation.d.ts +7 -0
- package/dist/flows/validation.d.ts.map +1 -0
- package/dist/flows/validation.js +42 -0
- package/dist/flows/validation.js.map +1 -0
- package/dist/hooks/builtin/metrics.d.ts +4 -34
- package/dist/hooks/builtin/metrics.d.ts.map +1 -1
- package/dist/hooks/builtin/metrics.js +3 -65
- package/dist/hooks/builtin/metrics.js.map +1 -1
- package/dist/hooks/helpers.d.ts +8 -47
- package/dist/hooks/helpers.d.ts.map +1 -1
- package/dist/hooks/helpers.js +38 -104
- package/dist/hooks/helpers.js.map +1 -1
- package/dist/hooks/index.d.ts +4 -1
- package/dist/hooks/index.d.ts.map +1 -1
- package/dist/hooks/index.js +2 -0
- package/dist/hooks/index.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/processors/ProcessorRunner.d.ts.map +1 -1
- package/dist/processors/ProcessorRunner.js +13 -0
- package/dist/processors/ProcessorRunner.js.map +1 -1
- package/dist/prompts/PromptBuilder.d.ts.map +1 -1
- package/dist/prompts/PromptBuilder.js +10 -3
- package/dist/prompts/PromptBuilder.js.map +1 -1
- package/dist/prompts/types.d.ts +2 -1
- package/dist/prompts/types.d.ts.map +1 -1
- package/dist/prompts/types.js +46 -20
- package/dist/prompts/types.js.map +1 -1
- package/dist/runtime/ContextManager.d.ts +1 -1
- package/dist/runtime/ContextManager.d.ts.map +1 -1
- package/dist/runtime/ContextManager.js +141 -20
- package/dist/runtime/ContextManager.js.map +1 -1
- package/dist/runtime/ExtractionEngine.d.ts +34 -0
- package/dist/runtime/ExtractionEngine.d.ts.map +1 -0
- package/dist/runtime/ExtractionEngine.js +155 -0
- package/dist/runtime/ExtractionEngine.js.map +1 -0
- package/dist/runtime/FlowExecutor.d.ts +51 -0
- package/dist/runtime/FlowExecutor.d.ts.map +1 -0
- package/dist/runtime/FlowExecutor.js +523 -0
- package/dist/runtime/FlowExecutor.js.map +1 -0
- package/dist/runtime/InjectionQueue.d.ts +8 -1
- package/dist/runtime/InjectionQueue.d.ts.map +1 -1
- package/dist/runtime/InjectionQueue.js +33 -0
- package/dist/runtime/InjectionQueue.js.map +1 -1
- package/dist/runtime/Runtime.d.ts +32 -2
- package/dist/runtime/Runtime.d.ts.map +1 -1
- package/dist/runtime/Runtime.js +513 -633
- package/dist/runtime/Runtime.js.map +1 -1
- package/dist/runtime/SessionEventManager.d.ts +17 -0
- package/dist/runtime/SessionEventManager.d.ts.map +1 -0
- package/dist/runtime/SessionEventManager.js +149 -0
- package/dist/runtime/SessionEventManager.js.map +1 -0
- package/dist/runtime/SuggestionManager.d.ts +7 -0
- package/dist/runtime/SuggestionManager.d.ts.map +1 -0
- package/dist/runtime/SuggestionManager.js +50 -0
- package/dist/runtime/SuggestionManager.js.map +1 -0
- package/dist/runtime/index.d.ts +1 -1
- package/dist/runtime/index.d.ts.map +1 -1
- package/dist/runtime/index.js +1 -1
- package/dist/runtime/index.js.map +1 -1
- package/dist/services/MetricsService.d.ts +55 -0
- package/dist/services/MetricsService.d.ts.map +1 -0
- package/dist/services/MetricsService.js +86 -0
- package/dist/services/MetricsService.js.map +1 -0
- package/dist/services/TracingService.d.ts +13 -0
- package/dist/services/TracingService.d.ts.map +1 -0
- package/dist/services/TracingService.js +62 -0
- package/dist/services/TracingService.js.map +1 -0
- package/dist/session/stores/MemoryStore.js +1 -1
- package/dist/session/stores/MemoryStore.js.map +1 -1
- package/dist/tools/Tool.d.ts +25 -3
- package/dist/tools/Tool.d.ts.map +1 -1
- package/dist/tools/Tool.js.map +1 -1
- package/dist/tools/errorHandling.d.ts +1 -1
- package/dist/tools/errorHandling.d.ts.map +1 -1
- package/dist/tools/errorHandling.js +27 -20
- package/dist/tools/errorHandling.js.map +1 -1
- package/dist/tools/http.d.ts.map +1 -1
- package/dist/tools/http.js +53 -17
- package/dist/tools/http.js.map +1 -1
- package/dist/types/index.d.ts +179 -3
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/telemetry.d.ts +52 -0
- package/dist/types/telemetry.d.ts.map +1 -0
- package/dist/types/telemetry.js +2 -0
- package/dist/types/telemetry.js.map +1 -0
- package/dist/utils/aiStream.d.ts +7 -0
- package/dist/utils/aiStream.d.ts.map +1 -0
- package/dist/utils/aiStream.js +41 -0
- package/dist/utils/aiStream.js.map +1 -0
- package/dist/utils/chrono.d.ts +3 -46
- package/dist/utils/chrono.d.ts.map +1 -1
- package/dist/utils/chrono.js.map +1 -1
- package/dist/utils/isRecord.d.ts +2 -0
- package/dist/utils/isRecord.d.ts.map +1 -0
- package/dist/utils/isRecord.js +4 -0
- package/dist/utils/isRecord.js.map +1 -0
- package/dist/utils/messageNormalization.d.ts +3 -0
- package/dist/utils/messageNormalization.d.ts.map +1 -0
- package/dist/utils/messageNormalization.js +121 -0
- package/dist/utils/messageNormalization.js.map +1 -0
- package/dist/utils/streamChunk.d.ts +5 -0
- package/dist/utils/streamChunk.d.ts.map +1 -0
- package/dist/utils/streamChunk.js +50 -0
- package/dist/utils/streamChunk.js.map +1 -0
- package/guides/EXAMPLE_VERIFICATION.md +53 -0
- package/guides/FLOWS.md +29 -0
- package/guides/GETTING_STARTED.md +14 -1
- package/guides/README.md +3 -1
- package/guides/RUNTIME.md +75 -0
- package/guides/TOOLS.md +6 -0
- package/package.json +2 -2
- package/dist/flows/AgentFlowManager.d.ts +0 -161
- package/dist/flows/AgentFlowManager.d.ts.map +0 -1
- package/dist/flows/AgentFlowManager.js +0 -448
- package/dist/flows/AgentFlowManager.js.map +0 -1
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
export class InMemoryMetricsService {
|
|
2
|
+
counters = new Map();
|
|
3
|
+
gauges = new Map();
|
|
4
|
+
histograms = new Map();
|
|
5
|
+
timings = new Map();
|
|
6
|
+
spans = [];
|
|
7
|
+
config;
|
|
8
|
+
constructor(config = {}) {
|
|
9
|
+
this.config = config;
|
|
10
|
+
}
|
|
11
|
+
makeKey(name, tags) {
|
|
12
|
+
const { prefix = 'ariaflow', tags: globalTags = {} } = this.config;
|
|
13
|
+
const allTags = { ...globalTags, ...tags };
|
|
14
|
+
// Prefix logic from helpers.ts
|
|
15
|
+
const fullName = prefix ? `${prefix}.${name}` : name;
|
|
16
|
+
if (!allTags || Object.keys(allTags).length === 0)
|
|
17
|
+
return fullName;
|
|
18
|
+
const tagStr = Object.entries(allTags).map(([k, v]) => `${k}:${v}`).join(',');
|
|
19
|
+
return `${fullName}{${tagStr}}`;
|
|
20
|
+
}
|
|
21
|
+
increment(name, value = 1, tags) {
|
|
22
|
+
const key = this.makeKey(name, tags);
|
|
23
|
+
this.counters.set(key, (this.counters.get(key) ?? 0) + value);
|
|
24
|
+
}
|
|
25
|
+
gauge(name, value, tags) {
|
|
26
|
+
const key = this.makeKey(name, tags);
|
|
27
|
+
this.gauges.set(key, value);
|
|
28
|
+
}
|
|
29
|
+
histogram(name, value, tags) {
|
|
30
|
+
const key = this.makeKey(name, tags);
|
|
31
|
+
const values = this.histograms.get(key) ?? [];
|
|
32
|
+
values.push(value);
|
|
33
|
+
this.histograms.set(key, values);
|
|
34
|
+
}
|
|
35
|
+
timing(name, value, tags) {
|
|
36
|
+
const key = this.makeKey(name, tags);
|
|
37
|
+
const values = this.timings.get(key) ?? [];
|
|
38
|
+
values.push(value);
|
|
39
|
+
this.timings.set(key, values);
|
|
40
|
+
}
|
|
41
|
+
recordSpan(span) {
|
|
42
|
+
this.spans.push(span);
|
|
43
|
+
if (span.endTime && span.startTime) {
|
|
44
|
+
this.timing('span.duration', span.endTime - span.startTime, {
|
|
45
|
+
spanName: span.name,
|
|
46
|
+
status: span.status,
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
getAll() {
|
|
51
|
+
const histogramStats = {};
|
|
52
|
+
for (const [key, values] of this.histograms) {
|
|
53
|
+
histogramStats[key] = {
|
|
54
|
+
count: values.length,
|
|
55
|
+
mean: values.reduce((a, b) => a + b, 0) / values.length,
|
|
56
|
+
min: Math.min(...values),
|
|
57
|
+
max: Math.max(...values),
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
const timingStats = {};
|
|
61
|
+
for (const [key, values] of this.timings) {
|
|
62
|
+
const sorted = [...values].sort((a, b) => a - b);
|
|
63
|
+
timingStats[key] = {
|
|
64
|
+
count: values.length,
|
|
65
|
+
mean: values.reduce((a, b) => a + b, 0) / values.length,
|
|
66
|
+
p50: sorted[Math.floor(sorted.length * 0.5)] ?? 0,
|
|
67
|
+
p95: sorted[Math.floor(sorted.length * 0.95)] ?? 0,
|
|
68
|
+
p99: sorted[Math.floor(sorted.length * 0.99)] ?? 0,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
return {
|
|
72
|
+
counters: Object.fromEntries(this.counters),
|
|
73
|
+
gauges: Object.fromEntries(this.gauges),
|
|
74
|
+
histograms: histogramStats,
|
|
75
|
+
timings: timingStats,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
reset() {
|
|
79
|
+
this.counters.clear();
|
|
80
|
+
this.gauges.clear();
|
|
81
|
+
this.histograms.clear();
|
|
82
|
+
this.timings.clear();
|
|
83
|
+
this.spans = [];
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
//# sourceMappingURL=MetricsService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MetricsService.js","sourceRoot":"","sources":["../../src/services/MetricsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { TracingConfig, Span } from '../types/index.js';
|
|
2
|
+
export declare class TracingService {
|
|
3
|
+
private config;
|
|
4
|
+
private spanStack;
|
|
5
|
+
constructor(config?: TracingConfig);
|
|
6
|
+
init(config: TracingConfig): void;
|
|
7
|
+
startSpan(name: string, attributes?: Record<string, string | number | boolean>, parentSpanId?: string): Span;
|
|
8
|
+
endSpan(span: Span, status?: 'success' | 'error', error?: Error): Span;
|
|
9
|
+
addSpanEvent(span: Span, name: string, attributes?: Record<string, string | number | boolean>): void;
|
|
10
|
+
getCurrentSpan(): Span | undefined;
|
|
11
|
+
private generateSpanId;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=TracingService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TracingService.d.ts","sourceRoot":"","sources":["../../src/services/TracingService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAE7D,qBAAa,cAAc;IACvB,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,SAAS,CAAc;gBAEnB,MAAM,CAAC,EAAE,aAAa;IAMlC,IAAI,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAIjC,SAAS,CACL,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,EACtD,YAAY,CAAC,EAAE,MAAM,GACtB,IAAI;IAqBP,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,OAAO,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI;IAsBtE,YAAY,CACR,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GACvD,IAAI;IAQP,cAAc,IAAI,IAAI,GAAG,SAAS;IAIlC,OAAO,CAAC,cAAc;CAGzB"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
export class TracingService {
|
|
2
|
+
config = null;
|
|
3
|
+
spanStack = [];
|
|
4
|
+
constructor(config) {
|
|
5
|
+
if (config) {
|
|
6
|
+
this.init(config);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
init(config) {
|
|
10
|
+
this.config = config;
|
|
11
|
+
}
|
|
12
|
+
startSpan(name, attributes, parentSpanId) {
|
|
13
|
+
if (!this.config) {
|
|
14
|
+
// Fallback or throw? Helpers threw.
|
|
15
|
+
// We will throw to maintain behavior, but maybe warn in future.
|
|
16
|
+
throw new Error('Tracing not initialized. Call initTracing() first.');
|
|
17
|
+
}
|
|
18
|
+
const span = {
|
|
19
|
+
id: this.generateSpanId(),
|
|
20
|
+
parentId: parentSpanId ?? this.spanStack[this.spanStack.length - 1]?.id,
|
|
21
|
+
name,
|
|
22
|
+
startTime: Date.now(),
|
|
23
|
+
attributes: attributes ?? {},
|
|
24
|
+
events: [],
|
|
25
|
+
status: 'started',
|
|
26
|
+
};
|
|
27
|
+
this.spanStack.push(span);
|
|
28
|
+
return span;
|
|
29
|
+
}
|
|
30
|
+
endSpan(span, status, error) {
|
|
31
|
+
span.endTime = Date.now();
|
|
32
|
+
span.status = status === 'error' || error ? 'error' : 'ended';
|
|
33
|
+
if (error) {
|
|
34
|
+
span.error = error;
|
|
35
|
+
span.events.push({
|
|
36
|
+
name: 'error',
|
|
37
|
+
timestamp: Date.now(),
|
|
38
|
+
attributes: { message: error.message, stack: error.stack ?? '' },
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
const config = this.config;
|
|
42
|
+
if (config?.exporter) {
|
|
43
|
+
config.exporter(span).catch(console.error);
|
|
44
|
+
}
|
|
45
|
+
this.spanStack.pop();
|
|
46
|
+
return span;
|
|
47
|
+
}
|
|
48
|
+
addSpanEvent(span, name, attributes) {
|
|
49
|
+
span.events.push({
|
|
50
|
+
name,
|
|
51
|
+
timestamp: Date.now(),
|
|
52
|
+
attributes,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
getCurrentSpan() {
|
|
56
|
+
return this.spanStack[this.spanStack.length - 1];
|
|
57
|
+
}
|
|
58
|
+
generateSpanId() {
|
|
59
|
+
return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=TracingService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TracingService.js","sourceRoot":"","sources":["../../src/services/TracingService.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,cAAc;IACf,MAAM,GAAyB,IAAI,CAAC;IACpC,SAAS,GAAW,EAAE,CAAC;IAE/B,YAAY,MAAsB;QAC9B,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAqB;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,SAAS,CACL,IAAY,EACZ,UAAsD,EACtD,YAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,oCAAoC;YACpC,gEAAgE;YAChE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,IAAI,GAAS;YACf,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE;YACzB,QAAQ,EAAE,YAAY,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE;YACvE,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,UAAU,EAAE,UAAU,IAAI,EAAE;YAC5B,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,SAAS;SACpB,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,IAAU,EAAE,MAA4B,EAAE,KAAa;QAC3D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,KAAK,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;QAE9D,IAAI,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACb,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;gBACrB,UAAU,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE;aACnE,CAAC,CAAC;QACP,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,MAAM,EAAE,QAAQ,EAAE,CAAC;YACnB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,YAAY,CACR,IAAU,EACV,IAAY,EACZ,UAAsD;QAEtD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACb,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,UAAU;SACb,CAAC,CAAC;IACP,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC;IAEO,cAAc;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrG,CAAC;CACJ"}
|
|
@@ -12,7 +12,7 @@ export class MemoryStore {
|
|
|
12
12
|
this.sessions.delete(id);
|
|
13
13
|
}
|
|
14
14
|
async list(userId) {
|
|
15
|
-
const all = Array.from(this.sessions.values());
|
|
15
|
+
const all = Array.from(this.sessions.values()).map(s => structuredClone(s));
|
|
16
16
|
if (userId) {
|
|
17
17
|
return all.filter(session => session.userId === userId);
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryStore.js","sourceRoot":"","sources":["../../../src/session/stores/MemoryStore.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,WAAW;IACd,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IAE9C,KAAK,CAAC,GAAG,CAAC,EAAU;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAgB;QACzB,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAe;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MemoryStore.js","sourceRoot":"","sources":["../../../src/session/stores/MemoryStore.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,WAAW;IACd,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAC;IAE9C,KAAK,CAAC,GAAG,CAAC,EAAU;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAgB;QACzB,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAe;QACxB,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAgB;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1C,MAAM,GAAG,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC9C,IAAI,GAAG,GAAG,QAAQ,EAAE,CAAC;gBACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACzB,OAAO,IAAI,CAAC,CAAC;YACf,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
package/dist/tools/Tool.d.ts
CHANGED
|
@@ -2,10 +2,32 @@ import type { Tool as AiTool, ToolSet as AiToolSet } from 'ai';
|
|
|
2
2
|
import type { ZodTypeAny } from 'zod';
|
|
3
3
|
export type Tool<TInput = unknown, TResult = unknown> = AiTool<TInput, TResult>;
|
|
4
4
|
export type ToolSet = AiToolSet;
|
|
5
|
+
export interface ToolExecutionContext {
|
|
6
|
+
session?: unknown;
|
|
7
|
+
sessionId?: string;
|
|
8
|
+
agentId?: string;
|
|
9
|
+
step?: number;
|
|
10
|
+
turn?: number;
|
|
11
|
+
toolName?: string;
|
|
12
|
+
toolCallId?: string;
|
|
13
|
+
idempotencyKey?: string;
|
|
14
|
+
[key: string]: unknown;
|
|
15
|
+
}
|
|
16
|
+
export interface ToolExecutionOptions {
|
|
17
|
+
toolCallId?: string;
|
|
18
|
+
messages?: unknown[];
|
|
19
|
+
abortSignal?: AbortSignal;
|
|
20
|
+
experimental_context?: ToolExecutionContext;
|
|
21
|
+
[key: string]: unknown;
|
|
22
|
+
}
|
|
5
23
|
export interface ToolDefinition<TInput = unknown, TResult = unknown> {
|
|
6
24
|
description: string;
|
|
7
25
|
inputSchema: ZodTypeAny;
|
|
8
|
-
execute: (input: TInput) => Promise<TResult> | TResult;
|
|
26
|
+
execute: (input: TInput, options?: ToolExecutionOptions) => Promise<TResult> | TResult;
|
|
27
|
+
/** If true (default), failure blocks turn success completion. */
|
|
28
|
+
critical?: boolean;
|
|
29
|
+
/** Action to take on execution error. */
|
|
30
|
+
errorPolicy?: 'abort' | 'warn' | 'continue';
|
|
9
31
|
}
|
|
10
32
|
export interface ToolWithFiller<TInput = unknown, TResult = unknown> extends ToolDefinition<TInput, TResult> {
|
|
11
33
|
/** Optional filler message to display while tool is executing */
|
|
@@ -13,6 +35,6 @@ export interface ToolWithFiller<TInput = unknown, TResult = unknown> extends Too
|
|
|
13
35
|
/** Optional estimated duration in ms for showing filler */
|
|
14
36
|
estimatedDurationMs?: number;
|
|
15
37
|
}
|
|
16
|
-
export declare function createTool<TInput = unknown, TResult = unknown>(definition: ToolDefinition<TInput, TResult>): ToolDefinition<TInput, TResult>;
|
|
17
|
-
export declare function createToolWithFiller<TInput = unknown, TResult = unknown>(definition: ToolWithFiller<TInput, TResult>): ToolWithFiller<TInput, TResult>;
|
|
38
|
+
export declare function createTool<TInput = unknown, TResult = unknown>(definition: ToolDefinition<TInput, TResult>): Tool<TInput, TResult> & ToolDefinition<TInput, TResult>;
|
|
39
|
+
export declare function createToolWithFiller<TInput = unknown, TResult = unknown>(definition: ToolWithFiller<TInput, TResult>): Tool<TInput, TResult> & ToolWithFiller<TInput, TResult>;
|
|
18
40
|
//# sourceMappingURL=Tool.d.ts.map
|
package/dist/tools/Tool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tool.d.ts","sourceRoot":"","sources":["../../src/tools/Tool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAEtC,MAAM,MAAM,IAAI,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAChF,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC;AAEhC,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Tool.d.ts","sourceRoot":"","sources":["../../src/tools/Tool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AAEtC,MAAM,MAAM,IAAI,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAChF,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC;AAEhC,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO;IACjE,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,UAAU,CAAC;IACxB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACvF,iEAAiE;IACjE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,yCAAyC;IACzC,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,UAAU,CAAC;CAC7C;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,CAAE,SAAQ,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1G,iEAAiE;IACjE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,wBAAgB,UAAU,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EAC5D,UAAU,EAAE,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,GAC1C,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAIzD;AAED,wBAAgB,oBAAoB,CAAC,MAAM,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO,EACtE,UAAU,EAAE,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,GAC1C,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzD"}
|
package/dist/tools/Tool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tool.js","sourceRoot":"","sources":["../../src/tools/Tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Tool.js","sourceRoot":"","sources":["../../src/tools/Tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,IAAI,CAAC;AA4CpC,MAAM,UAAU,UAAU,CACxB,UAA2C;IAE3C,+EAA+E;IAC/E,uFAAuF;IACvF,OAAO,MAAM,CAAC,UAAiB,CAAQ,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,UAA2C;IAE3C,MAAM,CAAC,GAAG,MAAM,CAAC,UAAiB,CAAC,CAAC;IACpC,mFAAmF;IACnF,IAAI,UAAU,CAAC,MAAM;QAAG,CAAS,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC7D,IAAI,UAAU,CAAC,mBAAmB;QAAG,CAAS,CAAC,mBAAmB,GAAG,UAAU,CAAC,mBAAmB,CAAC;IACpG,OAAO,CAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -20,10 +20,10 @@ export declare function executeWithRetry<T>(fn: () => Promise<T>, config?: {
|
|
|
20
20
|
maxDelayMs?: number;
|
|
21
21
|
onRetry?: (error: Error, attempt: number) => void;
|
|
22
22
|
}): Promise<T>;
|
|
23
|
+
export type CircuitState = 'CLOSED' | 'OPEN' | 'HALF_OPEN';
|
|
23
24
|
export declare function createCircuitBreaker<T, Args extends unknown[]>(fn: (...args: Args) => Promise<T>, config?: {
|
|
24
25
|
failureThreshold?: number;
|
|
25
26
|
resetTimeoutMs?: number;
|
|
26
|
-
halfOpenRequests?: number;
|
|
27
27
|
}): (...args: Args) => Promise<T>;
|
|
28
28
|
export declare function isPermanentError(error: Error): boolean;
|
|
29
29
|
export declare class CircuitOpenError extends Error {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandling.d.ts","sourceRoot":"","sources":["../../src/tools/errorHandling.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,OAAO;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;CACzC;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,OAAO;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EACzE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,EACxB,MAAM,GAAE,eAAe,CAAC,CAAC,CAAM,GAC9B,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CA+C3C;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,MAAM,GAAE;IACN,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C,GACL,OAAO,CAAC,CAAC,CAAC,CAgCZ;AAED,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAC5D,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACjC,MAAM,GAAE;IACN,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"errorHandling.d.ts","sourceRoot":"","sources":["../../src/tools/errorHandling.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,OAAO;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,CAAC,CAAC;IAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC;CACzC;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,OAAO;IACrC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,EACzE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,EACxB,MAAM,GAAE,eAAe,CAAC,CAAC,CAAM,GAC9B,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CA+C3C;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,MAAM,GAAE;IACN,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C,GACL,OAAO,CAAC,CAAC,CAAC,CAgCZ;AAED,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,MAAM,GAAG,WAAW,CAAC;AAE3D,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAC5D,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EACjC,MAAM,GAAE;IACN,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACpB,GACL,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CA2C/B;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CActD;AAED,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAE5E;AAED,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,OAAO,GAAE,MAAmC;CAIzD;AAED,wBAAsB,WAAW,CAAC,CAAC,EACjC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,KAAK,GACZ,OAAO,CAAC,CAAC,CAAC,CAeZ"}
|
|
@@ -60,23 +60,15 @@ export async function executeWithRetry(fn, config = {}) {
|
|
|
60
60
|
throw lastError;
|
|
61
61
|
}
|
|
62
62
|
export function createCircuitBreaker(fn, config = {}) {
|
|
63
|
-
const { failureThreshold = 5, resetTimeoutMs = 30000,
|
|
63
|
+
const { failureThreshold = 5, resetTimeoutMs = 30000, } = config;
|
|
64
64
|
let failures = 0;
|
|
65
65
|
let lastFailureTime;
|
|
66
|
-
let
|
|
67
|
-
let isOpen = false;
|
|
66
|
+
let state = 'CLOSED';
|
|
68
67
|
return async (...args) => {
|
|
69
68
|
const now = Date.now();
|
|
70
|
-
if (
|
|
69
|
+
if (state === 'OPEN') {
|
|
71
70
|
if (lastFailureTime && now - lastFailureTime >= resetTimeoutMs) {
|
|
72
|
-
|
|
73
|
-
halfOpenCount++;
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
failures = 0;
|
|
77
|
-
halfOpenCount = 0;
|
|
78
|
-
isOpen = false;
|
|
79
|
-
}
|
|
71
|
+
state = 'HALF_OPEN';
|
|
80
72
|
}
|
|
81
73
|
else {
|
|
82
74
|
throw new CircuitOpenError('Circuit breaker is open');
|
|
@@ -84,15 +76,20 @@ export function createCircuitBreaker(fn, config = {}) {
|
|
|
84
76
|
}
|
|
85
77
|
try {
|
|
86
78
|
const result = await fn(...args);
|
|
87
|
-
|
|
88
|
-
|
|
79
|
+
if (state === 'HALF_OPEN') {
|
|
80
|
+
state = 'CLOSED';
|
|
81
|
+
failures = 0;
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
failures = 0; // Success in CLOSED state resets failure count
|
|
85
|
+
}
|
|
89
86
|
return result;
|
|
90
87
|
}
|
|
91
88
|
catch (error) {
|
|
92
89
|
failures++;
|
|
93
90
|
lastFailureTime = now;
|
|
94
|
-
if (failures >= failureThreshold) {
|
|
95
|
-
|
|
91
|
+
if (state === 'HALF_OPEN' || failures >= failureThreshold) {
|
|
92
|
+
state = 'OPEN';
|
|
96
93
|
}
|
|
97
94
|
throw error;
|
|
98
95
|
}
|
|
@@ -128,10 +125,20 @@ export class ToolTimeoutError extends Error {
|
|
|
128
125
|
}
|
|
129
126
|
}
|
|
130
127
|
export async function withTimeout(fn, timeoutMs, error) {
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
128
|
+
let timer;
|
|
129
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
130
|
+
timer = setTimeout(() => {
|
|
131
|
+
reject(error ?? new ToolTimeoutError());
|
|
132
|
+
}, timeoutMs);
|
|
133
|
+
});
|
|
134
|
+
try {
|
|
135
|
+
return await Promise.race([fn(), timeoutPromise]);
|
|
136
|
+
}
|
|
137
|
+
finally {
|
|
138
|
+
if (timer) {
|
|
139
|
+
clearTimeout(timer);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
135
142
|
}
|
|
136
143
|
function sleep(ms) {
|
|
137
144
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errorHandling.js","sourceRoot":"","sources":["../../src/tools/errorHandling.ts"],"names":[],"mappings":"AAgBA,MAAM,UAAU,iBAAiB,CAC/B,EAAwB,EACxB,SAA6B,EAAE;IAE/B,MAAM,EACJ,UAAU,GAAG,CAAC,EACd,YAAY,GAAG,IAAI,EACnB,aAAa,EACb,OAAO,EACP,WAAW,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAC1C,GAAG,MAAM,CAAC;IAEX,OAAO,KAAK,EAAE,GAAG,IAAU,EAA0B,EAAE;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,IAAI,SAA4B,CAAC;QACjC,IAAI,QAAQ,GAAG,CAAC,CAAC;QAEjB,OAAO,QAAQ,IAAI,UAAU,EAAE,CAAC;YAC9B,QAAQ,EAAE,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,CAAM,CAAC;gBACtC,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,MAAM;oBACZ,QAAQ;oBACR,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBACpC,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,SAAS,GAAG,KAAc,CAAC;gBAE3B,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACrC,CAAC;gBAED,IAAI,QAAQ,IAAI,UAAU,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;oBACrD,MAAM,KAAK,CAAC,YAAY,GAAG,QAAQ,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,SAAS;YAChB,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;YACnC,IAAI,EAAE,aAAa;SACpB,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAoB,EACpB,SAMI,EAAE;IAEN,MAAM,EACJ,UAAU,GAAG,CAAC,EACd,OAAO,GAAG,IAAI,EACd,iBAAiB,GAAG,CAAC,EACrB,UAAU,GAAG,KAAK,EAClB,OAAO,GACR,GAAG,MAAM,CAAC;IAEX,IAAI,SAA4B,CAAC;IACjC,IAAI,YAAY,GAAG,OAAO,CAAC;IAE3B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,UAAU,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;QAC3D,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAc,CAAC;YAE3B,IAAI,gBAAgB,CAAC,SAAS,CAAC,IAAI,OAAO,GAAG,UAAU,EAAE,CAAC;gBACxD,MAAM,SAAS,CAAC;YAClB,CAAC;YAED,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC9B,CAAC;YAED,MAAM,KAAK,CAAC,YAAY,CAAC,CAAC;YAC1B,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,iBAAiB,EAAE,UAAU,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED,MAAM,SAAS,CAAC;AAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"errorHandling.js","sourceRoot":"","sources":["../../src/tools/errorHandling.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/http.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/tools/http.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EACV,cAAc,EAId,cAAc,EACf,MAAM,iBAAiB,CAAC;AAGzB;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/tools/http.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,EACV,cAAc,EAId,cAAc,EACf,MAAM,iBAAiB,CAAC;AAGzB;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CA+CpF"}
|
package/dist/tools/http.js
CHANGED
|
@@ -18,10 +18,11 @@ export function createHttpTool(config) {
|
|
|
18
18
|
return createTool({
|
|
19
19
|
description,
|
|
20
20
|
inputSchema,
|
|
21
|
-
execute: async (input) => {
|
|
21
|
+
execute: async (input, options) => {
|
|
22
22
|
const validatedInput = input;
|
|
23
|
+
const idempotencyKey = getIdempotencyKey(options);
|
|
23
24
|
try {
|
|
24
|
-
const result = await executeHttpRequest(method, url, validatedInput, pathParams, queryParams, headers, bodyParams, auth, timeoutMs);
|
|
25
|
+
const result = await executeHttpRequest(method, url, validatedInput, pathParams, queryParams, headers, bodyParams, auth, timeoutMs, idempotencyKey);
|
|
25
26
|
return result;
|
|
26
27
|
}
|
|
27
28
|
catch (error) {
|
|
@@ -67,32 +68,51 @@ function getZodType(type) {
|
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
70
|
/** Execute the HTTP request */
|
|
70
|
-
async function executeHttpRequest(method, url, input, pathParams, queryParams, headers, bodyParams, auth, timeoutMs) {
|
|
71
|
-
//
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
71
|
+
async function executeHttpRequest(method, url, input, pathParams, queryParams, headers, bodyParams, auth, timeoutMs, idempotencyKey) {
|
|
72
|
+
// 1. Basic URL validation
|
|
73
|
+
if (!url.startsWith('http://') && !url.startsWith('https://')) {
|
|
74
|
+
return {
|
|
75
|
+
success: false,
|
|
76
|
+
error: 'Invalid URL: Must start with http:// or https://',
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
// 2. Substitute path params using regex for robustness
|
|
80
|
+
let substitutedUrl = url;
|
|
81
|
+
substitutedUrl = substitutedUrl.replace(/\{(\w+)\}/g, (match, paramName) => {
|
|
82
|
+
const value = input[paramName];
|
|
75
83
|
if (value !== undefined && value !== null) {
|
|
76
|
-
|
|
84
|
+
return encodeURIComponent(String(value));
|
|
77
85
|
}
|
|
86
|
+
return match; // Keep as is if not provided
|
|
87
|
+
});
|
|
88
|
+
let urlObj;
|
|
89
|
+
try {
|
|
90
|
+
urlObj = new URL(substitutedUrl);
|
|
91
|
+
}
|
|
92
|
+
catch (err) {
|
|
93
|
+
return {
|
|
94
|
+
success: false,
|
|
95
|
+
error: `Malformed URL after substitution: ${substitutedUrl}`,
|
|
96
|
+
};
|
|
78
97
|
}
|
|
79
|
-
// Build query string
|
|
80
|
-
const queryParts = [];
|
|
98
|
+
// 3. Build query string (merging with existing)
|
|
81
99
|
for (const param of queryParams) {
|
|
82
100
|
const value = input[param.name];
|
|
83
101
|
if (value !== undefined && value !== null) {
|
|
84
|
-
|
|
102
|
+
urlObj.searchParams.append(param.name, String(value));
|
|
85
103
|
}
|
|
86
104
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
90
|
-
// Build headers with auth
|
|
105
|
+
const finalUrl = urlObj.toString();
|
|
106
|
+
// 4. Build headers with auth
|
|
91
107
|
const finalHeaders = { ...headers, 'Content-Type': 'application/json' };
|
|
92
108
|
if (auth) {
|
|
93
109
|
addAuthHeaders(finalHeaders, auth, input);
|
|
94
110
|
}
|
|
95
|
-
//
|
|
111
|
+
// For side-effecting requests, forward runtime-generated idempotency key by default.
|
|
112
|
+
if (idempotencyKey && method !== 'GET' && !hasHeader(finalHeaders, 'Idempotency-Key')) {
|
|
113
|
+
finalHeaders['Idempotency-Key'] = idempotencyKey;
|
|
114
|
+
}
|
|
115
|
+
// 5. Build body
|
|
96
116
|
let body;
|
|
97
117
|
if (['POST', 'PUT', 'PATCH'].includes(method) && bodyParams.length > 0) {
|
|
98
118
|
const bodyObj = {};
|
|
@@ -104,7 +124,7 @@ async function executeHttpRequest(method, url, input, pathParams, queryParams, h
|
|
|
104
124
|
}
|
|
105
125
|
body = JSON.stringify(bodyObj);
|
|
106
126
|
}
|
|
107
|
-
// Execute with timeout
|
|
127
|
+
// 6. Execute with timeout
|
|
108
128
|
const controller = new AbortController();
|
|
109
129
|
const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
|
|
110
130
|
try {
|
|
@@ -141,6 +161,22 @@ async function executeHttpRequest(method, url, input, pathParams, queryParams, h
|
|
|
141
161
|
throw error;
|
|
142
162
|
}
|
|
143
163
|
}
|
|
164
|
+
function hasHeader(headers, target) {
|
|
165
|
+
const targetLower = target.toLowerCase();
|
|
166
|
+
return Object.keys(headers).some(name => name.toLowerCase() === targetLower);
|
|
167
|
+
}
|
|
168
|
+
function getIdempotencyKey(options) {
|
|
169
|
+
if (!isRecord(options))
|
|
170
|
+
return undefined;
|
|
171
|
+
const context = options.experimental_context;
|
|
172
|
+
if (!isRecord(context))
|
|
173
|
+
return undefined;
|
|
174
|
+
const key = context.idempotencyKey;
|
|
175
|
+
return typeof key === 'string' && key.length > 0 ? key : undefined;
|
|
176
|
+
}
|
|
177
|
+
function isRecord(value) {
|
|
178
|
+
return typeof value === 'object' && value !== null;
|
|
179
|
+
}
|
|
144
180
|
/** Add authentication headers */
|
|
145
181
|
function addAuthHeaders(headers, auth, input) {
|
|
146
182
|
switch (auth.type) {
|
package/dist/tools/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/tools/http.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AASvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,MAAsB;IACnD,MAAM,EACJ,WAAW,EACX,MAAM,EACN,GAAG,EACH,UAAU,GAAG,EAAE,EACf,WAAW,GAAG,EAAE,EAChB,OAAO,GAAG,EAAE,EACZ,UAAU,GAAG,EAAE,EACf,IAAI,EACJ,SAAS,GAAG,KAAK,EACjB,aAAa,GACd,GAAG,MAAM,CAAC;IAEX,uCAAuC;IACvC,MAAM,WAAW,GAAG,gBAAgB,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,WAAW,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;IAErF,OAAO,UAAU,CAA0B;QACzC,WAAW;QACX,WAAW;QACX,OAAO,EAAE,KAAK,EAAE,KAAc,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/tools/http.ts"],"names":[],"mappings":"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"}
|