clanka 0.0.2 → 0.0.4

package/dist/OutputFormatter.d.ts

@@ -1,13 +1,13 @@
 /**
  * @since 1.0.0
  */
-import { Sink } from "effect";
-import type { Output } from "./Agent.ts";
+import { Stream } from "effect";
+import { type Output, AgentFinished } from "./Agent.ts";
 /**
  * @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>;
 /**
  * @since 1.0.0
  * @category Pretty

package/dist/OutputFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAU,IAAI,EAAU,MAAM,QAAQ,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAGxC;;;GAGG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,IAAI,CAC3D,IAAI,EACJ,MAAM,EACN,KAAK,EACL,CAAC,EACD,CAAC,CACF,CAAA;AAyED;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,eAAoC,CAAA"}
+{"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,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI,CAClD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KACzC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;AAEhC;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,eAgDlB,CAAA"}

package/dist/OutputFormatter.js

@@ -1,67 +1,56 @@
 /**
  * @since 1.0.0
  */
-import { Effect, Sink, Stream } from "effect";
+import { Stream } from "effect";
+import { AgentFinished } from "./Agent.js";
 import chalk from "chalk";
-const prettyPrefixed = (prefix) => Sink.suspend(() => {
-    let hadReasoningDelta = false;
-    return Sink.forEach((output) => {
-        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 "ReasoningDelta": {
-                process.stdout.write(output.delta);
-                hadReasoningDelta = true;
-                break;
-            }
-            case "ReasoningEnd": {
-                if (hadReasoningDelta) {
-                    console.log("\n");
-                    hadReasoningDelta = false;
-                }
-                break;
-            }
-            case "ScriptStart": {
-                console.log(prefix + chalkScriptHeading(`${scriptIcon} Executing script`));
-                console.log("");
-                console.log(chalk.dim(output.script));
-                console.log("");
-                break;
-            }
-            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 Effect.void;
-    });
-});
 /**
  * @since 1.0.0
  * @category Pretty
  */
-export const pretty = prettyPrefixed("");
+export const pretty = (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 "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": {
+            return output.delta;
+        }
+        case "ReasoningEnd": {
+            return "\n\n";
+        }
+        case "ScriptStart": {
+            return `${prefix}${chalkScriptHeading(`${scriptIcon} Executing script`)}\n\n${chalk.dim(output.script)}\n\n`;
+        }
+        case "ScriptEnd": {
+            const lines = output.output.split("\n");
+            const truncated = lines.length > 20
+                ? lines.slice(0, 20).join("\n") + "\n... (truncated)"
+                : output.output;
+            return `${prefix}${chalkScriptHeading(`${scriptIcon} Script output`)}\n\n${chalk.dim(truncated)}\n\n`;
+        }
+    }
+}), 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}";
 //# sourceMappingURL=OutputFormatter.js.map

package/dist/OutputFormatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "clanka",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "publishConfig": {
     "access": "public"
   },
@@ -10,13 +10,6 @@
     "./*": "./dist/*.js",
     "./package.json": "./package.json"
   },
-  "scripts": {
-    "prepare": "husky && effect-language-service patch",
-    "check": "oxlint -c .oxlintrc.json --fix && pnpm tsgo --noEmit",
-    "test": "vitest run",
-    "build": "tsc -b tsconfig.json",
-    "prepublishOnly": "pnpm build"
-  },
   "files": [
     "dist",
     "src"
@@ -28,7 +21,6 @@
     "type": "git",
     "url": "https://github.com/tim-smart/clanka.git"
   },
-  "packageManager": "pnpm@10.28.0+sha512.05df71d1421f21399e053fde567cea34d446fa02c76571441bfc1c7956e98e363088982d940465fd34480d4d90a0668bc12362f8aa88000a64e83d0b0e47be48",
   "dependencies": {
     "@vscode/ripgrep": "^1.17.0",
     "chalk": "^5.6.2",
@@ -65,9 +57,9 @@
       "prettier --write"
     ]
   },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@vscode/ripgrep"
