clanka 0.0.5 → 0.0.7
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/dist/OutputFormatter.d.ts +1 -2
- package/dist/OutputFormatter.d.ts.map +1 -1
- package/dist/OutputFormatter.js.map +1 -1
- package/dist/ToolkitRenderer.d.ts.map +1 -1
- package/dist/ToolkitRenderer.js +3 -1
- package/dist/ToolkitRenderer.js.map +1 -1
- package/package.json +1 -1
- package/src/OutputFormatter.ts +4 -5
- package/src/ToolkitRenderer.ts +4 -1
|
@@ -3,12 +3,11 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import { Stream } from "effect";
|
|
5
5
|
import { type Output, AgentFinished } from "./Agent.ts";
|
|
6
|
-
import type { AiError } from "effect/unstable/ai";
|
|
7
6
|
/**
|
|
8
7
|
* @since 1.0.0
|
|
9
8
|
* @category Models
|
|
10
9
|
*/
|
|
11
|
-
export type OutputFormatter
|
|
10
|
+
export type OutputFormatter = <E, R>(stream: Stream.Stream<Output, AgentFinished | E>) => Stream.Stream<string, Exclude<E, AgentFinished>, R>;
|
|
12
11
|
/**
|
|
13
12
|
* @since 1.0.0
|
|
14
13
|
* @category Pretty
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,KAAK,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,KAAK,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAGvD;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,CAAC,KAC7C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAA;AAExD;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,eAsDlB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAe,aAAa,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,KAAK,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolkitRenderer.d.ts","sourceRoot":"","sources":["../src/ToolkitRenderer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAS,KAAK,EAAa,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;;WAWvC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,SACpC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAC5B,MAAM;;AATb;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,oBAOR;IAC3B,MAAM,CAAC,QAAQ,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"ToolkitRenderer.d.ts","sourceRoot":"","sources":["../src/ToolkitRenderer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAS,KAAK,EAAa,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;;WAWvC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,SACpC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAC5B,MAAM;;AATb;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,oBAOR;IAC3B,MAAM,CAAC,QAAQ,CAAC,KAAK,6CAoBnB;CACH"}
|
package/dist/ToolkitRenderer.js
CHANGED
|
@@ -15,8 +15,10 @@ export class ToolkitRenderer extends ServiceMap.Service()("clanka/ToolkitRendere
|
|
|
15
15
|
const output = Array.empty();
|
|
16
16
|
for (const [name, tool] of Object.entries(tools.tools)) {
|
|
17
17
|
const paramName = SchemaAST.resolveIdentifier(tool.parametersSchema.ast) ?? "options";
|
|
18
|
+
const paramType = TypeBuilder.render(tool.parametersSchema);
|
|
19
|
+
const params = paramType === "void" ? "" : `${paramName}: ${paramType}`;
|
|
18
20
|
output.push(`/** ${tool.description} */
|
|
19
|
-
declare function ${name}(${
|
|
21
|
+
declare function ${name}(${params}): Promise<${TypeBuilder.render(tool.successSchema)}>`);
|
|
20
22
|
}
|
|
21
23
|
return output.join("\n\n");
|
|
22
24
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ToolkitRenderer.js","sourceRoot":"","sources":["../src/ToolkitRenderer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEzC;;;GAGG;AACH,MAAM,OAAO,eAAgB,SAAQ,UAAU,CAAC,OAAO,EAOpD,CAAC,wBAAwB,CAAC;IAC3B,MAAM,CAAU,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE;QACrD,MAAM,EAAE,OAAO,CACb,CACE,KAA6B,EAC7B,EAAE;YACF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAU,CAAA;YACpC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvD,MAAM,SAAS,GACb,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,SAAS,CAAA;gBACrE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ToolkitRenderer.js","sourceRoot":"","sources":["../src/ToolkitRenderer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEzC;;;GAGG;AACH,MAAM,OAAO,eAAgB,SAAQ,UAAU,CAAC,OAAO,EAOpD,CAAC,wBAAwB,CAAC;IAC3B,MAAM,CAAU,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE;QACrD,MAAM,EAAE,OAAO,CACb,CACE,KAA6B,EAC7B,EAAE;YACF,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAU,CAAA;YACpC,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvD,MAAM,SAAS,GACb,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,SAAS,CAAA;gBACrE,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBAC3D,MAAM,MAAM,GACV,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,KAAK,SAAS,EAAE,CAAA;gBAC1D,MAAM,CAAC,IAAI,CACT,OAAO,IAAI,CAAC,WAAW;mBAChB,IAAI,IAAI,MAAM,cAAc,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAC7E,CAAA;YACH,CAAC;YACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAC5B,CAAC,CACF;KACF,CAAC,CAAA"}
|
package/package.json
CHANGED
package/src/OutputFormatter.ts
CHANGED
|
@@ -4,15 +4,14 @@
|
|
|
4
4
|
import { Stream } from "effect"
|
|
5
5
|
import { type Output, AgentFinished } from "./Agent.ts"
|
|
6
6
|
import chalk from "chalk"
|
|
7
|
-
import type { AiError } from "effect/unstable/ai"
|
|
8
7
|
|
|
9
8
|
/**
|
|
10
9
|
* @since 1.0.0
|
|
11
10
|
* @category Models
|
|
12
11
|
*/
|
|
13
|
-
export type OutputFormatter
|
|
14
|
-
stream: Stream.Stream<Output, AgentFinished |
|
|
15
|
-
) => Stream.Stream<string,
|
|
12
|
+
export type OutputFormatter = <E, R>(
|
|
13
|
+
stream: Stream.Stream<Output, AgentFinished | E>,
|
|
14
|
+
) => Stream.Stream<string, Exclude<E, AgentFinished>, R>
|
|
16
15
|
|
|
17
16
|
/**
|
|
18
17
|
* @since 1.0.0
|
|
@@ -69,7 +68,7 @@ ${output.summary}\n\n`
|
|
|
69
68
|
}),
|
|
70
69
|
Stream.catchTag("AgentFinished", (finished) =>
|
|
71
70
|
Stream.succeed(
|
|
72
|
-
`\n${chalk.bold.green(`${doneIcon} Task complete:`)}\n\n${finished.summary}`,
|
|
71
|
+
`\n${chalk.bold.green(`${doneIcon} Task complete:`)}\n\n${(finished as AgentFinished).summary}`,
|
|
73
72
|
),
|
|
74
73
|
),
|
|
75
74
|
)
|
package/src/ToolkitRenderer.ts
CHANGED
|
@@ -27,9 +27,12 @@ export class ToolkitRenderer extends ServiceMap.Service<
|
|
|
27
27
|
for (const [name, tool] of Object.entries(tools.tools)) {
|
|
28
28
|
const paramName =
|
|
29
29
|
SchemaAST.resolveIdentifier(tool.parametersSchema.ast) ?? "options"
|
|
30
|
+
const paramType = TypeBuilder.render(tool.parametersSchema)
|
|
31
|
+
const params =
|
|
32
|
+
paramType === "void" ? "" : `${paramName}: ${paramType}`
|
|
30
33
|
output.push(
|
|
31
34
|
`/** ${tool.description} */
|
|
32
|
-
declare function ${name}(${
|
|
35
|
+
declare function ${name}(${params}): Promise<${TypeBuilder.render(tool.successSchema)}>`,
|
|
33
36
|
)
|
|
34
37
|
}
|
|
35
38
|
return output.join("\n\n")
|