clanka 0.0.3 → 0.0.4

package/src/OutputFormatter.ts

@@ -1,101 +1,77 @@
 /**
  * @since 1.0.0
  */
-import { Effect, Sink, Stream } from "effect"
-import type { Output } from "./Agent.ts"
+import { Stream } from "effect"
+import { type Output, AgentFinished } from "./Agent.ts"
 import chalk from "chalk"
 
 /**
  * @since 1.0.0
  * @category Models
  */
-export type OutputFormatter<E = never, R = never> = Sink.Sink<
-  void,
-  Output,
-  never,
-  E,
-  R
->
+export type OutputFormatter<E = never, R = never> = (
+  stream: Stream.Stream<Output, AgentFinished>,
+) => Stream.Stream<string, E, R>
 
-const prettyPrefixed = (prefix: string): OutputFormatter =>
-  Sink.suspend(() => {
-    let hadReasoningDelta = false
-    return Sink.forEach((output) => {
+/**
+ * @since 1.0.0
+ * @category Pretty
+ */
+export const pretty: OutputFormatter = (stream) =>
+  stream.pipe(
+    Stream.map((output) => {
+      let prefix = ""
+      if (output._tag === "SubagentPart") {
+        prefix = chalk.magenta(`Subagent #${output.id}:`) + " "
+        output = output.part
+      }
       switch (output._tag) {
-        case "SubagentPart": {
-          console.log(
-            chalkSubagentHeading(
-              `${subagentIcon} Subagent #${output.id} starting (${output.modelAndProvider})`,
-            ),
-          )
-          console.log("")
-          console.log(chalk.dim(output.prompt))
-          console.log("")
-          const prefix = chalk.magenta(`Subagent #${output.id}:`) + " "
-          return output.output.pipe(
-            Stream.run(prettyPrefixed(prefix)),
-            Effect.catch((finished) => {
-              console.log(
-                chalkSubagentHeading(
-                  `${subagentIcon} Subagent #${output.id} complete`,
-                ),
-              )
-              console.log("")
-              console.log(finished.summary)
-              console.log("")
-              return Effect.void
-            }),
-            Effect.forkChild,
+        case "SubagentStart": {
+          return `${chalkSubagentHeading(`${subagentIcon} Subagent #${output.id} starting (${output.modelAndProvider})`)}
+
+${chalk.dim(output.prompt)}\n\n`
+        }
+        case "SubagentComplete": {
+          return `${chalkSubagentHeading(`${subagentIcon} Subagent #${output.id} complete`)}
+
+${output.summary}\n\n`
+        }
+        case "ReasoningStart": {
+          return (
+            prefix + chalkReasoningHeading(`${thinkingIcon} Thinking:`) + " "
           )
         }
         case "ReasoningDelta": {
-          process.stdout.write(output.delta)
-          hadReasoningDelta = true
-          break
+          return output.delta
         }
         case "ReasoningEnd": {
-          if (hadReasoningDelta) {
-            console.log("\n")
-            hadReasoningDelta = false
-          }
-          break
+          return "\n\n"
         }
         case "ScriptStart": {
-          console.log(
-            prefix + chalkScriptHeading(`${scriptIcon} Executing script`),
-          )
-          console.log("")
-          console.log(chalk.dim(output.script))
-          console.log("")
-          break
+          return `${prefix}${chalkScriptHeading(`${scriptIcon} Executing script`)}\n\n${chalk.dim(output.script)}\n\n`
         }
         case "ScriptEnd": {
-          console.log(
-            prefix + chalkScriptHeading(`${scriptIcon} Script output`),
-          )
-          console.log("")
           const lines = output.output.split("\n")
           const truncated =
             lines.length > 20
               ? lines.slice(0, 20).join("\n") + "\n... (truncated)"
               : output.output
-          console.log(chalk.dim(truncated))
-          console.log(chalk.reset(""))
-          break
+          return `${prefix}${chalkScriptHeading(`${scriptIcon} Script output`)}\n\n${chalk.dim(truncated)}\n\n`
         }
       }
-      return Effect.void
-    })
-  })
-
-/**
- * @since 1.0.0
- * @category Pretty
- */
-export const pretty: OutputFormatter = prettyPrefixed("")
+    }),
+    Stream.catch((finished) =>
+      Stream.succeed(
+        `\n${chalk.bold.green(`${doneIcon} Task complete:`)}\n\n${finished.summary}`,
+      ),
+    ),
+  )
 
 const chalkScriptHeading = chalk.bold.blue
 const chalkSubagentHeading = chalk.bold.magenta
+const chalkReasoningHeading = chalk.bold.yellow
 
 const scriptIcon = "\u{f0bc1}"
 const subagentIcon = "\u{ee0d} "
+const thinkingIcon = "\u{f07f6}"
+const doneIcon = "\u{eab2}"