-    ]
+  "scripts": {
+    "check": "oxlint -c .oxlintrc.json --fix && pnpm tsc --noEmit",
+    "test": "vitest run",
+    "build": "tsc -b tsconfig.json"
   }
-}
+}

package/src/Agent.ts

@@ -3,7 +3,6 @@
  */
 import {
   Array,
-  Data,
   Deferred,
   Effect,
   FileSystem,
@@ -39,6 +38,16 @@ import type { ChildProcessSpawner } from "effect/unstable/process"
  */
 export interface Agent {
   readonly output: Stream.Stream<Output, AgentFinished>
+
+  /**
+   * Send a message to the agent to steer its behavior. This is useful for
+   * providing feedback or new instructions while the agent is running.
+   *
+   * The effect will only complete once the message has been sent.
+   * Interrupting the effect will withdraw the message, so it will not be sent
+   * to the agent.
+   */
+  steer(message: string): Effect.Effect<void>
 }
 
 /**
@@ -111,62 +120,128 @@ export const make: <
     | ProviderName
     | ModelName
   >()
+  const pendingMessages = new Set<{
+    readonly message: string
+    readonly resume: (effect: Effect.Effect<void>) => void
+  }>()
 
   let system = yield* generateSystem(allTools)
+
+  const agentsMd = yield* pipe(
+    fs.readFileString(pathService.resolve(options.directory, "AGENTS.md")),
+    Effect.option,
+  )
+
+  if (Option.isSome(agentsMd)) {
+    system += `
+# AGENTS.md
+
+The following instructions are from ./AGENTS.md in the current directory.
+You do not need to read this file again.
+
+**ALWAYS follow these instructions when completing tasks**:
+
+<!-- AGENTS.md start -->
+${agentsMd.value}
+<!-- AGENTS.md end -->
+`
+  }
+
   if (options.system) {
-    system += `\n${options.system}`
+    system += `\n${options.system}\n`
   }
+
   const withSystemPrompt = OpenAiLanguageModel.withConfigOverride({
     store: false,
     instructions: system,
   })
 
-  const agentsMd = yield* pipe(
-    fs.readFileString(pathService.resolve(options.directory, "AGENTS.md")),
-    Effect.option,
-  )
+  let agentCounter = 0
 
-  let subagentId = 0
+  const outputBuffer = new Map<number, Array<Output>>()
+  let currentOutputAgent: number | null = null
 
   const spawn: (
+    agentId: number,
     prompt: Prompt.Prompt,
   ) => Stream.Stream<
     Output,
     AgentFinished,
     LanguageModel.LanguageModel | ProviderName
-  > = Effect.fnUntraced(function* (prompt) {
+  > = Effect.fnUntraced(function* (agentId, prompt) {
     const ai = yield* LanguageModel.LanguageModel
     const provider = yield* ProviderName
     const deferred = yield* Deferred.make<string>()
     const output = yield* Queue.make<Output, AgentFinished>()
 
+    function maybeSend(agentId: number, part: Output, lock = false) {
+      if (currentOutputAgent === null || currentOutputAgent === agentId) {
+        Queue.offerUnsafe(output, part)
+        if (lock) {
+          currentOutputAgent = agentId
+        }
+        return true
+      }
+      const state = outputBuffer.get(agentId) ?? []
+      state.push(part)
+      return false
+    }
+
+    function flushBuffer() {
+      currentOutputAgent = null
+      for (const [id, state] of outputBuffer) {
+        outputBuffer.delete(id)
+        Queue.offerAllUnsafe(output, state)
+        const lastPart = state[state.length - 1]!
+        if (lastPart._tag === "ReasoningDelta") {
+          currentOutputAgent = id
+          break
+        }
+      }
+    }
+
     const taskServices = SubagentContext.serviceMap({
       spawn: ({ prompt }) => {
-        let id = ++subagentId
-        return spawn(Prompt.make(prompt)).pipe(
-          Stream.broadcast({
-            capacity: "unbounded",
-          }),
-          Effect.flatMap(
-            Effect.fnUntraced(function* (stream) {
-              const provider = yield* ProviderName
-              const model = yield* ModelName
+        let id = agentCounter++
+        const stream = spawn(
+          id,
+          Prompt.make(`You have been spawned using "subagent" to complete the following task:
+
+${prompt}`),
+        )
+        return Effect.gen(function* () {
+          const provider = yield* ProviderName
+          const model = yield* ModelName
+          Queue.offerUnsafe(
+            output,
+            new SubagentStart({ id, prompt, model, provider }),
+          )
+          return yield* stream.pipe(
+            Stream.runForEachArray((parts) => {
+              for (const part of parts) {
+                switch (part._tag) {
+                  case "SubagentStart":
+                  case "SubagentComplete":
+                  case "SubagentPart":
+                    break
+
+                  default:
+                    Queue.offerUnsafe(output, new SubagentPart({ id, part }))
+                    break
+                }
+              }
+              return Effect.void
+            }),
+            Effect.as(""),
+            Effect.catch((finished) => {
               Queue.offerUnsafe(
                 output,
-                new SubagentPart({
-                  id,
-                  prompt,
-                  provider,
-                  model,
-                  output: stream,
-                }),
+                new SubagentComplete({ id, summary: finished.summary }),
               )
-              return yield* Stream.runDrain(stream)
+              return Effect.succeed(finished.summary)
             }),
-          ),
-          Effect.scoped,
-          Effect.as(""),
-          Effect.catch((e) => Effect.succeed(e.summary)),
+          )
+        }).pipe(
           options.subagentModel
             ? Effect.provide(Layer.orDie(options.subagentModel))
             : Effect.provideServices(services),
@@ -177,18 +252,6 @@ export const make: <
       ServiceMap.add(TaskCompleteDeferred, deferred),
     )
 
-    prompt = Prompt.concat(
-      prompt,
-      agentsMd.pipe(
-        Option.map((md) =>
-          Prompt.make(`Here is a copy of ./AGENTS.md. ALWAYS follow these instructions when completing the above task:
-
-${md}`),
-        ),
-        Option.getOrElse(() => Prompt.empty),
-      ),
-    )
-
     if (provider !== "openai") {
       prompt = Prompt.setSystem(prompt, system)
     }
@@ -197,7 +260,7 @@ ${md}`),
     yield* Effect.gen(function* () {
       while (true) {
         if (currentScript.length > 0) {
-          Queue.offerUnsafe(output, new ScriptStart({ script: currentScript }))
+          maybeSend(agentId, new ScriptStart({ script: currentScript }))
           const result = yield* pipe(
             executor.execute({
               tools,
@@ -205,8 +268,10 @@ ${md}`),
             }),
             Stream.mkString,
           )
-          Queue.offerUnsafe(output, new ScriptEnd({ output: result }))
-          prompt = Prompt.concat(prompt, `Javascript output:\n\n${result}`)
+          maybeSend(agentId, new ScriptEnd({ output: result }))
+          prompt = Prompt.concat(prompt, [
+            { role: "assistant", content: `Javascript output:\n\n${result}` },
+          ])
           currentScript = ""
         }
 
@@ -218,15 +283,37 @@ ${md}`),
           return
         }
 
+        if (pendingMessages.size > 0) {
+          prompt = Prompt.concat(
+            prompt,
+            Array.Array.from(pendingMessages, ({ message, resume }) => {
+              resume(Effect.void)
+              return {
+                role: "user",
+                content: message,
+              }
+            }),
+          )
+          pendingMessages.clear()
+        }
+
         let response = Array.empty<StreamPart<{}>>()
+        let reasoningStarted = false
+        let hadReasoningDelta = false
         yield* pipe(
           ai.streamText({ prompt }),
-          Stream.takeUntil(
-            (part) =>
-              part.type === "text-end" && currentScript.trim().length > 0,
-          ),
+          Stream.takeUntil((part) => {
+            if (part.type === "text-end" && currentScript.trim().length > 0) {
+              return true
+            }
+            if (part.type === "reasoning-end" && pendingMessages.size > 0) {
+              return true
+            }
+            return false
+          }),
           Stream.runForEachArray((parts) => {
             response.push(...parts)
+
             for (const part of parts) {
               switch (part.type) {
                 case "text-start":
@@ -236,16 +323,23 @@ ${md}`),
                   currentScript += part.delta
                   break
                 case "reasoning-start":
-                  Queue.offerUnsafe(output, new ReasoningStart())
+                  reasoningStarted = true
                   break
                 case "reasoning-delta":
-                  Queue.offerUnsafe(
-                    output,
-                    new ReasoningDelta({ delta: part.delta }),
-                  )
+                  hadReasoningDelta = true
+                  if (reasoningStarted) {
+                    reasoningStarted = false
+                    maybeSend(agentId, new ReasoningStart(), true)
+                  }
+                  maybeSend(agentId, new ReasoningDelta({ delta: part.delta }))
                   break
                 case "reasoning-end":
-                  Queue.offerUnsafe(output, new ReasoningEnd())
+                  reasoningStarted = false
+                  if (hadReasoningDelta) {
+                    hadReasoningDelta = false
+                    const sent = maybeSend(agentId, new ReasoningEnd())
+                    if (sent) flushBuffer()
+                  }
                   break
                 case "finish":
                   // console.log("Tokens used:", part.usage, "\n")
@@ -274,7 +368,7 @@ ${md}`),
     return Stream.fromQueue(output)
   }, Stream.unwrap)
 
-  const output = yield* spawn(Prompt.make(options.prompt)).pipe(
+  const output = yield* spawn(agentCounter++, Prompt.make(options.prompt)).pipe(
     Stream.broadcast({
       capacity: "unbounded",
     }),
@@ -282,6 +376,12 @@ ${md}`),
 
   return identity<Agent>({
     output,
+    steer: (message) =>
+      Effect.callback((resume) => {
+        const entry = { message, resume }
+        pendingMessages.add(entry)
+        return Effect.sync(() => pendingMessages.delete(entry))
+      }),
   })
   // oxlint-disable-next-line typescript/no-explicit-any
 }) as any
@@ -290,19 +390,17 @@ ${md}`),
 const generateSystem = Effect.fn(function* (tools: Toolkit.Toolkit<any>) {
   const renderer = yield* ToolkitRenderer
 
-  return `# Who you are
-
-You are a professional software engineer. You are precise, thoughtful and concise. You make changes with care and always do the due diligence to ensure the best possible outcome. You make no mistakes.
-
-# Completing the task
+  return `You are a professional software engineer. You are precise, thoughtful and concise. You make changes with care and always do the due diligence to ensure the best possible outcome. You make no mistakes.
 
-To complete the task respond with javascript code that will be executed for you.
+To do your job, only respond with javascript code that will be executed for you.
 
 - Do not add any markdown formatting, just code.
 - Use \`console.log\` to print any output you need.
 - Top level await is supported.
 - **Prefer using the functions provided** over the bash tool
 
+**When you have completed your task**, call the "taskComplete" function with the final output.
+
 You have the following functions available to you:
 
 \`\`\`ts
@@ -338,9 +436,7 @@ Javascript output:
 
 - Use the current state of the codebase to inform your decisions. Don't look at git history unless explicity asked to.
 - Only add comments when necessary.
-- Repect the users AGENTS.md file and ALWAYS follow the instructions in it.
-- Use the "subagent" tool to delegate research / exploration tasks
-- When you have fully completed the task, call the "taskComplete" function
+- Use the "subagent" tool to delegate large tasks / exploration. Run multiple subagents in parallel with Promise.all
 `
 })
 
@@ -407,7 +503,40 @@ export class AgentFinished extends Schema.TaggedErrorClass<AgentFinished>()(
  * @since 1.0.0
  * @category Output
  */
-export const OutputPart = Schema.Union([
+export class SubagentStart extends Schema.TaggedClass<SubagentStart>()(
+  "SubagentStart",
+  {
+    id: Schema.Number,
+    prompt: Schema.String,
+    model: Schema.String,
+    provider: Schema.String,
+  },
+) {
+  get modelAndProvider() {
+    return `${this.provider}/${this.model}`
+  }
+}
+
+/**
+ * @since 1.0.0
+ * @category Output
+ */
+export class SubagentComplete extends Schema.TaggedClass<SubagentComplete>()(
+  "SubagentComplete",
+  {
+    id: Schema.Number,
+    summary: Schema.String,
+  },
+) {}
+
+export type ContentPart =
+  | ReasoningStart
+  | ReasoningDelta
+  | ReasoningEnd
+  | ScriptStart
+  | ScriptEnd
+
+export const ContentPart = Schema.Union([
   ReasoningStart,
   ReasoningDelta,
   ReasoningEnd,
@@ -419,26 +548,35 @@ export const OutputPart = Schema.Union([
  * @since 1.0.0
  * @category Output
  */
-export type OutputPart = typeof OutputPart.Type
+export class SubagentPart extends Schema.TaggedClass<SubagentPart>()(
+  "SubagentPart",
+  {
+    id: Schema.Number,
+    part: ContentPart,
+  },
+) {}
 
 /**
  * @since 1.0.0
  * @category Output
  */
-export class SubagentPart extends Data.TaggedError("SubagentPart")<{
-  id: number
-  prompt: string
-  model: string
-  provider: string
-  output: Stream.Stream<Output, AgentFinished>
-}> {
-  get modelAndProvider() {
-    return `${this.provider}/${this.model}`
-  }
-}
+export type Output =
+  | ContentPart
+  | SubagentStart
+  | SubagentComplete
+  | SubagentPart
 
 /**
  * @since 1.0.0
  * @category Output
  */
-export type Output = OutputPart | SubagentPart
+export const Output = Schema.Union([
+  ReasoningStart,
+  ReasoningDelta,
+  ReasoningEnd,
+  ScriptStart,
+  ScriptEnd,
+  SubagentStart,
+  SubagentComplete,
+  SubagentPart,
+])

package/src/AgentTools.ts

@@ -16,7 +16,6 @@ import {
 import { Tool, Toolkit } from "effect/unstable/ai"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import * as Glob from "glob"
-import * as Rg from "@vscode/ripgrep"
 import { parsePatch, patchChunks } from "./ApplyPatch.ts"
 
 /**
@@ -180,9 +179,9 @@ export const AgentTools = Toolkit.make(
   }),
   Tool.make("taskComplete", {
     description:
-      "Only call this when you have fully completed the user's task. Provide a markdown summary of the work you have done.",
+      "Call this to send a final output message and end the current task.",
     parameters: Schema.String.annotate({
-      identifier: "summary",
+      identifier: "output",
     }),
     dependencies: [TaskCompleteDeferred],
   }),
@@ -304,7 +303,7 @@ export const AgentToolHandlers = AgentTools.toLayer(
         args.push(options.pattern)
         let stream = pipe(
           spawner.streamLines(
-            ChildProcess.make(Rg.rgPath, args, {
+            ChildProcess.make("rg", args, {
               cwd,
               stdin: "ignore",
             }),

package/src/Executor.ts

@@ -96,7 +96,6 @@ ${options.script}
           }
         }).pipe(
           Effect.ensuring(Scope.close(handlerScope, Exit.void)),
-          Effect.timeout("3 minutes"),
           Effect.catchCause(Effect.logFatal),
           Effect.provideService(Console.Console, console),
           Effect.ensuring(Queue.end(output)),