clanka 0.0.29 → 0.1.1

package/dist/Agent.d.ts

@@ -1,20 +1,48 @@
 /**
  * @since 1.0.0
  */
-import { Effect, FileSystem, Layer, Path, Schema, Scope, ServiceMap, Stream } from "effect";
+import { Effect, Layer, Schema, Scope, ServiceMap, Stream } from "effect";
 import { AiError, LanguageModel, Prompt, Tool, Toolkit } from "effect/unstable/ai";
-import { AgentTools } from "./AgentTools.ts";
-import { Executor } from "./Executor.ts";
-import { ToolkitRenderer } from "./ToolkitRenderer.ts";
 import { ModelName, ProviderName } from "effect/unstable/ai/Model";
-import type { ChildProcessSpawner } from "effect/unstable/process";
-import type { HttpClient } from "effect/unstable/http";
+import * as AgentExecutor from "./AgentExecutor.ts";
+import type { Path } from "effect/Path";
+import type { ChildProcessSpawner } from "effect/unstable/process/ChildProcessSpawner";
+import type { HttpClient } from "effect/unstable/http/HttpClient";
+import type { CurrentDirectory, SubagentExecutor, TaskCompleter } from "./AgentTools.ts";
+import type { FileSystem } from "effect/FileSystem";
+/**
+ * @since 1.0.0
+ * @category Models
+ */
+export type TypeId = "~clanka/Agent";
+/**
+ * @since 1.0.0
+ * @category Models
+ */
+export declare const TypeId: TypeId;
 /**
  * @since 1.0.0
  * @category Models
  */
 export interface Agent {
-    readonly output: Stream.Stream<Output, AgentFinished | AiError.AiError>;
+    readonly [TypeId]: TypeId;
+    /**
+     * Send a prompt to the agent and receive a stream of output.
+     */
+    send(options: {
+        /**
+         * The prompt to send to the agent.
+         */
+        readonly prompt: Prompt.RawInput;
+        /**
+         * Provide additional system instructions, or a function that generates
+         * system instructions based on the tool instructions
+         */
+        readonly system?: string | ((options: {
+            readonly toolInstructions: string;
+            readonly agentsMd: string;
+        }) => string) | undefined;
+    }): Effect.Effect<Stream.Stream<Output, AgentFinished | AiError.AiError>, never, Scope.Scope | LanguageModel.LanguageModel | ProviderName | ModelName>;
     /**
      * Send a message to the agent to steer its behavior. This is useful for
      * providing feedback or new instructions while the agent is running.
@@ -26,29 +54,42 @@ export interface Agent {
     steer(message: string): Effect.Effect<void>;
 }
 /**
- * Start an agent in the given directory with the given prompt and tools.
- *
+ * @since 1.0.0
+ * @category Service
+ */
+export declare const Agent: ServiceMap.Service<Agent, Agent>;
+/**
  * @since 1.0.0
  * @category Constructors
  */
-export declare const make: <Toolkit extends Toolkit.Any = never, SE = never, SR = never>(options: {
-    /** The working directory to run the agent in */
+export declare const make: Effect.Effect<Agent, never, Scope.Scope | AgentExecutor.AgentExecutor>;
+/**
+ * @since 1.0.0
+ * @category Layers
+ */
+export declare const layer: Layer.Layer<Agent, never, AgentExecutor.AgentExecutor>;
+/**
+ * Create an Agent layer that uses a local AgentExecutor.
+ *
+ * @since 1.0.0
+ * @category Layers
+ */
+export declare const layerLocal: <Toolkit extends Toolkit.Any = never>(options: {
     readonly directory: string;
-    /** The prompt to use for the agent */
-    readonly prompt: Prompt.RawInput;
-    /**
-     * Provide additional system instructions, or a function that generates
-     * system instructions based on the tool instructions
-     */
-    readonly system?: string | ((options: {
-        readonly toolInstructions: string;
-        readonly agentsMd: string;
-    }) => string) | undefined;
-    /** Additional tools to provide to the agent */
     readonly tools?: Toolkit | undefined;
-    /** Layer to use for subagents */
-    readonly subagentModel?: Layer.Layer<LanguageModel.LanguageModel | ProviderName | ModelName, SE, SR> | undefined;
-}) => Effect.Effect<Agent, never, Scope.Scope | FileSystem.FileSystem | Path.Path | Executor | LanguageModel.LanguageModel | ProviderName | ModelName | ToolkitRenderer | (Toolkit extends Toolkit.Toolkit<infer T> ? Tool.HandlersFor<T> | Tool.HandlerServices<T[keyof T]> : never) | Tool.HandlersFor<typeof AgentTools.tools> | SR>;
+}) => Layer.Layer<Agent, never, FileSystem | Path | ChildProcessSpawner | HttpClient | Exclude<Toolkit extends Toolkit.Toolkit<infer T> ? Tool.HandlersFor<T> | Tool.HandlerServices<T[keyof T]> : never, CurrentDirectory | SubagentExecutor | TaskCompleter>>;
+declare const SubagentModel_base: ServiceMap.ServiceClass<SubagentModel, "clanka/Agent/SubagentModel", ServiceMap.ServiceMap<LanguageModel.LanguageModel | ProviderName | ModelName>>;
+/**
+ * @since 1.0.0
+ * @category Subagent model
+ */
+export declare class SubagentModel extends SubagentModel_base {
+}
+/**
+ * @since 1.0.0
+ * @category Subagent model
+ */
+export declare const layerSubagentModel: <E, R>(layer: Layer.Layer<LanguageModel.LanguageModel | ProviderName | ModelName, E, R>) => Layer.Layer<SubagentModel, E, R>;
 declare const AgentModelConfig_base: ServiceMap.Reference<{
     readonly systemPromptTransform?: <A, E, R>(system: string, effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
     readonly supportsAssistantPrefill?: boolean | undefined;
@@ -61,13 +102,19 @@ declare const AgentModelConfig_base: ServiceMap.Reference<{
 export declare class AgentModelConfig extends AgentModelConfig_base {
     static readonly layer: (options: typeof AgentModelConfig.Service) => Layer.Layer<never, never, never>;
 }
+declare const AgentStart_base: Schema.ExtendableClass<AgentStart, Schema.TaggedStruct<"AgentStart", {
+    readonly id: Schema.Number;
+    readonly prompt: Schema.Codec<Prompt.Prompt, Prompt.PromptEncoded, never, never>;
+    readonly provider: Schema.String;
+    readonly model: Schema.String;
+}>, {}>;
 /**
- * A layer that provides most of the common services needed to run an agent.
- *
  * @since 1.0.0
- * @category Services
+ * @category Output
  */
-export declare const layerServices: Layer.Layer<Tool.HandlersFor<typeof AgentTools.tools> | Executor | ToolkitRenderer, never, FileSystem.FileSystem | Path.Path | ChildProcessSpawner.ChildProcessSpawner | HttpClient.HttpClient>;
+export declare class AgentStart extends AgentStart_base {
+    get modelAndProvider(): string;
+}
 declare const ReasoningStart_base: Schema.ExtendableClass<ReasoningStart, Schema.TaggedStruct<"ReasoningStart", {}>, {}>;
 /**
  * @since 1.0.0
@@ -123,15 +170,6 @@ declare const ScriptOutput_base: Schema.ExtendableClass<ScriptOutput, Schema.Tag
  */
 export declare class ScriptOutput extends ScriptOutput_base {
 }
-declare const AgentFinished_base: Schema.ErrorClass<AgentFinished, Schema.TaggedStruct<"AgentFinished", {
-    readonly summary: Schema.String;
-}>, import("effect/Cause").YieldableError>;
-/**
- * @since 1.0.0
- * @category Output
- */
-export declare class AgentFinished extends AgentFinished_base {
-}
 declare const SubagentStart_base: Schema.ExtendableClass<SubagentStart, Schema.TaggedStruct<"SubagentStart", {
     readonly id: Schema.Number;
     readonly prompt: Schema.String;
@@ -171,11 +209,20 @@ export declare class SubagentPart extends SubagentPart_base {
  * @since 1.0.0
  * @category Output
  */
-export type Output = ContentPart | SubagentStart | SubagentComplete | SubagentPart;
+export type Output = AgentStart | ContentPart | SubagentStart | SubagentComplete | SubagentPart;
+/**
+ * @since 1.0.0
+ * @category Output
+ */
+export declare const Output: Schema.Union<readonly [typeof AgentStart, typeof ReasoningStart, typeof ReasoningDelta, typeof ReasoningEnd, typeof ScriptStart, typeof ScriptDelta, typeof ScriptEnd, typeof ScriptOutput, typeof SubagentStart, typeof SubagentComplete, typeof SubagentPart]>;
+declare const AgentFinished_base: Schema.ErrorClass<AgentFinished, Schema.TaggedStruct<"AgentFinished", {
+    readonly summary: Schema.String;
+}>, import("effect/Cause").YieldableError>;
 /**
  * @since 1.0.0
  * @category Output
  */
-export declare const Output: Schema.Union<readonly [typeof ReasoningStart, typeof ReasoningDelta, typeof ReasoningEnd, typeof ScriptStart, typeof ScriptDelta, typeof ScriptEnd, typeof ScriptOutput, typeof SubagentStart, typeof SubagentComplete, typeof SubagentPart]>;
+export declare class AgentFinished extends AgentFinished_base {
+}
 export {};
 //# sourceMappingURL=Agent.d.ts.map

package/dist/Agent.d.ts.map

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

package/dist/Agent.js

@@ -1,32 +1,31 @@
 /**
  * @since 1.0.0
  */
-import { Array, Deferred, Effect, FileSystem, identity, Layer, Option, Path, pipe, Queue, Schema, Scope, ServiceMap, Stream, } from "effect";
+import { Array, Effect, identity, Layer, MutableRef, Option, pipe, Queue, Schema, Scope, Semaphore, ServiceMap, Stream, } from "effect";
 import { AiError, LanguageModel, Prompt, Tool, Toolkit, } from "effect/unstable/ai";
-import { AgentToolHandlers, AgentTools, CurrentDirectory, SubagentContext, TaskCompleteDeferred, } from "./AgentTools.js";
-import { Executor } from "./Executor.js";
-import { ToolkitRenderer } from "./ToolkitRenderer.js";
 import { ModelName, ProviderName } from "effect/unstable/ai/Model";
 import {} from "effect/unstable/ai/Response";
+import * as AgentExecutor from "./AgentExecutor.js";
+/**
+ * @since 1.0.0
+ * @category Models
+ */
+export const TypeId = "~clanka/Agent";
+/**
+ * @since 1.0.0
+ * @category Service
+ */
+export const Agent = ServiceMap.Service("clanka/Agent");
 /**
- * Start an agent in the given directory with the given prompt and tools.
- *
  * @since 1.0.0
  * @category Constructors
  */
-export const make = Effect.fnUntraced(function* (options) {
-    const fs = yield* FileSystem.FileSystem;
-    const pathService = yield* Path.Path;
-    const executor = yield* Executor;
-    const renderer = yield* ToolkitRenderer;
-    const generateSystem = typeof options.system === "function" ? options.system : defaultSystem;
-    const allTools = Toolkit.merge(AgentTools, options.tools ?? Toolkit.empty);
-    const allToolsDts = renderer.render(allTools);
-    const tools = yield* allTools;
+export const make = Effect.gen(function* () {
+    const executor = yield* AgentExecutor.AgentExecutor;
     const singleTool = yield* SingleTools.asEffect().pipe(Effect.provide(SingleToolHandlers));
-    const services = yield* Effect.services();
+    const toolsDts = yield* executor.toolsDts;
     const pendingMessages = new Set();
-    const agentsMd = yield* pipe(fs.readFileString(pathService.resolve(options.directory, "AGENTS.md")), Effect.map((content) => `# AGENTS.md
+    const agentsMd = yield* pipe(executor.agentsMd, Effect.map(Option.map((content) => `# AGENTS.md
 
 The following instructions are from ./AGENTS.md in the current directory.
 You do not need to read this file again.
@@ -35,29 +34,36 @@ You do not need to read this file again.
 
 <!-- AGENTS.md start -->
 ${content}
-<!-- AGENTS.md end -->`), Effect.option);
+<!-- AGENTS.md end -->`)));
     let agentCounter = 0;
     const outputBuffer = new Map();
     let currentOutputAgent = null;
-    const spawn = Effect.fnUntraced(function* (agentId, prompt) {
+    let history = MutableRef.make(Prompt.empty);
+    const spawn = Effect.fnUntraced(function* (opts) {
+        const agentId = opts.agentId;
         const ai = yield* LanguageModel.LanguageModel;
+        const subagentModel = yield* Effect.serviceOption(SubagentModel);
         const modelConfig = yield* AgentModelConfig;
+        const services = yield* Effect.services();
+        let finalSummary = Option.none();
         const singleToolMode = modelConfig.supportsNoTools !== true;
-        const deferred = yield* Deferred.make();
         const output = yield* Queue.make();
-        const toolInstructions = generateSystemTools(allToolsDts, !singleToolMode);
+        const prompt = opts.disableHistory ? MutableRef.make(Prompt.empty) : history;
+        MutableRef.update(prompt, Prompt.concat(opts.prompt));
+        const generateSystem = typeof opts.system === "function" ? opts.system : defaultSystem;
+        const toolInstructions = generateSystemTools(toolsDts, !singleToolMode);
         let system = generateSystem({
             toolInstructions,
             agentsMd: Option.getOrElse(agentsMd, () => ""),
         });
-        if (typeof options.system === "string") {
-            system += `\n${options.system}\n`;
+        if (typeof opts.system === "string") {
+            system += `\n${opts.system}\n`;
         }
         function maybeSend(options) {
-            if (currentOutputAgent === null || currentOutputAgent === agentId) {
+            if (currentOutputAgent === null || currentOutputAgent === opts.agentId) {
                 Queue.offerUnsafe(output, options.part);
                 if (options.acquire) {
-                    currentOutputAgent = agentId;
+                    currentOutputAgent = opts.agentId;
                 }
                 if (options.release) {
                     currentOutputAgent = null;
@@ -74,92 +80,105 @@ ${content}
                 }
                 return;
             }
-            let state = outputBuffer.get(agentId);
+            let state = outputBuffer.get(opts.agentId);
             if (!state) {
                 state = [];
-                outputBuffer.set(agentId, state);
+                outputBuffer.set(opts.agentId, state);
             }
             state.push(options.part);
             return;
         }
-        const taskServices = SubagentContext.serviceMap({
-            spawn: ({ prompt }) => {
-                let id = agentCounter++;
-                const stream = spawn(id, Prompt.make(`You have been asked using the "delegate" function to complete the following task. Avoid using the "delegate" function yourself unless strictly necessary:
+        const spawnSubagent = Effect.fnUntraced(function* (prompt) {
+            let id = agentCounter++;
+            const stream = spawn({
+                agentId: id,
+                prompt: Prompt.make(`You have been asked using the "delegate" function to complete the following task. Try to avoid using the "delegate" function yourself unless strictly necessary:
 
-${prompt}`));
-                return Effect.gen(function* () {
-                    const provider = yield* ProviderName;
-                    const model = yield* ModelName;
-                    maybeSend({
-                        agentId,
-                        part: new SubagentStart({ id, prompt, model, provider }),
-                        release: true,
-                    });
-                    return yield* stream.pipe(Stream.runForEachArray((parts) => {
-                        for (const part of parts) {
-                            switch (part._tag) {
-                                case "SubagentStart":
-                                case "SubagentComplete":
-                                case "SubagentPart":
-                                    Queue.offerUnsafe(output, part);
-                                    break;
-                                default:
-                                    Queue.offerUnsafe(output, new SubagentPart({ id, part }));
-                                    break;
-                            }
-                        }
-                        return Effect.void;
-                    }), Effect.as(""), Effect.catchTag("AgentFinished", (finished) => {
-                        Queue.offerUnsafe(output, new SubagentComplete({ id, summary: finished.summary }));
-                        return Effect.succeed(finished.summary);
-                    }), Effect.orDie);
-                }).pipe(options.subagentModel
-                    ? Effect.provide(Layer.orDie(options.subagentModel))
-                    : Effect.provideServices(services));
-            },
-        }).pipe(ServiceMap.add(CurrentDirectory, options.directory), ServiceMap.add(TaskCompleteDeferred, deferred));
+${prompt}`),
+                system: opts.system,
+                disableHistory: true,
+            });
+            const provider = yield* ProviderName;
+            const model = yield* ModelName;
+            maybeSend({
+                agentId: opts.agentId,
+                part: new SubagentStart({ id, prompt, model, provider }),
+                release: true,
+            });
+            return yield* stream.pipe(Stream.runForEachArray((parts) => {
+                for (const part of parts) {
+                    switch (part._tag) {
+                        case "AgentStart":
+                            break;
+                        case "SubagentStart":
+                        case "SubagentComplete":
+                        case "SubagentPart":
+                            Queue.offerUnsafe(output, part);
+                            break;
+                        default:
+                            Queue.offerUnsafe(output, new SubagentPart({ id, part }));
+                            break;
+                    }
+                }
+                return Effect.void;
+            }), Effect.as(""), Effect.catchTag("AgentFinished", (finished) => {
+                Queue.offerUnsafe(output, new SubagentComplete({ id, summary: finished.summary }));
+                return Effect.succeed(finished.summary);
+            }), Effect.orDie);
+        }, Option.isSome(subagentModel)
+            ? Effect.provideServices(subagentModel.value)
+            : Effect.provideServices(services));
         const executeScript = Effect.fnUntraced(function* (script) {
             maybeSend({ agentId, part: new ScriptEnd(), release: true });
-            const output = yield* pipe(executor.execute({ tools, script }), Stream.mkString, Effect.provideServices(taskServices));
+            const output = yield* pipe(executor.execute({
+                script,
+                onSubagent: spawnSubagent,
+                onTaskComplete: (summary) => Effect.sync(() => {
+                    finalSummary = Option.some(summary);
+                }),
+            }), Stream.mkString);
             maybeSend({ agentId, part: new ScriptOutput({ output }) });
             return output;
         });
         if (!modelConfig.systemPromptTransform) {
-            prompt = Prompt.setSystem(prompt, system);
+            MutableRef.update(prompt, Prompt.setSystem(system));
         }
         let currentScript = "";
         yield* Effect.gen(function* () {
             while (true) {
                 if (!singleToolMode && currentScript.length > 0) {
                     const result = yield* executeScript(currentScript);
-                    prompt = Prompt.concat(prompt, [
+                    MutableRef.update(prompt, Prompt.concat([
                         {
-                            role: modelConfig.supportsAssistantPrefill ? "assistant" : "user",
+                            role: modelConfig.supportsAssistantPrefill
+                                ? "assistant"
+                                : "user",
                             content: `Javascript output:\n\n${result}`,
                         },
-                    ]);
+                    ]));
                     currentScript = "";
                 }
-                if (Deferred.isDoneUnsafe(deferred)) {
-                    yield* Queue.fail(output, new AgentFinished({ summary: yield* Deferred.await(deferred) }));
+                if (Option.isSome(finalSummary)) {
+                    yield* Queue.fail(output, new AgentFinished({ summary: finalSummary.value }));
                     return;
                 }
                 if (pendingMessages.size > 0) {
-                    prompt = Prompt.concat(prompt, Array.Array.from(pendingMessages, ({ message, resume }) => {
+                    MutableRef.update(prompt, Prompt.concat(Array.Array.from(pendingMessages, ({ message, resume }) => {
                         resume(Effect.void);
                         return {
                             role: "user",
                             content: message,
                         };
-                    }));
+                    })));
                     pendingMessages.clear();
                 }
                 // oxlint-disable-next-line typescript/no-explicit-any
                 let response = Array.empty();
                 let reasoningStarted = false;
                 let hadReasoningDelta = false;
-                yield* pipe(ai.streamText(singleToolMode ? { prompt, toolkit: singleTool } : { prompt }), Stream.takeUntil((part) => {
+                yield* pipe(ai.streamText(singleToolMode
+                    ? { prompt: prompt.current, toolkit: singleTool }
+                    : { prompt: prompt.current }), Stream.takeUntil((part) => {
                     if (!singleToolMode &&
                         part.type === "text-end" &&
                         currentScript.trim().length > 0) {
@@ -269,28 +288,36 @@ ${prompt}`));
                 }), modelConfig.systemPromptTransform
                     ? (effect) => modelConfig.systemPromptTransform(system, effect)
                     : identity);
-                prompt = Prompt.concat(prompt, Prompt.fromResponseParts(response));
+                MutableRef.update(prompt, Prompt.concat(Prompt.fromResponseParts(response)));
                 currentScript = currentScript.trim();
             }
-        }).pipe(Effect.provideServices(taskServices.pipe(ServiceMap.add(ScriptExecutor, (script) => {
+        }).pipe(Effect.provideService(ScriptExecutor, (script) => {
             maybeSend({ agentId, part: new ScriptStart() });
             maybeSend({ agentId, part: new ScriptDelta({ delta: script }) });
             return executeScript(script);
-        }))), Effect.provideServices(services), Effect.catchCause((cause) => Queue.failCause(output, cause)), Effect.forkScoped);
+        }), Effect.catchCause((cause) => Queue.failCause(output, cause)), Effect.forkScoped);
+        yield* Queue.offer(output, new AgentStart({
+            id: opts.agentId,
+            prompt: opts.prompt,
+            provider: yield* ProviderName,
+            model: yield* ModelName,
+        }));
         return Stream.fromQueue(output);
     }, Stream.unwrap);
-    const output = yield* spawn(agentCounter++, Prompt.make(options.prompt)).pipe(Stream.broadcast({
-        capacity: "unbounded",
-    }));
-    return identity({
-        output,
+    const sendLock = Semaphore.makeUnsafe(1);
+    return Agent.of({
+        [TypeId]: TypeId,
+        send: (options) => spawn({
+            agentId: agentCounter++,
+            prompt: Prompt.make(options.prompt),
+            system: options.system,
+        }).pipe(Stream.broadcast({ capacity: "unbounded", replay: 1 }), sendLock.withPermit),
         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
 });
 const defaultSystem = (options) => `You are a world-class software engineer: precise, rigorous, thoughtful, and relentlessly careful. You fully understand the task, verify assumptions, and produce minimal, correct, maintainable solutions. You make no mistakes.
 
@@ -384,6 +411,29 @@ const SingleToolHandlers = SingleTools.toLayer({
         return yield* execute(script);
     }),
 });
+/**
+ * @since 1.0.0
+ * @category Layers
+ */
+export const layer = Layer.effect(Agent, make);
+/**
+ * Create an Agent layer that uses a local AgentExecutor.
+ *
+ * @since 1.0.0
+ * @category Layers
+ */
+export const layerLocal = (options) => layer.pipe(Layer.provide(AgentExecutor.layerLocal(options)));
+/**
+ * @since 1.0.0
+ * @category Subagent model
+ */
+export class SubagentModel extends ServiceMap.Service()("clanka/Agent/SubagentModel") {
+}
+/**
+ * @since 1.0.0
+ * @category Subagent model
+ */
+export const layerSubagentModel = (layer) => Layer.effect(SubagentModel, Layer.build(layer));
 /**
  * @since 1.0.0
  * @category System prompts
@@ -394,12 +444,19 @@ export class AgentModelConfig extends ServiceMap.Reference("clanka/Agent/SystemP
     static layer = (options) => Layer.succeed(AgentModelConfig, options);
 }
 /**
- * A layer that provides most of the common services needed to run an agent.
- *
  * @since 1.0.0
- * @category Services
+ * @category Output
  */
-export const layerServices = Layer.mergeAll(AgentToolHandlers, Executor.layer, ToolkitRenderer.layer);
+export class AgentStart extends Schema.TaggedClass()("AgentStart", {
+    id: Schema.Number,
+    prompt: Prompt.Prompt,
+    provider: Schema.String,
+    model: Schema.String,
+}) {
+    get modelAndProvider() {
+        return `${this.provider}/${this.model}`;
+    }
+}
 /**
  * @since 1.0.0
  * @category Output
@@ -448,14 +505,6 @@ export class ScriptOutput extends Schema.TaggedClass()("ScriptOutput", {
     output: Schema.String,
 }) {
 }
-/**
- * @since 1.0.0
- * @category Output
- */
-export class AgentFinished extends Schema.TaggedErrorClass()("AgentFinished", {
-    summary: Schema.String,
-}) {
-}
 /**
  * @since 1.0.0
  * @category Output
@@ -502,6 +551,7 @@ export class SubagentPart extends Schema.TaggedClass()("SubagentPart", {
  * @category Output
  */
 export const Output = Schema.Union([
+    AgentStart,
     ReasoningStart,
     ReasoningDelta,
     ReasoningEnd,
@@ -513,4 +563,12 @@ export const Output = Schema.Union([
     SubagentComplete,
     SubagentPart,
 ]);
+/**
+ * @since 1.0.0
+ * @category Output
+ */
+export class AgentFinished extends Schema.TaggedErrorClass()("AgentFinished", {
+    summary: Schema.String,
+}) {
+}
 //# sourceMappingURL=Agent.js.map