@cogitator-ai/core 0.21.1 → 0.23.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 +45 -30
- package/dist/agent.d.ts +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +17 -1
- package/dist/agent.js.map +1 -1
- package/dist/cogitator/initializers.d.ts +5 -6
- package/dist/cogitator/initializers.d.ts.map +1 -1
- package/dist/cogitator/initializers.js +32 -19
- package/dist/cogitator/initializers.js.map +1 -1
- package/dist/cogitator/message-builder.d.ts +1 -1
- package/dist/cogitator/message-builder.d.ts.map +1 -1
- package/dist/cogitator/message-builder.js +23 -8
- package/dist/cogitator/message-builder.js.map +1 -1
- package/dist/cogitator/response-format.d.ts +17 -0
- package/dist/cogitator/response-format.d.ts.map +1 -0
- package/dist/cogitator/response-format.js +78 -0
- package/dist/cogitator/response-format.js.map +1 -0
- package/dist/cogitator/run-limiter.d.ts +18 -0
- package/dist/cogitator/run-limiter.d.ts.map +1 -0
- package/dist/cogitator/run-limiter.js +64 -0
- package/dist/cogitator/run-limiter.js.map +1 -0
- package/dist/cogitator/streaming.d.ts +2 -2
- package/dist/cogitator/streaming.d.ts.map +1 -1
- package/dist/cogitator/streaming.js +2 -1
- package/dist/cogitator/streaming.js.map +1 -1
- package/dist/cogitator/threads.d.ts +27 -0
- package/dist/cogitator/threads.d.ts.map +1 -0
- package/dist/cogitator/threads.js +54 -0
- package/dist/cogitator/threads.js.map +1 -0
- package/dist/cogitator/tool-executor.d.ts.map +1 -1
- package/dist/cogitator/tool-executor.js +18 -4
- package/dist/cogitator/tool-executor.js.map +1 -1
- package/dist/constitutional/constitutional-ai.d.ts +5 -0
- package/dist/constitutional/constitutional-ai.d.ts.map +1 -1
- package/dist/constitutional/constitutional-ai.js +19 -28
- package/dist/constitutional/constitutional-ai.js.map +1 -1
- package/dist/context/context-manager.d.ts +4 -1
- package/dist/context/context-manager.d.ts.map +1 -1
- package/dist/context/context-manager.js +12 -11
- package/dist/context/context-manager.js.map +1 -1
- package/dist/cost-routing/cost-estimator.d.ts +2 -0
- package/dist/cost-routing/cost-estimator.d.ts.map +1 -1
- package/dist/cost-routing/cost-estimator.js +6 -2
- package/dist/cost-routing/cost-estimator.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/learning/agent-optimizer.d.ts +21 -5
- package/dist/learning/agent-optimizer.d.ts.map +1 -1
- package/dist/learning/agent-optimizer.js +97 -142
- package/dist/learning/agent-optimizer.js.map +1 -1
- package/dist/learning/index.d.ts +1 -1
- package/dist/learning/index.d.ts.map +1 -1
- package/dist/learning/trace-builder.d.ts +20 -0
- package/dist/learning/trace-builder.d.ts.map +1 -0
- package/dist/learning/trace-builder.js +159 -0
- package/dist/learning/trace-builder.js.map +1 -0
- package/dist/llm/anthropic.d.ts +2 -0
- package/dist/llm/anthropic.d.ts.map +1 -1
- package/dist/llm/anthropic.js +11 -0
- package/dist/llm/anthropic.js.map +1 -1
- package/dist/llm/azure.d.ts +2 -0
- package/dist/llm/azure.d.ts.map +1 -1
- package/dist/llm/azure.js +1 -0
- package/dist/llm/azure.js.map +1 -1
- package/dist/llm/bedrock.d.ts +2 -0
- package/dist/llm/bedrock.d.ts.map +1 -1
- package/dist/llm/bedrock.js +3 -0
- package/dist/llm/bedrock.js.map +1 -1
- package/dist/llm/errors.d.ts +5 -0
- package/dist/llm/errors.d.ts.map +1 -1
- package/dist/llm/errors.js +36 -26
- package/dist/llm/errors.js.map +1 -1
- package/dist/llm/google.d.ts.map +1 -1
- package/dist/llm/google.js +29 -5
- package/dist/llm/google.js.map +1 -1
- package/dist/llm/index.d.ts +8 -2
- package/dist/llm/index.d.ts.map +1 -1
- package/dist/llm/index.js +18 -18
- package/dist/llm/index.js.map +1 -1
- package/dist/llm/ollama.d.ts.map +1 -1
- package/dist/llm/ollama.js +7 -3
- package/dist/llm/ollama.js.map +1 -1
- package/dist/llm/openai.d.ts +2 -0
- package/dist/llm/openai.d.ts.map +1 -1
- package/dist/llm/openai.js +1 -0
- package/dist/llm/openai.js.map +1 -1
- package/dist/llm/providers.d.ts +4 -0
- package/dist/llm/providers.d.ts.map +1 -0
- package/dist/llm/providers.js +18 -0
- package/dist/llm/providers.js.map +1 -0
- package/dist/llm/retry.d.ts +32 -0
- package/dist/llm/retry.d.ts.map +1 -0
- package/dist/llm/retry.js +107 -0
- package/dist/llm/retry.js.map +1 -0
- package/dist/observability/opentelemetry.d.ts +12 -5
- package/dist/observability/opentelemetry.d.ts.map +1 -1
- package/dist/observability/opentelemetry.js +58 -32
- package/dist/observability/opentelemetry.js.map +1 -1
- package/dist/reasoning/thought-tree.js +2 -2
- package/dist/reasoning/thought-tree.js.map +1 -1
- package/dist/runtime.d.ts +23 -1
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +136 -37
- package/dist/runtime.js.map +1 -1
- package/dist/time-travel/checkpoint-store.d.ts +1 -0
- package/dist/time-travel/checkpoint-store.d.ts.map +1 -1
- package/dist/time-travel/checkpoint-store.js +16 -7
- package/dist/time-travel/checkpoint-store.js.map +1 -1
- package/dist/time-travel/replayer.d.ts +9 -1
- package/dist/time-travel/replayer.d.ts.map +1 -1
- package/dist/time-travel/replayer.js +40 -23
- package/dist/time-travel/replayer.js.map +1 -1
- package/dist/time-travel/time-travel.d.ts +13 -0
- package/dist/time-travel/time-travel.d.ts.map +1 -1
- package/dist/time-travel/time-travel.js +79 -9
- package/dist/time-travel/time-travel.js.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
const SCHEMA_NAME = 'response';
|
|
3
|
+
/**
|
|
4
|
+
* Translates an agent's `responseFormat` into the format LLM backends take.
|
|
5
|
+
*
|
|
6
|
+
* Zod schemas become JSON Schema. Strict mode is requested only when the
|
|
7
|
+
* schema allows it (every property required, no additional properties),
|
|
8
|
+
* since providers refuse strict schemas with optional fields.
|
|
9
|
+
*/
|
|
10
|
+
export function toLLMResponseFormat(format) {
|
|
11
|
+
if (!format)
|
|
12
|
+
return undefined;
|
|
13
|
+
switch (format.type) {
|
|
14
|
+
case 'text':
|
|
15
|
+
return undefined;
|
|
16
|
+
case 'json':
|
|
17
|
+
return { type: 'json_object' };
|
|
18
|
+
case 'json_schema': {
|
|
19
|
+
const schema = z.toJSONSchema(format.schema, { unrepresentable: 'any' });
|
|
20
|
+
delete schema.$schema;
|
|
21
|
+
const description = typeof schema.description === 'string' ? schema.description : undefined;
|
|
22
|
+
return {
|
|
23
|
+
type: 'json_schema',
|
|
24
|
+
jsonSchema: {
|
|
25
|
+
name: SCHEMA_NAME,
|
|
26
|
+
...(description && { description }),
|
|
27
|
+
schema,
|
|
28
|
+
strict: isStrictCompatible(schema),
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
function isStrictCompatible(schema) {
|
|
35
|
+
if (typeof schema !== 'object' || schema === null)
|
|
36
|
+
return true;
|
|
37
|
+
if (Array.isArray(schema))
|
|
38
|
+
return schema.every(isStrictCompatible);
|
|
39
|
+
const node = schema;
|
|
40
|
+
if (node.type === 'object' || node.properties !== undefined) {
|
|
41
|
+
const properties = (node.properties ?? {});
|
|
42
|
+
const required = new Set(Array.isArray(node.required) ? node.required : []);
|
|
43
|
+
if (Object.keys(properties).some((key) => !required.has(key)))
|
|
44
|
+
return false;
|
|
45
|
+
if (node.additionalProperties !== false)
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
return Object.entries(node).every(([key, value]) => key === 'required' || key === 'enum' || isStrictCompatible(value));
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Reads the structured result of a run from its final text.
|
|
52
|
+
*
|
|
53
|
+
* Returns `undefined` when the agent asked for plain text, when the text is not
|
|
54
|
+
* JSON, or when it does not match the agent's schema.
|
|
55
|
+
*/
|
|
56
|
+
export function parseStructuredOutput(format, output) {
|
|
57
|
+
if (!format || format.type === 'text')
|
|
58
|
+
return undefined;
|
|
59
|
+
const parsed = parseJson(output);
|
|
60
|
+
if (parsed === undefined)
|
|
61
|
+
return undefined;
|
|
62
|
+
if (format.type === 'json')
|
|
63
|
+
return parsed;
|
|
64
|
+
const result = format.schema.safeParse(parsed);
|
|
65
|
+
return result.success ? result.data : undefined;
|
|
66
|
+
}
|
|
67
|
+
function parseJson(text) {
|
|
68
|
+
const trimmed = text.trim();
|
|
69
|
+
const fenced = /^```(?:json)?\s*\n?([\s\S]*?)\n?```$/i.exec(trimmed);
|
|
70
|
+
const candidate = fenced ? fenced[1] : trimmed;
|
|
71
|
+
try {
|
|
72
|
+
return JSON.parse(candidate);
|
|
73
|
+
}
|
|
74
|
+
catch {
|
|
75
|
+
return undefined;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=response-format.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"response-format.js","sourceRoot":"","sources":["../../src/cogitator/response-format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,MAAM,WAAW,GAAG,UAAU,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAkC;IAElC,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,MAAM;YACT,OAAO,SAAS,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;QACjC,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,MAAM,MAAM,GAAG,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAGtE,CAAC;YACF,OAAO,MAAM,CAAC,OAAO,CAAC;YACtB,MAAM,WAAW,GAAG,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5F,OAAO;gBACL,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE;oBACV,IAAI,EAAE,WAAW;oBACjB,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;oBACnC,MAAM;oBACN,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC;iBACnC;aACF,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAe;IACzC,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,MAAiC,CAAC;IAE/C,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC5D,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAA4B,CAAC;QACtE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,IAAI,CAAC,QAAqB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1F,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QAC5E,IAAI,IAAI,CAAC,oBAAoB,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC;IACxD,CAAC;IAED,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAC/B,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,MAAM,IAAI,kBAAkB,CAAC,KAAK,CAAC,CACpF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,MAAkC,EAAE,MAAc;IACtF,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,SAAS,CAAC;IAExD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC;AAED,SAAS,SAAS,CAAC,IAAY;IAC7B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,MAAM,MAAM,GAAG,uCAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/C,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAY,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Caps how many runs execute at once; the rest wait in arrival order.
|
|
3
|
+
*
|
|
4
|
+
* A waiting run leaves the queue when its signal aborts, so a run timeout or a
|
|
5
|
+
* caller's abort also covers the time spent waiting for a slot.
|
|
6
|
+
*/
|
|
7
|
+
export declare class RunLimiter {
|
|
8
|
+
private readonly max;
|
|
9
|
+
private active;
|
|
10
|
+
private readonly waiting;
|
|
11
|
+
constructor(max: number);
|
|
12
|
+
get running(): number;
|
|
13
|
+
get queued(): number;
|
|
14
|
+
/** Waits for a free slot and returns the function that frees it. */
|
|
15
|
+
acquire(signal: AbortSignal): Promise<() => void>;
|
|
16
|
+
private releaser;
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=run-limiter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-limiter.d.ts","sourceRoot":"","sources":["../../src/cogitator/run-limiter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,qBAAa,UAAU;IAIT,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHhC,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsC;gBAEjC,GAAG,EAAE,MAAM;IAMxC,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,oEAAoE;IAC9D,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC;IA0BvD,OAAO,CAAC,QAAQ;CAajB"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Caps how many runs execute at once; the rest wait in arrival order.
|
|
3
|
+
*
|
|
4
|
+
* A waiting run leaves the queue when its signal aborts, so a run timeout or a
|
|
5
|
+
* caller's abort also covers the time spent waiting for a slot.
|
|
6
|
+
*/
|
|
7
|
+
export class RunLimiter {
|
|
8
|
+
max;
|
|
9
|
+
active = 0;
|
|
10
|
+
waiting = [];
|
|
11
|
+
constructor(max) {
|
|
12
|
+
this.max = max;
|
|
13
|
+
if (!Number.isInteger(max) || max < 1) {
|
|
14
|
+
throw new Error(`limits.maxConcurrentRuns must be a positive integer, got ${max}`);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
get running() {
|
|
18
|
+
return this.active;
|
|
19
|
+
}
|
|
20
|
+
get queued() {
|
|
21
|
+
return this.waiting.length;
|
|
22
|
+
}
|
|
23
|
+
/** Waits for a free slot and returns the function that frees it. */
|
|
24
|
+
async acquire(signal) {
|
|
25
|
+
signal.throwIfAborted();
|
|
26
|
+
if (this.active < this.max) {
|
|
27
|
+
this.active++;
|
|
28
|
+
return this.releaser();
|
|
29
|
+
}
|
|
30
|
+
await new Promise((resolve, reject) => {
|
|
31
|
+
const entry = {
|
|
32
|
+
resolve: () => {
|
|
33
|
+
signal.removeEventListener('abort', onAbort);
|
|
34
|
+
resolve();
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
const onAbort = () => {
|
|
38
|
+
const index = this.waiting.indexOf(entry);
|
|
39
|
+
if (index !== -1)
|
|
40
|
+
this.waiting.splice(index, 1);
|
|
41
|
+
reject(signal.reason instanceof Error ? signal.reason : new Error('Run aborted'));
|
|
42
|
+
};
|
|
43
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
44
|
+
this.waiting.push(entry);
|
|
45
|
+
});
|
|
46
|
+
return this.releaser();
|
|
47
|
+
}
|
|
48
|
+
releaser() {
|
|
49
|
+
let released = false;
|
|
50
|
+
return () => {
|
|
51
|
+
if (released)
|
|
52
|
+
return;
|
|
53
|
+
released = true;
|
|
54
|
+
const next = this.waiting.shift();
|
|
55
|
+
if (next) {
|
|
56
|
+
next.resolve();
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
this.active--;
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=run-limiter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-limiter.js","sourceRoot":"","sources":["../../src/cogitator/run-limiter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,OAAO,UAAU;IAIQ;IAHrB,MAAM,GAAG,CAAC,CAAC;IACF,OAAO,GAAmC,EAAE,CAAC;IAE9D,YAA6B,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;QACtC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,4DAA4D,GAAG,EAAE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,oEAAoE;IACpE,KAAK,CAAC,OAAO,CAAC,MAAmB;QAC/B,MAAM,CAAC,cAAc,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC;QAED,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG;gBACZ,OAAO,EAAE,GAAG,EAAE;oBACZ,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBAC7C,OAAO,EAAE,CAAC;gBACZ,CAAC;aACF,CAAC;YACF,MAAM,OAAO,GAAG,GAAG,EAAE;gBACnB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,CAAC,CAAC;oBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAChD,MAAM,CAAC,MAAM,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YACpF,CAAC,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;IACzB,CAAC;IAEO,QAAQ;QACd,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,OAAO,GAAG,EAAE;YACV,IAAI,QAAQ;gBAAE,OAAO;YACrB,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAClC,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { LLMBackend, Message, ToolCall } from '@cogitator-ai/types';
|
|
1
|
+
import type { LLMBackend, LLMResponseFormat, Message, ToolCall } from '@cogitator-ai/types';
|
|
2
2
|
import { ToolRegistry } from '../registry.js';
|
|
3
3
|
import type { Agent } from '../agent.js';
|
|
4
4
|
export interface StreamChatResult {
|
|
@@ -12,5 +12,5 @@ export interface StreamChatResult {
|
|
|
12
12
|
totalTokens: number;
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
-
export declare function streamChat(backend: LLMBackend, model: string, messages: Message[], registry: ToolRegistry, agent: Agent, onToken: (token: string) => void, signal?: AbortSignal): Promise<StreamChatResult>;
|
|
15
|
+
export declare function streamChat(backend: LLMBackend, model: string, messages: Message[], registry: ToolRegistry, agent: Agent, onToken: (token: string) => void, signal?: AbortSignal, responseFormat?: LLMResponseFormat): Promise<StreamChatResult>;
|
|
16
16
|
//# sourceMappingURL=streaming.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../../src/cogitator/streaming.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"streaming.d.ts","sourceRoot":"","sources":["../../src/cogitator/streaming.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,OAAO,CAAC;IACzD,KAAK,EAAE;QACL,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,wBAAsB,UAAU,CAC9B,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,OAAO,EAAE,EACnB,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,EAChC,MAAM,CAAC,EAAE,WAAW,EACpB,cAAc,CAAC,EAAE,iBAAiB,GACjC,OAAO,CAAC,gBAAgB,CAAC,CA8F3B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { nanoid } from 'nanoid';
|
|
2
2
|
import { countMessagesTokens } from '@cogitator-ai/memory';
|
|
3
|
-
export async function streamChat(backend, model, messages, registry, agent, onToken, signal) {
|
|
3
|
+
export async function streamChat(backend, model, messages, registry, agent, onToken, signal, responseFormat) {
|
|
4
4
|
throwIfStreamAborted(signal);
|
|
5
5
|
let content = '';
|
|
6
6
|
let toolCalls;
|
|
@@ -16,6 +16,7 @@ export async function streamChat(backend, model, messages, registry, agent, onTo
|
|
|
16
16
|
topP: agent.config.topP,
|
|
17
17
|
maxTokens: agent.config.maxTokens,
|
|
18
18
|
stop: agent.config.stopSequences,
|
|
19
|
+
responseFormat,
|
|
19
20
|
signal,
|
|
20
21
|
});
|
|
21
22
|
for await (const chunk of stream) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../src/cogitator/streaming.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAgB3D,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAmB,EACnB,KAAa,EACb,QAAmB,EACnB,QAAsB,EACtB,KAAY,EACZ,OAAgC,EAChC,MAAoB;
|
|
1
|
+
{"version":3,"file":"streaming.js","sourceRoot":"","sources":["../../src/cogitator/streaming.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { MemoryAdapter, Thread } from '@cogitator-ai/types';
|
|
2
|
+
/** The user a thread belongs to: the `userId` of the run that created it. */
|
|
3
|
+
export declare function threadOwner(thread: Thread): string | undefined;
|
|
4
|
+
/**
|
|
5
|
+
* Checks that `userId` may use thread `threadId`, for code that takes thread
|
|
6
|
+
* ids from clients: a thread is open only to its owner, and one without an
|
|
7
|
+
* owner only to callers without a user.
|
|
8
|
+
*
|
|
9
|
+
* Returns the thread, or `null` when it does not exist yet. Throws
|
|
10
|
+
* `THREAD_ACCESS_DENIED` for another user's thread, and `MEMORY_READ_FAILED`
|
|
11
|
+
* when the thread cannot be read, since its owner is then unknown.
|
|
12
|
+
*/
|
|
13
|
+
export declare function assertThreadAccess(memory: MemoryAdapter, threadId: string, userId: string | undefined): Promise<Thread | null>;
|
|
14
|
+
/**
|
|
15
|
+
* Thread `threadId` for `userId`, checked as in `assertThreadAccess`, and
|
|
16
|
+
* created for them when it does not exist yet.
|
|
17
|
+
*/
|
|
18
|
+
export declare function ensureThreadAccess(memory: MemoryAdapter, threadId: string, owner: {
|
|
19
|
+
agentId: string;
|
|
20
|
+
userId?: string;
|
|
21
|
+
}): Promise<Thread>;
|
|
22
|
+
/** Metadata of a new thread: the agent it is for and the user who owns it. */
|
|
23
|
+
export declare function threadMetadata(owner: {
|
|
24
|
+
agentId: string;
|
|
25
|
+
userId?: string;
|
|
26
|
+
}): Record<string, unknown>;
|
|
27
|
+
//# sourceMappingURL=threads.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"threads.d.ts","sourceRoot":"","sources":["../../src/cogitator/threads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGjE,6EAA6E;AAC7E,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG9D;AAED;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgBxB;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1C,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED,8EAA8E;AAC9E,wBAAgB,cAAc,CAAC,KAAK,EAAE;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE1B"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { CogitatorError, ErrorCode } from '@cogitator-ai/types';
|
|
2
|
+
/** The user a thread belongs to: the `userId` of the run that created it. */
|
|
3
|
+
export function threadOwner(thread) {
|
|
4
|
+
const owner = thread.metadata?.userId;
|
|
5
|
+
return typeof owner === 'string' ? owner : undefined;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Checks that `userId` may use thread `threadId`, for code that takes thread
|
|
9
|
+
* ids from clients: a thread is open only to its owner, and one without an
|
|
10
|
+
* owner only to callers without a user.
|
|
11
|
+
*
|
|
12
|
+
* Returns the thread, or `null` when it does not exist yet. Throws
|
|
13
|
+
* `THREAD_ACCESS_DENIED` for another user's thread, and `MEMORY_READ_FAILED`
|
|
14
|
+
* when the thread cannot be read, since its owner is then unknown.
|
|
15
|
+
*/
|
|
16
|
+
export async function assertThreadAccess(memory, threadId, userId) {
|
|
17
|
+
const result = await memory.getThread(threadId);
|
|
18
|
+
if (!result.success) {
|
|
19
|
+
throw new CogitatorError({
|
|
20
|
+
message: `Thread ${threadId} could not be read: ${result.error}`,
|
|
21
|
+
code: ErrorCode.MEMORY_READ_FAILED,
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
const thread = result.data;
|
|
25
|
+
if (thread && threadOwner(thread) !== userId) {
|
|
26
|
+
throw new CogitatorError({
|
|
27
|
+
message: `Thread ${threadId} belongs to another user`,
|
|
28
|
+
code: ErrorCode.THREAD_ACCESS_DENIED,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
return thread;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Thread `threadId` for `userId`, checked as in `assertThreadAccess`, and
|
|
35
|
+
* created for them when it does not exist yet.
|
|
36
|
+
*/
|
|
37
|
+
export async function ensureThreadAccess(memory, threadId, owner) {
|
|
38
|
+
const existing = await assertThreadAccess(memory, threadId, owner.userId);
|
|
39
|
+
if (existing)
|
|
40
|
+
return existing;
|
|
41
|
+
const created = await memory.createThread(owner.agentId, threadMetadata(owner), threadId);
|
|
42
|
+
if (!created.success) {
|
|
43
|
+
throw new CogitatorError({
|
|
44
|
+
message: `Thread ${threadId} could not be created: ${created.error}`,
|
|
45
|
+
code: ErrorCode.MEMORY_WRITE_FAILED,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
return created.data;
|
|
49
|
+
}
|
|
50
|
+
/** Metadata of a new thread: the agent it is for and the user who owns it. */
|
|
51
|
+
export function threadMetadata(owner) {
|
|
52
|
+
return { agentId: owner.agentId, ...(owner.userId !== undefined && { userId: owner.userId }) };
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=threads.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"threads.js","sourceRoot":"","sources":["../../src/cogitator/threads.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhE,6EAA6E;AAC7E,MAAM,UAAU,WAAW,CAAC,MAAc;IACxC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC;IACtC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACvD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAqB,EACrB,QAAgB,EAChB,MAA0B;IAE1B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,cAAc,CAAC;YACvB,OAAO,EAAE,UAAU,QAAQ,uBAAuB,MAAM,CAAC,KAAK,EAAE;YAChE,IAAI,EAAE,SAAS,CAAC,kBAAkB;SACnC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IAC3B,IAAI,MAAM,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,CAAC;QAC7C,MAAM,IAAI,cAAc,CAAC;YACvB,OAAO,EAAE,UAAU,QAAQ,0BAA0B;YACrD,IAAI,EAAE,SAAS,CAAC,oBAAoB;SACrC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAqB,EACrB,QAAgB,EAChB,KAA2C;IAE3C,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1E,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC1F,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,cAAc,CAAC;YACvB,OAAO,EAAE,UAAU,QAAQ,0BAA0B,OAAO,CAAC,KAAK,EAAE;YACpE,IAAI,EAAE,SAAS,CAAC,mBAAmB;SACpC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC,IAAI,CAAC;AACtB,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,cAAc,CAAC,KAG9B;IACC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;AACjG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-executor.d.ts","sourceRoot":"","sources":["../../src/cogitator/tool-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,QAAQ,EAAE,UAAU,EAAe,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,EAC9C,eAAe,EAAE,OAAO,EACxB,iBAAiB,EAAE,MAAM,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,EAC5D,MAAM,CAAC,EAAE,WAAW,EACpB,YAAY,CAAC,EAAE,gBAAgB,GAC9B,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"tool-executor.d.ts","sourceRoot":"","sources":["../../src/cogitator/tool-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,QAAQ,EAAE,UAAU,EAAe,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,gBAAgB,EAAE,gBAAgB,GAAG,SAAS,EAC9C,eAAe,EAAE,OAAO,EACxB,iBAAiB,EAAE,MAAM,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,EAC5D,MAAM,CAAC,EAAE,WAAW,EACpB,YAAY,CAAC,EAAE,gBAAgB,GAC9B,OAAO,CAAC,UAAU,CAAC,CA4ErB;AA4KD,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAUjF"}
|
|
@@ -41,10 +41,24 @@ export async function executeTool(registry, toolCall, runId, agentId, sandboxMan
|
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
const result = tool.sandbox?.type === 'docker' || tool.sandbox?.type === 'wasm'
|
|
45
|
+
? await executeInSandbox(tool, { ...toolCall, arguments: validatedArgs }, runId, agentId, sandboxManager, initializeSandbox, signal, extraContext)
|
|
46
|
+
: await executeNatively(tool, toolCall, validatedArgs, runId, agentId, signal, extraContext);
|
|
47
|
+
if (!constitutionalAI || result.error)
|
|
48
|
+
return result;
|
|
49
|
+
const filtered = await constitutionalAI.filterToolResult(tool.name, toolResultText(result.result));
|
|
50
|
+
if (filtered.allowed)
|
|
51
|
+
return result;
|
|
52
|
+
return {
|
|
53
|
+
...result,
|
|
54
|
+
result: null,
|
|
55
|
+
error: `Tool result blocked: ${filtered.blockedReason ?? 'Policy violation'}`,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
function toolResultText(value) {
|
|
59
|
+
if (typeof value === 'string')
|
|
60
|
+
return value;
|
|
61
|
+
return JSON.stringify(value) ?? String(value);
|
|
48
62
|
}
|
|
49
63
|
async function executeNatively(tool, toolCall, args, runId, agentId, signal, extraContext) {
|
|
50
64
|
const timeoutMs = tool.timeout && tool.timeout > 0 ? tool.timeout : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-executor.js","sourceRoot":"","sources":["../../src/cogitator/tool-executor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAS7D,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,QAAsB,EACtB,QAAkB,EAClB,KAAa,EACb,OAAe,EACf,cAA0C,EAC1C,gBAA8C,EAC9C,eAAwB,EACxB,iBAA4D,EAC5D,MAAoB,EACpB,YAA+B;IAE/B,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,MAAM,EAAE,QAAQ,CAAC,EAAE;YACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,mBAAmB,QAAQ,CAAC,IAAI,EAAE;SAC1C,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,KAAK,UAAU,CAAC;IAC9D,IAAI,aAAa,GAAY,QAAQ,CAAC,SAAS,CAAC;IAEhD,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAClE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO;gBACL,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,sBAAsB,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE;aACzD,CAAC;QACJ,CAAC;QACD,aAAa,GAAG,WAAW,CAAC,IAAI,CAAC;IACnC,CAAC;IAED,IAAI,gBAAgB,IAAI,eAAe,EAAE,CAAC;QACxC,MAAM,OAAO,GAAgB;YAC3B,OAAO;YACP,KAAK;YACL,MAAM,EAAE,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC,MAAM;YAC9C,GAAG,YAAY;SAChB,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,SAAS,CAClD,IAAI,EACJ,aAAwC,EACxC,OAAO,CACR,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC1B,OAAO;gBACL,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,iBAAiB,WAAW,CAAC,MAAM,IAAI,kBAAkB,EAAE;aACnE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"tool-executor.js","sourceRoot":"","sources":["../../src/cogitator/tool-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,11 @@ export declare class ConstitutionalAI {
|
|
|
18
18
|
get constitution(): Constitution;
|
|
19
19
|
filterInput(input: string, context?: string): Promise<FilterResult>;
|
|
20
20
|
filterOutput(output: string, context: Message[]): Promise<FilterResult>;
|
|
21
|
+
/**
|
|
22
|
+
* Checks what a tool returned before the model reads it, with the input
|
|
23
|
+
* filter, when `filterToolResults` is on.
|
|
24
|
+
*/
|
|
25
|
+
filterToolResult(toolName: string, content: string): Promise<FilterResult>;
|
|
21
26
|
guardTool(tool: Tool, args: Record<string, unknown>, context: ToolContext): Promise<ToolGuardResult>;
|
|
22
27
|
critiqueAndRevise(response: string, context: Message[]): Promise<RevisionResult>;
|
|
23
28
|
setConstitution(constitution: Constitution): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constitutional-ai.d.ts","sourceRoot":"","sources":["../../src/constitutional/constitutional-ai.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,uBAAuB,EACvB,YAAY,EACZ,eAAe,EACf,cAAc,EACd,UAAU,EACV,OAAO,EACP,IAAI,EACJ,WAAW,EACX,WAAW,EACZ,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"constitutional-ai.d.ts","sourceRoot":"","sources":["../../src/constitutional/constitutional-ai.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,YAAY,EACZ,uBAAuB,EACvB,YAAY,EACZ,eAAe,EACf,cAAc,EACd,UAAU,EACV,OAAO,EACP,IAAI,EACJ,WAAW,EACX,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAS7B,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,UAAU,CAAC;IAChB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACnC;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,YAAY,CAA4E;IAChG,OAAO,CAAC,MAAM,CAAwD;gBAE1D,OAAO,EAAE,uBAAuB;IAgC5C,IAAI,MAAM,IAAI,eAAe,CAE5B;IAED,IAAI,YAAY,IAAI,YAAY,CAE/B;IAEK,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAUnE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IAkB7E;;;OAGG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAU1E,SAAS,CACb,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,eAAe,CAAC;IAarB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAatF,eAAe,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;IASjD,YAAY,CAAC,SAAS,EAAE,uBAAuB,GAAG,IAAI;IActD,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAQjC,eAAe,IAAI,YAAY;IAI/B,SAAS,IAAI,eAAe;IAI5B,eAAe,IAAI,KAAK,CAAC;QAAE,SAAS,EAAE,IAAI,CAAC;QAAC,KAAK,EAAE,WAAW,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,CAAC;IAIvF,iBAAiB,IAAI,IAAI;IAIzB,OAAO,CAAC,YAAY;CAiBrB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DEFAULT_GUARDRAIL_CONFIG } from '@cogitator-ai/types';
|
|
1
2
|
import { DEFAULT_CONSTITUTION } from './constitution.js';
|
|
2
3
|
import { InputFilter } from './input-filter.js';
|
|
3
4
|
import { OutputFilter } from './output-filter.js';
|
|
@@ -14,29 +15,11 @@ export class ConstitutionalAI {
|
|
|
14
15
|
violationLog = [];
|
|
15
16
|
logger = getLogger().child({ component: 'ConstitutionalAI' });
|
|
16
17
|
constructor(options) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
filterToolCalls: true,
|
|
22
|
-
filterToolResults: false,
|
|
23
|
-
enableCritiqueRevision: true,
|
|
24
|
-
maxRevisionIterations: 3,
|
|
25
|
-
revisionConfidenceThreshold: 0.85,
|
|
26
|
-
thresholds: {
|
|
27
|
-
violence: 'medium',
|
|
28
|
-
hate: 'low',
|
|
29
|
-
sexual: 'medium',
|
|
30
|
-
'self-harm': 'low',
|
|
31
|
-
illegal: 'low',
|
|
32
|
-
privacy: 'medium',
|
|
33
|
-
misinformation: 'high',
|
|
34
|
-
manipulation: 'medium',
|
|
35
|
-
},
|
|
36
|
-
strictMode: false,
|
|
37
|
-
logViolations: true,
|
|
18
|
+
this._config = {
|
|
19
|
+
...DEFAULT_GUARDRAIL_CONFIG,
|
|
20
|
+
...options.config,
|
|
21
|
+
thresholds: { ...DEFAULT_GUARDRAIL_CONFIG.thresholds, ...options.config?.thresholds },
|
|
38
22
|
};
|
|
39
|
-
this._config = { ...defaultConfig, ...options.config };
|
|
40
23
|
this._constitution = options.constitution ?? DEFAULT_CONSTITUTION;
|
|
41
24
|
this.inputFilter = new InputFilter({
|
|
42
25
|
llm: options.llm,
|
|
@@ -77,17 +60,25 @@ export class ConstitutionalAI {
|
|
|
77
60
|
return { allowed: true, harmScores: [] };
|
|
78
61
|
}
|
|
79
62
|
const result = await this.outputFilter.filter(output, context);
|
|
63
|
+
this.logViolation('output', result);
|
|
80
64
|
if (!result.allowed && this._config.enableCritiqueRevision) {
|
|
81
65
|
const revision = await this.critiqueAndRevise(output, context);
|
|
82
66
|
if (revision.revised !== revision.original) {
|
|
83
|
-
return {
|
|
84
|
-
allowed: true,
|
|
85
|
-
harmScores: result.harmScores,
|
|
86
|
-
suggestedRevision: revision.revised,
|
|
87
|
-
};
|
|
67
|
+
return { ...result, suggestedRevision: revision.revised };
|
|
88
68
|
}
|
|
89
69
|
}
|
|
90
|
-
|
|
70
|
+
return result;
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Checks what a tool returned before the model reads it, with the input
|
|
74
|
+
* filter, when `filterToolResults` is on.
|
|
75
|
+
*/
|
|
76
|
+
async filterToolResult(toolName, content) {
|
|
77
|
+
if (!this._config.enabled || !this._config.filterToolResults) {
|
|
78
|
+
return { allowed: true, harmScores: [] };
|
|
79
|
+
}
|
|
80
|
+
const result = await this.inputFilter.filter(content, `Result of the tool "${toolName}"`);
|
|
81
|
+
this.logViolation('tool', result);
|
|
91
82
|
return result;
|
|
92
83
|
}
|
|
93
84
|
async guardTool(tool, args, context) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constitutional-ai.js","sourceRoot":"","sources":["../../src/constitutional/constitutional-ai.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAQtC,MAAM,OAAO,gBAAgB;IACnB,WAAW,CAAc;IACzB,YAAY,CAAe;IAC3B,SAAS,CAAY;IACrB,eAAe,CAAkB;IACjC,OAAO,CAAkB;IACzB,aAAa,CAAe;IAC5B,YAAY,GAAyE,EAAE,CAAC;IACxF,MAAM,GAAG,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAEtE,YAAY,OAAgC;QAC1C,
|
|
1
|
+
{"version":3,"file":"constitutional-ai.js","sourceRoot":"","sources":["../../src/constitutional/constitutional-ai.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import type { Message, LLMBackend, ContextManagerConfig, CompressionResult, ContextState } from '@cogitator-ai/types';
|
|
1
|
+
import type { Message, LLMBackend, ModelRoute, ContextManagerConfig, CompressionResult, ContextState } from '@cogitator-ai/types';
|
|
2
2
|
export interface ContextManagerDeps {
|
|
3
|
+
/** The backend and the model name for a model string; preferred over `getBackend`. */
|
|
4
|
+
route?: (model: string) => ModelRoute;
|
|
3
5
|
getBackend?: (model: string) => LLMBackend;
|
|
4
6
|
}
|
|
5
7
|
export declare class ContextManager {
|
|
@@ -12,5 +14,6 @@ export declare class ContextManager {
|
|
|
12
14
|
checkState(messages: Message[], modelString: string): ContextState;
|
|
13
15
|
shouldCompress(messages: Message[], modelString: string): boolean;
|
|
14
16
|
compress(messages: Message[], modelString: string): Promise<CompressionResult>;
|
|
17
|
+
private resolve;
|
|
15
18
|
}
|
|
16
19
|
//# sourceMappingURL=context-manager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../../src/context/context-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,UAAU,EACV,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAY7B,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC;CAC5C;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../../src/context/context-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,UAAU,EACV,UAAU,EACV,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAY7B,MAAM,WAAW,kBAAkB;IACjC,sFAAsF;IACtF,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC;IACtC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC;CAC5C;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAiC;IAC/C,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,IAAI,CAAqB;gBAErB,MAAM,EAAE,oBAAoB,EAAE,IAAI,GAAE,kBAAuB;IAcvE,OAAO,CAAC,cAAc;IActB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAqCjD,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,YAAY;IAmBlE,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAM3D,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAyCpF,OAAO,CAAC,OAAO;CAOhB"}
|
|
@@ -101,22 +101,15 @@ export class ContextManager {
|
|
|
101
101
|
strategy: this.config.strategy,
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
if (summaryModel && this.deps.getBackend) {
|
|
107
|
-
backend = this.deps.getBackend(summaryModel);
|
|
108
|
-
}
|
|
109
|
-
else if (this.deps.getBackend && this.config.strategy === 'summarize') {
|
|
110
|
-
summaryModel = modelString;
|
|
111
|
-
backend = this.deps.getBackend(modelString);
|
|
112
|
-
}
|
|
104
|
+
const summarySource = this.config.summaryModel || (this.config.strategy === 'summarize' ? modelString : undefined);
|
|
105
|
+
const summary = summarySource ? this.resolve(summarySource) : undefined;
|
|
113
106
|
const ctx = {
|
|
114
107
|
messages,
|
|
115
108
|
targetTokens: state.maxTokens,
|
|
116
109
|
currentTokens: state.currentTokens,
|
|
117
110
|
windowSize: this.config.windowSize,
|
|
118
|
-
backend,
|
|
119
|
-
summaryModel:
|
|
111
|
+
backend: summary?.backend,
|
|
112
|
+
summaryModel: summary?.model,
|
|
120
113
|
};
|
|
121
114
|
const result = await this.strategy.compress(ctx);
|
|
122
115
|
const messagesWithValidToolPairs = sanitizeToolHistory(result.messages);
|
|
@@ -131,5 +124,13 @@ export class ContextManager {
|
|
|
131
124
|
compressedTokens: countMessagesTokens(messagesWithValidToolPairs),
|
|
132
125
|
};
|
|
133
126
|
}
|
|
127
|
+
resolve(modelString) {
|
|
128
|
+
if (this.deps.route)
|
|
129
|
+
return this.deps.route(modelString);
|
|
130
|
+
if (this.deps.getBackend) {
|
|
131
|
+
return { backend: this.deps.getBackend(modelString), model: parseModel(modelString).model };
|
|
132
|
+
}
|
|
133
|
+
return {};
|
|
134
|
+
}
|
|
134
135
|
}
|
|
135
136
|
//# sourceMappingURL=context-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../../src/context/context-manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../../src/context/context-manager.ts"],"names":[],"mappings":"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"}
|