clanka 0.0.16 → 0.0.18
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/Agent.js +2 -2
- package/dist/OutputFormatter.d.ts +18 -2
- package/dist/OutputFormatter.d.ts.map +1 -1
- package/dist/OutputFormatter.js +50 -1
- package/dist/OutputFormatter.js.map +1 -1
- package/package.json +1 -1
- package/src/Agent.ts +2 -2
- package/src/OutputFormatter.ts +71 -2
package/dist/Agent.js
CHANGED
|
@@ -331,7 +331,7 @@ const generateSystemMulti = (toolsDts) => {
|
|
|
331
331
|
|
|
332
332
|
- Use \`console.log\` to print any output you need.
|
|
333
333
|
- Top level await is supported.
|
|
334
|
-
-
|
|
334
|
+
- AVOID passing scripts into the "bash" function, and instead write javascript.
|
|
335
335
|
|
|
336
336
|
**When you have fully completed your task**, call the "taskComplete" function with the final output.
|
|
337
337
|
Make sure every detail of the task is done before calling "taskComplete".
|
|
@@ -350,7 +350,7 @@ const generateSystemSingle = (toolsDts) => {
|
|
|
350
350
|
|
|
351
351
|
- Use \`console.log\` to print any output you need.
|
|
352
352
|
- Top level await is supported.
|
|
353
|
-
-
|
|
353
|
+
- AVOID passing scripts into the "bash" function, and instead write javascript.
|
|
354
354
|
|
|
355
355
|
You have the following functions available to you:
|
|
356
356
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import { Stream } from "effect";
|
|
5
|
-
import { type Output, AgentFinished } from "./Agent.ts";
|
|
4
|
+
import { Effect, Layer, ServiceMap, Stream } from "effect";
|
|
5
|
+
import { type Agent, type Output, AgentFinished } from "./Agent.ts";
|
|
6
6
|
/**
|
|
7
7
|
* @since 1.0.0
|
|
8
8
|
* @category Models
|
|
@@ -13,4 +13,20 @@ export type OutputFormatter = <E, R>(stream: Stream.Stream<Output, AgentFinished
|
|
|
13
13
|
* @category Pretty
|
|
14
14
|
*/
|
|
15
15
|
export declare const pretty: OutputFormatter;
|
|
16
|
+
declare const Muxer_base: ServiceMap.ServiceClass<Muxer, "clanka/OutputFormatter/Muxer", {
|
|
17
|
+
add(agent: Agent): Effect.Effect<void>;
|
|
18
|
+
readonly output: Stream.Stream<string>;
|
|
19
|
+
}>;
|
|
20
|
+
/**
|
|
21
|
+
* @since 1.0.0
|
|
22
|
+
* @category Muxer
|
|
23
|
+
*/
|
|
24
|
+
export declare class Muxer extends Muxer_base {
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* @since 1.0.0
|
|
28
|
+
* @category Muxer
|
|
29
|
+
*/
|
|
30
|
+
export declare const layerMuxer: (formatter: OutputFormatter) => Layer.Layer<Muxer, never, never>;
|
|
31
|
+
export {};
|
|
16
32
|
//# sourceMappingURL=OutputFormatter.d.ts.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAqB,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7E,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAGnE;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,KAChD,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;;eAkBY,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;qBACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;;AAR1C;;;GAGG;AACH,qBAAa,KAAM,SAAQ,UAMQ;CAAG;AAEtC;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,WAAW,eAAe,qCAmDlD,CAAA"}
|
package/dist/OutputFormatter.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import { Stream } from "effect";
|
|
4
|
+
import { Effect, Layer, PubSub, Semaphore, ServiceMap, Stream } from "effect";
|
|
5
5
|
import { AgentFinished } from "./Agent.js";
|
|
6
6
|
import chalk from "chalk";
|
|
7
7
|
/**
|
|
@@ -59,4 +59,53 @@ const scriptIcon = "\u{f0bc1}";
|
|
|
59
59
|
const subagentIcon = "\u{ee0d} ";
|
|
60
60
|
const thinkingIcon = "\u{f07f6}";
|
|
61
61
|
const doneIcon = "\u{eab2}";
|
|
62
|
+
/**
|
|
63
|
+
* @since 1.0.0
|
|
64
|
+
* @category Muxer
|
|
65
|
+
*/
|
|
66
|
+
export class Muxer extends ServiceMap.Service()("clanka/OutputFormatter/Muxer") {
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* @since 1.0.0
|
|
70
|
+
* @category Muxer
|
|
71
|
+
*/
|
|
72
|
+
export const layerMuxer = (formatter) => Layer.effect(Muxer, Effect.gen(function* () {
|
|
73
|
+
const scope = yield* Effect.scope;
|
|
74
|
+
const output = yield* PubSub.unbounded();
|
|
75
|
+
let agentCount = 0;
|
|
76
|
+
let currentAgentId = null;
|
|
77
|
+
const semaphore = Semaphore.makeUnsafe(1);
|
|
78
|
+
return Muxer.of({
|
|
79
|
+
add(agent) {
|
|
80
|
+
const id = ++agentCount;
|
|
81
|
+
return agent.output.pipe(Stream.tap(Effect.fnUntraced(function* (part_) {
|
|
82
|
+
if (currentAgentId === null || id !== currentAgentId) {
|
|
83
|
+
yield* semaphore.take(1);
|
|
84
|
+
}
|
|
85
|
+
const part = part_._tag === "SubagentPart" ? part_.part : part_;
|
|
86
|
+
switch (part._tag) {
|
|
87
|
+
case "ReasoningStart":
|
|
88
|
+
case "ScriptStart": {
|
|
89
|
+
currentAgentId = id;
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
case "ReasoningEnd":
|
|
93
|
+
case "ScriptEnd": {
|
|
94
|
+
currentAgentId = null;
|
|
95
|
+
break;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (id !== currentAgentId) {
|
|
99
|
+
yield* semaphore.release(1);
|
|
100
|
+
}
|
|
101
|
+
})), formatter, Stream.runIntoPubSub(output), Effect.onExit(() => {
|
|
102
|
+
if (currentAgentId !== id)
|
|
103
|
+
return Effect.void;
|
|
104
|
+
currentAgentId = null;
|
|
105
|
+
return semaphore.release(1);
|
|
106
|
+
}), Effect.forkIn(scope), Effect.asVoid);
|
|
107
|
+
},
|
|
108
|
+
output: Stream.fromPubSub(output),
|
|
109
|
+
});
|
|
110
|
+
}));
|
|
62
111
|
//# sourceMappingURL=OutputFormatter.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7E,OAAO,EAA2B,aAAa,EAAE,MAAM,YAAY,CAAA;AACnE,OAAO,KAAK,MAAM,OAAO,CAAA;AAUzB;;;GAGG;AACH,MAAM,CAAC,MAAM,MAAM,GAAoB,CAAC,MAAM,EAAE,EAAE,CAChD,MAAM,CAAC,IAAI,CACT,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;IACpB,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,MAAM,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QACnC,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,GAAG,CAAA;QACvD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAA;IACtB,CAAC;IACD,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,OAAO,GAAG,oBAAoB,CAAC,GAAG,YAAY,cAAc,MAAM,CAAC,EAAE,cAAc,MAAM,CAAC,gBAAgB,GAAG,CAAC;;EAEtH,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAA;QACxB,CAAC;QACD,KAAK,kBAAkB,CAAC,CAAC,CAAC;YACxB,OAAO,GAAG,oBAAoB,CAAC,GAAG,YAAY,cAAc,MAAM,CAAC,EAAE,WAAW,CAAC;;EAEzF,MAAM,CAAC,OAAO,MAAM,CAAA;QACd,CAAC;QACD,KAAK,gBAAgB,CAAC,CAAC,CAAC;YACtB,OAAO,CACL,MAAM,GAAG,qBAAqB,CAAC,GAAG,YAAY,YAAY,CAAC,GAAG,GAAG,CAClE,CAAA;QACH,CAAC;QACD,KAAK,gBAAgB,CAAC,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,KAAK,CAAA;QACrB,CAAC;QACD,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,OAAO,MAAM,CAAA;QACf,CAAC;QACD,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,OAAO,GAAG,MAAM,GAAG,kBAAkB,CAAC,GAAG,UAAU,mBAAmB,CAAC,MAAM,CAAA;QAC/E,CAAC;QACD,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,OAAO,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAChC,CAAC;QACD,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,OAAO,MAAM,CAAA;QACf,CAAC;QACD,KAAK,cAAc,CAAC,CAAC,CAAC;YACpB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACvC,MAAM,SAAS,GACb,KAAK,CAAC,MAAM,GAAG,EAAE;gBACf,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,mBAAmB;gBACrD,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;YACnB,OAAO,GAAG,MAAM,GAAG,kBAAkB,CAAC,GAAG,UAAU,gBAAgB,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAA;QACvG,CAAC;IACH,CAAC;AACH,CAAC,CAAC,EACF,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,EAAE,CAC5C,MAAM,CAAC,OAAO,CACZ,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,QAAQ,iBAAiB,CAAC,OAAQ,QAA0B,CAAC,OAAO,EAAE,CAChG,CACF,CACF,CAAA;AAEH,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAA;AAC1C,MAAM,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAA;AAC/C,MAAM,qBAAqB,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAA;AAE/C,MAAM,UAAU,GAAG,WAAW,CAAA;AAC9B,MAAM,YAAY,GAAG,WAAW,CAAA;AAChC,MAAM,YAAY,GAAG,WAAW,CAAA;AAChC,MAAM,QAAQ,GAAG,UAAU,CAAA;AAE3B;;;GAGG;AACH,MAAM,OAAO,KAAM,SAAQ,UAAU,CAAC,OAAO,EAM1C,CAAC,8BAA8B,CAAC;CAAG;AAEtC;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,SAA0B,EAAE,EAAE,CACvD,KAAK,CAAC,MAAM,CACV,KAAK,EACL,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;IACjC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,EAAU,CAAA;IAChD,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,IAAI,cAAc,GAAkB,IAAI,CAAA;IACxC,MAAM,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IAEzC,OAAO,KAAK,CAAC,EAAE,CAAC;QACd,GAAG,CAAC,KAAK;YACP,MAAM,EAAE,GAAG,EAAE,UAAU,CAAA;YACvB,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CACtB,MAAM,CAAC,GAAG,CACR,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAK;gBAChC,IAAI,cAAc,KAAK,IAAI,IAAI,EAAE,KAAK,cAAc,EAAE,CAAC;oBACrD,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBAC1B,CAAC;gBACD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAA;gBAC/D,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;oBAClB,KAAK,gBAAgB,CAAC;oBACtB,KAAK,aAAa,CAAC,CAAC,CAAC;wBACnB,cAAc,GAAG,EAAE,CAAA;wBACnB,MAAK;oBACP,CAAC;oBACD,KAAK,cAAc,CAAC;oBACpB,KAAK,WAAW,CAAC,CAAC,CAAC;wBACjB,cAAc,GAAG,IAAI,CAAA;wBACrB,MAAK;oBACP,CAAC;gBACH,CAAC;gBACD,IAAI,EAAE,KAAK,cAAc,EAAE,CAAC;oBAC1B,KAAK,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;gBAC7B,CAAC;YACH,CAAC,CAAC,CACH,EACD,SAAS,EACT,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAC5B,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;gBACjB,IAAI,cAAc,KAAK,EAAE;oBAAE,OAAO,MAAM,CAAC,IAAI,CAAA;gBAC7C,cAAc,GAAG,IAAI,CAAA;gBACrB,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YAC7B,CAAC,CAAC,EACF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EACpB,MAAM,CAAC,MAAM,CACd,CAAA;QACH,CAAC;QACD,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;KAClC,CAAC,CAAA;AACJ,CAAC,CAAC,CACH,CAAA"}
|
package/package.json
CHANGED
package/src/Agent.ts
CHANGED
|
@@ -543,7 +543,7 @@ const generateSystemMulti = (toolsDts: string) => {
|
|
|
543
543
|
|
|
544
544
|
- Use \`console.log\` to print any output you need.
|
|
545
545
|
- Top level await is supported.
|
|
546
|
-
-
|
|
546
|
+
- AVOID passing scripts into the "bash" function, and instead write javascript.
|
|
547
547
|
|
|
548
548
|
**When you have fully completed your task**, call the "taskComplete" function with the final output.
|
|
549
549
|
Make sure every detail of the task is done before calling "taskComplete".
|
|
@@ -563,7 +563,7 @@ const generateSystemSingle = (toolsDts: string) => {
|
|
|
563
563
|
|
|
564
564
|
- Use \`console.log\` to print any output you need.
|
|
565
565
|
- Top level await is supported.
|
|
566
|
-
-
|
|
566
|
+
- AVOID passing scripts into the "bash" function, and instead write javascript.
|
|
567
567
|
|
|
568
568
|
You have the following functions available to you:
|
|
569
569
|
|
package/src/OutputFormatter.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @since 1.0.0
|
|
3
3
|
*/
|
|
4
|
-
import { Stream } from "effect"
|
|
5
|
-
import { type Output, AgentFinished } from "./Agent.ts"
|
|
4
|
+
import { Effect, Layer, PubSub, Semaphore, ServiceMap, Stream } from "effect"
|
|
5
|
+
import { type Agent, type Output, AgentFinished } from "./Agent.ts"
|
|
6
6
|
import chalk from "chalk"
|
|
7
7
|
|
|
8
8
|
/**
|
|
@@ -81,3 +81,72 @@ const scriptIcon = "\u{f0bc1}"
|
|
|
81
81
|
const subagentIcon = "\u{ee0d} "
|
|
82
82
|
const thinkingIcon = "\u{f07f6}"
|
|
83
83
|
const doneIcon = "\u{eab2}"
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* @since 1.0.0
|
|
87
|
+
* @category Muxer
|
|
88
|
+
*/
|
|
89
|
+
export class Muxer extends ServiceMap.Service<
|
|
90
|
+
Muxer,
|
|
91
|
+
{
|
|
92
|
+
add(agent: Agent): Effect.Effect<void>
|
|
93
|
+
readonly output: Stream.Stream<string>
|
|
94
|
+
}
|
|
95
|
+
>()("clanka/OutputFormatter/Muxer") {}
|
|
96
|
+
|
|
97
|
+
/**
|
|
98
|
+
* @since 1.0.0
|
|
99
|
+
* @category Muxer
|
|
100
|
+
*/
|
|
101
|
+
export const layerMuxer = (formatter: OutputFormatter) =>
|
|
102
|
+
Layer.effect(
|
|
103
|
+
Muxer,
|
|
104
|
+
Effect.gen(function* () {
|
|
105
|
+
const scope = yield* Effect.scope
|
|
106
|
+
const output = yield* PubSub.unbounded<string>()
|
|
107
|
+
let agentCount = 0
|
|
108
|
+
let currentAgentId: number | null = null
|
|
109
|
+
const semaphore = Semaphore.makeUnsafe(1)
|
|
110
|
+
|
|
111
|
+
return Muxer.of({
|
|
112
|
+
add(agent) {
|
|
113
|
+
const id = ++agentCount
|
|
114
|
+
return agent.output.pipe(
|
|
115
|
+
Stream.tap(
|
|
116
|
+
Effect.fnUntraced(function* (part_) {
|
|
117
|
+
if (currentAgentId === null || id !== currentAgentId) {
|
|
118
|
+
yield* semaphore.take(1)
|
|
119
|
+
}
|
|
120
|
+
const part = part_._tag === "SubagentPart" ? part_.part : part_
|
|
121
|
+
switch (part._tag) {
|
|
122
|
+
case "ReasoningStart":
|
|
123
|
+
case "ScriptStart": {
|
|
124
|
+
currentAgentId = id
|
|
125
|
+
break
|
|
126
|
+
}
|
|
127
|
+
case "ReasoningEnd":
|
|
128
|
+
case "ScriptEnd": {
|
|
129
|
+
currentAgentId = null
|
|
130
|
+
break
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (id !== currentAgentId) {
|
|
134
|
+
yield* semaphore.release(1)
|
|
135
|
+
}
|
|
136
|
+
}),
|
|
137
|
+
),
|
|
138
|
+
formatter,
|
|
139
|
+
Stream.runIntoPubSub(output),
|
|
140
|
+
Effect.onExit(() => {
|
|
141
|
+
if (currentAgentId !== id) return Effect.void
|
|
142
|
+
currentAgentId = null
|
|
143
|
+
return semaphore.release(1)
|
|
144
|
+
}),
|
|
145
|
+
Effect.forkIn(scope),
|
|
146
|
+
Effect.asVoid,
|
|
147
|
+
)
|
|
148
|
+
},
|
|
149
|
+
output: Stream.fromPubSub(output),
|
|
150
|
+
})
|
|
151
|
+
}),
|
|
152
|
+
)
|