effect-assistant 0.1.0 → 0.3.0

package/dist/internal/turns.js

@@ -1,8 +1,6 @@
 import { ToolResult, TurnCompleted, TurnFailed, TurnStarted, isLibraryEvent } from "../AssistantEvent.js";
-import { block, kind } from "../Decision.js";
-import { approvedCalls } from "./decisions.js";
+import { decodeEntries } from "./events.js";
 import { toJsonText } from "./schema.js";
-import { decodeEntries, read } from "./events.js";
 import { fromEntries, mayHaveRunOutput, notRunOutput, owesDelivery, owesReply, unansweredCalls, unhandledInputs, unreadAfter, userText } from "./history.js";
 import { agentInput, agentOutput, agentSpan, currentTraceId } from "./telemetry.js";
 import { duplicateNames, fromToolkitOrEmpty, merge, provide, runOnly } from "./toolkit.js";
@@ -10,16 +8,17 @@ import { makeMessaging, sendUserMessageName, waitToolName } from "./tools.js";
 import { TurnTools, run as run$1 } from "./loop.js";
 import { withCatalog } from "../Skill.js";
 import { protocol } from "../Instructions.js";
-import { toTools } from "./skills.js";
+import { available, toTools } from "./skills.js";
 import { mapText } from "./instructions.js";
 import { toolkit } from "./specialists.js";
-import * as Predicate from "effect/Predicate";
 import "effect/Context";
 import * as Effect from "effect/Effect";
+import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as Exit from "effect/Exit";
 import * as Option from "effect/Option";
+import * as Ref from "effect/Ref";
 import * as Cause from "effect/Cause";
 import { identity } from "effect/Function";
 //#region src/internal/turns.ts
@@ -32,8 +31,6 @@ const deliveryNudge = "You told the user you're on it, but stopped without givin
 /** @internal */
 const register = Effect.fnUntraced(function* (definition, options) {
 	const model = yield* Effect.context();
-	const decisionBlock = definition.blocks?.byKind.get(kind);
-	if (decisionBlock !== void 0 && decisionBlock !== block) return yield* Effect.die(`The ${kind} block kind is the library's: use Decision.block.`);
 	const specialists = yield* Effect.forEach(definition.specialists, Effect.fnUntraced(function* (specialist) {
 		const built = yield* Effect.serviceOption(specialist.Handler);
 		if (Option.isNone(built)) return yield* Effect.die(`No handler for the ${specialist.name} specialist: provide ${specialist.name}.toLayer.`);
@@ -60,28 +57,10 @@ const failureMessage = (cause) => Option.match(Schema.decodeUnknownOption(Provid
 	onSome: ({ _tag, raw }) => `${_tag ?? "Error"}: ${Predicate.isString(raw) ? raw : toJsonText(raw)}`
 });
 const lastSeq = (entries, otherwise) => entries.at(-1)?.seq ?? otherwise;
-const toHistory = (viewed, app) => {
-	const out = [];
-	let run = [];
-	const flush = () => {
-		out.push(...fromEntries(run, (event) => read(app, event)));
-		run = [];
-	};
-	for (const item of viewed) if (isEntry(item)) run.push(item);
-	else {
-		flush();
-		out.push(item);
-	}
-	flush();
-	return out;
-};
-const isEntry = (item) => Predicate.hasProperty(item, "seq");
 const closeOpenCalls = Effect.fnUntraced(function* (chat, startSeq) {
 	const entries = (yield* chat.entries).filter(({ seq }) => seq > startSeq);
 	const started = new Set(entries.flatMap(({ event }) => Predicate.isTagged(event, "ToolStarted") ? [event.callId] : []));
-	const all = yield* chat.entries;
-	const approved = approvedCalls(all).filter((call) => started.has(call.id));
-	const open = [...unansweredCalls(fromEntries(entries, () => void 0)), ...approved];
+	const open = unansweredCalls(fromEntries(entries));
 	if (open.length === 0) return;
 	yield* chat.append(open.map((call) => ToolResult.make({
 		callId: call.id,
@@ -97,9 +76,9 @@ const closeOpenCalls = Effect.fnUntraced(function* (chat, startSeq) {
 	})));
 });
 const handledThrough = (entries, startSeq) => entries.reduce((through, { seq, event }) => seq > startSeq && isLibraryEvent(event) && Predicate.isTagged(event, "ModelOutput") && event.seenThroughSeq !== void 0 ? Math.max(through, event.seenThroughSeq) : through, startSeq);
-const finishTurn = Effect.fnUntraced(function* (chat, read, wakes) {
+const finishTurn = Effect.fnUntraced(function* (chat, read, ranLoop) {
 	const entries = yield* chat.entries;
-	const end = owesReply(entries, read) && !unreadAfter(entries, read, wakes) ? TurnFailed.make({
+	const end = ranLoop && owesReply(entries, read) && !unreadAfter(entries, read) ? TurnFailed.make({
 		throughSeq: read,
 		message: silentTurnMessage
 	}) : TurnCompleted.make({ throughSeq: read });
@@ -113,14 +92,15 @@ const failTurn = Effect.fnUntraced(function* (chat, cause) {
 		message: failureMessage(cause)
 	})]);
 });
-const makeTurnApi = (registration, chat, startSeq, checkOpen) => {
+const makeTurnApi = (registration, chat, startSeq, checkOpen, ranLoop) => {
 	const { definition, builtins } = registration;
 	const { app } = definition;
+	const running = (stream) => Stream.unwrap(Ref.set(ranLoop, true).pipe(Effect.as(stream)));
 	const history = Effect.fnUntraced(function* (view = identity) {
 		yield* checkOpen;
 		const all = yield* chat.entries;
 		return {
-			messages: toHistory(view(decodeEntries(app, all)), app),
+			messages: fromEntries(view(decodeEntries(app, all))),
 			throughSeq: lastSeq(all, startSeq)
 		};
 	});
@@ -128,7 +108,7 @@ const makeTurnApi = (registration, chat, startSeq, checkOpen) => {
 	const replyPass = (options) => Stream.unwrap(Effect.gen(function* () {
 		const all = yield* chat.entries;
 		const through = handledThrough(all, startSeq);
-		if (unreadAfter(all, through, app.wakes)) return Stream.empty;
+		if (unreadAfter(all, through)) return Stream.empty;
 		const owed = owesReply(all, through);
 		const undelivered = !owed && owesDelivery(all, through);
 		if (!owed && !undelivered) return Stream.empty;
@@ -140,24 +120,25 @@ const makeTurnApi = (registration, chat, startSeq, checkOpen) => {
 				yield* checkOpen;
 				const entries = yield* chat.entries;
 				return {
-					messages: [...toHistory(options.view(decodeEntries(app, entries)), app), userText(nudge)],
+					messages: [...fromEntries(options.view(decodeEntries(app, entries))), userText(nudge)],
 					throughSeq: lastSeq(entries, startSeq)
 				};
 			}),
 			maxSteps: 2
 		});
 	}));
-	const replyIfOwed = (options) => replyPass({
+	const replyIfOwed = (options) => running(replyPass({
 		instructions: instructions(options.instructions),
 		toolkit: builtins,
 		view: identity,
 		nudge: options.nudge
-	});
+	}));
 	const prepare = (options) => {
-		const skills = options.skills ?? [];
+		const own = fromToolkitOrEmpty(options.toolkit);
+		const skills = available(options.skills ?? [], [...builtins.definitions, ...own.definitions]);
 		return {
 			system: mapText(instructions(options.instructions), (text) => withCatalog(text, skills)),
-			toolkit: merge(merge(builtins, toTools(skills)), fromToolkitOrEmpty(options.toolkit)),
+			toolkit: merge(merge(builtins, toTools(skills)), own),
 			view: options.history ?? identity
 		};
 	};
@@ -169,19 +150,18 @@ const makeTurnApi = (registration, chat, startSeq, checkOpen) => {
 		loop: (options) => {
 			const { system, toolkit, view } = prepare(options);
 			const twice = duplicateNames(toolkit);
-			const deciding = toolkit.definitions.filter((tool) => tool.needsApproval !== void 0 && tool.needsApproval !== false);
-			const loop = twice.length > 0 ? Stream.die(`Tool names used twice, like one named after a built-in: ${twice.join(", ")}`) : deciding.length > 0 && definition.blocks?.byKind.get("decision") === void 0 ? Stream.die(`${deciding.map((tool) => tool.name).join(", ")} can wait for the user's decision: add Decision.block to the assistant's blocks.`) : run$1({
+			const loop = twice.length > 0 ? Stream.die(`Tool names used twice, like one named after a built-in: ${twice.join(", ")}`) : run$1({
 				instructions: system,
 				toolkit,
 				history: history(view),
 				maxSteps: options.maxSteps ?? 16
 			});
-			return Stream.concat(loop, replyPass({
+			return running(Stream.concat(loop, replyPass({
 				instructions: system,
 				toolkit,
 				view,
 				nudge: options.replyNudge
-			}));
+			})));
 		}
 	};
 };
@@ -189,7 +169,7 @@ const makeTurnApi = (registration, chat, startSeq, checkOpen) => {
 const run = Effect.fnUntraced(function* (options) {
 	const { chat } = options;
 	const before = yield* chat.entries;
-	yield* agentInput(unhandledInputs(before, options.registration.definition.app.wakes));
+	yield* agentInput(unhandledInputs(before));
 	const assistant = options.registration.definition.name;
 	const traceId = yield* currentTraceId;
 	const started = yield* chat.append([TurnStarted.make(Option.match(traceId, {
@@ -200,12 +180,13 @@ const run = Effect.fnUntraced(function* (options) {
 		})
 	}))]);
 	const startSeq = lastSeq(started, 0);
-	const turn = makeTurnApi(options.registration, chat, startSeq, options.checkOpen);
+	const ranLoop = yield* Ref.make(false);
+	const turn = makeTurnApi(options.registration, chat, startSeq, options.checkOpen, ranLoop);
 	const record = (event) => chat.append([event]);
 	yield* options.handler(turn).pipe(Stream.runForEach(record), Effect.onExit((exit) => Exit.hasInterrupts(exit) ? Effect.void : closeOpenCalls(chat, startSeq)), Effect.provideService(TurnTools, Option.some(provide(options.registration.builtins, options.services))), Effect.provideContext(options.services), Effect.matchCauseEffect({
 		onSuccess: Effect.fnUntraced(function* () {
 			const all = yield* chat.entries;
-			yield* finishTurn(chat, handledThrough(all, startSeq), options.registration.definition.app.wakes);
+			yield* finishTurn(chat, handledThrough(all, startSeq), yield* Ref.get(ranLoop));
 		}),
 		onFailure: (cause) => failTurn(chat, cause)
 	}));

package/dist/internal/turns.js.map

@@ -1 +1 @@
-{"version":3,"file":"turns.js","names":["Decision.kind","Decision.block","Toolkits.merge","Tools.makeMessaging","Specialists.toolkit","History.fromEntries","AppEvents.read","Decisions.approvedCalls","History.unansweredCalls","History.mayHaveRunOutput","History.notRunOutput","AssistantEvent.isLibraryEvent","History.owesReply","History.unreadAfter","AppEvents.decodeEntries","Instructions.protocol","History.owesDelivery","Loop.run","Toolkits.runOnly","Tools.sendUserMessageName","Tools.waitToolName","History.userText","Skill.withCatalog","Skills.toTools","Toolkits.fromToolkitOrEmpty","Toolkits.duplicateNames","Telemetry.agentInput","History.unhandledInputs","Telemetry.currentTraceId","Loop.TurnTools","Toolkits.provide","Telemetry.agentOutput","Telemetry.agentSpan"],"sources":["../../src/internal/turns.ts"],"sourcesContent":["import type * as LanguageModel from \"effect/ai/LanguageModel\"\nimport type * as Tool from \"effect/ai/Tool\"\nimport type * as Prompt from \"effect/ai/Prompt\"\nimport * as Cause from \"effect/Cause\"\nimport * as Context from \"effect/Context\"\nimport * as Effect from \"effect/Effect\"\nimport * as Exit from \"effect/Exit\"\nimport { identity } from \"effect/Function\"\nimport * as Option from \"effect/Option\"\nimport * as Predicate from \"effect/Predicate\"\nimport * as Schema from \"effect/Schema\"\nimport type * as Scope from \"effect/Scope\"\nimport * as Stream from \"effect/Stream\"\nimport type * as Assistant from \"../Assistant.ts\"\nimport type { ChatId } from \"../ChatId.ts\"\nimport * as AssistantEvent from \"../AssistantEvent.ts\"\nimport type * as AssistantLoop from \"../AssistantLoop.ts\"\nimport * as Loop from \"./loop.ts\"\nimport type * as BlockKit from \"../BlockKit.ts\"\nimport type { CurrentChat } from \"../CurrentChat.ts\"\nimport * as Decision from \"../Decision.ts\"\nimport * as Instructions from \"../Instructions.ts\"\nimport * as Skill from \"../Skill.ts\"\nimport * as Skills from \"./skills.ts\"\nimport type * as Specialist from \"../Specialist.ts\"\nimport * as Decisions from \"./decisions.ts\"\nimport * as AppEvents from \"./events.ts\"\nimport * as History from \"./history.ts\"\nimport { mapText } from \"./instructions.ts\"\nimport { toJsonText } from \"./schema.ts\"\nimport * as Specialists from \"./specialists.ts\"\nimport * as Telemetry from \"./telemetry.ts\"\nimport * as Toolkits from \"./toolkit.ts\"\nimport type { Writer } from \"./writer.ts\"\nimport * as Tools from \"./tools.ts\"\n\n/** @internal */\nexport const silentTurnMessage = \"I finished without sending a reply.\"\n\n/** @internal */\nexport const defaultReplyNudge =\n  \"You haven't replied to the user's latest message yet. Reply now with send_user_message.\"\n\n/** @internal */\nexport const deliveryNudge =\n  \"You told the user you're on it, but stopped without giving them the result. Send it now with send_user_message; if part of it is still running, say what and that you'll report back. If they already have everything, call wait.\"\n\n/** @internal */\nexport interface Definition {\n  readonly name: string\n  readonly blocks: BlockKit.BlockKit | undefined\n  readonly specialists: ReadonlyArray<Specialist.Any>\n  readonly app: AppEvents.AppEvents\n}\n\n// Once its build ran the layer's services are provided, so its streams need only what a turn provides.\n/** @internal */\nexport type TurnHandler = (\n  turn: Assistant.Turn<any>\n) => Stream.Stream<AssistantLoop.Event, unknown, Assistant.TurnServices | LanguageModel.LanguageModel>\n\n// The chat `CurrentChat` gives, with its entries typed as the assistant's decode returns them: the assistant's typed\n// chat is this one, so it needs no check of its own.\n/** @internal */\nexport interface TypedChat {\n  readonly chatId: ChatId\n  readonly entries: Effect.Effect<AppEvents.DecodedEntries>\n  readonly append: CurrentChat[\"Service\"][\"append\"]\n}\n\n/** @internal */\nexport interface Registration {\n  readonly definition: Definition\n  readonly model: Context.Context<LanguageModel.LanguageModel>\n  readonly open: (chat: TypedChat) => Effect.Effect<TurnHandler, never, Scope.Scope | CurrentChat>\n  readonly specialists: ReadonlyArray<{\n    readonly specialist: Specialist.Any\n    readonly built: Specialist.Built\n  }>\n  readonly builtins: Toolkits.Tools<Assistant.TurnServices>\n}\n\n/** @internal */\nexport const register = Effect.fnUntraced(function* (\n  definition: Definition,\n  options: { readonly open: Registration[\"open\"] }\n) {\n  const model = yield* Effect.context<LanguageModel.LanguageModel>()\n\n  const decisionBlock = definition.blocks?.byKind.get(Decision.kind)\n\n  if (decisionBlock !== undefined && decisionBlock !== Decision.block) {\n    return yield* Effect.die(`The ${Decision.kind} block kind is the library's: use Decision.block.`)\n  }\n\n  const specialists = yield* Effect.forEach(\n    definition.specialists,\n    Effect.fnUntraced(function* (specialist) {\n      const built = yield* Effect.serviceOption(specialist.Handler)\n\n      if (Option.isNone(built)) {\n        return yield* Effect.die(\n          `No handler for the ${specialist.name} specialist: provide ${specialist.name}.toLayer.`\n        )\n      }\n\n      return { specialist, built: built.value }\n    })\n  )\n\n  const builtins = Toolkits.merge(\n    yield* Tools.makeMessaging(definition.blocks),\n    yield* Specialists.toolkit(definition.specialists)\n  )\n\n  const registration: Registration = {\n    definition,\n    model,\n    open: options.open,\n    specialists,\n    builtins\n  }\n\n  return registration\n})\n\nconst ProviderError = Schema.Struct({ _tag: Schema.optional(Schema.String), raw: Schema.Unknown })\n\n// Provider errors keep their response body.\nconst failureMessage = (cause: Cause.Cause<unknown>): string =>\n  Option.match(Schema.decodeUnknownOption(ProviderError)(Cause.squash(cause)), {\n    onNone: () => Cause.pretty(cause),\n    onSome: ({ _tag, raw }) => `${_tag ?? \"Error\"}: ${Predicate.isString(raw) ? raw : toJsonText(raw)}`\n  })\n\nconst lastSeq = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, otherwise: number) => entries.at(-1)?.seq ?? otherwise\n\nconst toHistory = (\n  viewed: ReadonlyArray<Assistant.Entry<any> | Prompt.Message>,\n  app: AppEvents.AppEvents\n): ReadonlyArray<Prompt.Message> => {\n  const out: Array<Prompt.Message> = []\n  let run: Array<AssistantEvent.AnyEntry> = []\n\n  const flush = () => {\n    out.push(...History.fromEntries(run, (event) => AppEvents.read(app, event)))\n    run = []\n  }\n\n  for (const item of viewed) {\n    if (isEntry(item)) run.push(item)\n    else {\n      flush()\n      out.push(item)\n    }\n  }\n\n  flush()\n\n  return out\n}\n\nconst isEntry = (item: Assistant.Entry<any> | Prompt.Message): item is Assistant.Entry<any> =>\n  Predicate.hasProperty(item, \"seq\")\n\n// The handler's stream can end between a step's output and its tools, or while they run. An interrupted turn (a\n// shutdown) leaves its calls open instead: the next turn runs them again.\nconst closeOpenCalls = Effect.fnUntraced(function* (chat: Writer, startSeq: number) {\n  const entries = (yield* chat.entries).filter(({ seq }) => seq > startSeq)\n\n  const started = new Set(\n    entries.flatMap(({ event }) => (Predicate.isTagged(event, \"ToolStarted\") ? [event.callId] : []))\n  )\n\n  // Approved calls this turn started that have no result are cut off like any other; one not started yet waits.\n  const all = yield* chat.entries\n  const approved = Decisions.approvedCalls(all).filter((call) => started.has(call.id))\n  const open = [...History.unansweredCalls(History.fromEntries(entries, () => undefined)), ...approved]\n\n  if (open.length === 0) return\n\n  yield* chat.append(\n    open.map((call) =>\n      AssistantEvent.ToolResult.make({\n        callId: call.id,\n        tool: call.name,\n        outcome: \"failure\",\n        ...(started.has(call.id)\n          ? { result: History.mayHaveRunOutput, reason: \"MayHaveRun\" }\n          : { result: History.notRunOutput, reason: \"NotRun\" })\n      })\n    )\n  )\n})\n\n// The inputs before the turn's `TurnStarted` (at `startSeq`) woke it; past that, what its model outputs record\n// reading.\nconst handledThrough = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, startSeq: number) =>\n  entries.reduce(\n    (through, { seq, event }) =>\n      seq > startSeq &&\n      AssistantEvent.isLibraryEvent(event) &&\n      Predicate.isTagged(event, \"ModelOutput\") &&\n      event.seenThroughSeq !== undefined\n        ? Math.max(through, event.seenThroughSeq)\n        : through,\n    startSeq\n  )\n\n// Fails visibly when the user's latest input got no reply; an input that arrived after what its model read gets the\n// next turn, which replies.\nconst finishTurn = Effect.fnUntraced(function* (chat: Writer, read: number, wakes: ReadonlySet<string>) {\n  const entries = yield* chat.entries\n\n  const end =\n    History.owesReply(entries, read) && !History.unreadAfter(entries, read, wakes)\n      ? AssistantEvent.TurnFailed.make({ throughSeq: read, message: silentTurnMessage })\n      : AssistantEvent.TurnCompleted.make({ throughSeq: read })\n\n  yield* chat.append([end])\n})\n\n// Everything stored so far counts as read, so a failing input isn't retried forever.\nconst failTurn = Effect.fnUntraced(function* (chat: Writer, cause: Cause.Cause<unknown>) {\n  yield* Effect.logError(\"assistant turn failed\", cause)\n\n  const last = lastSeq(yield* chat.entries, 0)\n\n  yield* chat.append([AssistantEvent.TurnFailed.make({ throughSeq: last, message: failureMessage(cause) })])\n})\n\nconst makeTurnApi = (\n  registration: Registration,\n  chat: Writer,\n  startSeq: number,\n  checkOpen: Effect.Effect<void>\n): Assistant.Turn<any> => {\n  const { definition, builtins } = registration\n  const { app } = definition\n\n  // With how far into the chat it goes: the step records it on the model's output.\n  // Read before every model call: a chat the app deleted meanwhile stops here.\n  const history = Effect.fnUntraced(function* (view: Assistant.HistoryView<any> = identity) {\n    yield* checkOpen\n\n    const all = yield* chat.entries\n\n    const read: AssistantLoop.ChatHistory = {\n      messages: toHistory(view(AppEvents.decodeEntries(app, all)), app),\n      throughSeq: lastSeq(all, startSeq)\n    }\n\n    return read\n  })\n\n  const instructions = (given: string | Instructions.Resolved) =>\n    mapText(given, (text) => `${Instructions.protocol}\\n\\n${text}`)\n\n  // The loop's own prompt and tools, so the prompt stays cached, with the nudge at the end.\n  const replyPass = <R>(options: {\n    readonly instructions: Instructions.Resolved\n    readonly toolkit: Toolkits.Tools<R>\n    readonly view: Assistant.HistoryView<any>\n    readonly nudge: string | undefined\n  }) =>\n    Stream.unwrap(\n      Effect.gen(function* () {\n        const all = yield* chat.entries\n        const through = handledThrough(all, startSeq)\n\n        // Something arrived after what the loop's model read: the next turn reads it with the full loop, and replies.\n        if (History.unreadAfter(all, through, app.wakes)) return Stream.empty\n\n        const owed = History.owesReply(all, through)\n        const undelivered = !owed && History.owesDelivery(all, through)\n\n        if (!owed && !undelivered) return Stream.empty\n\n        const nudge = undelivered ? deliveryNudge : (options.nudge ?? defaultReplyNudge)\n\n        return Loop.run({\n          instructions: options.instructions,\n          // A reply that's owed can only be sent; a result it may have given may also be for nobody.\n          toolkit: Toolkits.runOnly(\n            options.toolkit,\n            owed ? [Tools.sendUserMessageName] : [Tools.sendUserMessageName, Tools.waitToolName],\n            \"Not now: reply to the user with send_user_message.\"\n          ),\n          history: Effect.gen(function* () {\n            yield* checkOpen\n\n            const entries = yield* chat.entries\n\n            return {\n              messages: [\n                ...toHistory(options.view(AppEvents.decodeEntries(app, entries)), app),\n                History.userText(nudge)\n              ],\n              throughSeq: lastSeq(entries, startSeq)\n            }\n          }),\n          // A second step, for a reply after a call it was refused.\n          maxSteps: 2\n        })\n      })\n    )\n\n  const replyIfOwed = (options: Assistant.ReplyOptions) =>\n    replyPass({\n      instructions: instructions(options.instructions),\n      toolkit: builtins,\n      view: identity,\n      nudge: options.nudge\n    })\n\n  const prepare = <T extends Record<string, Tool.Any>, RS>(options: Assistant.LoopOptions<T, RS, any>) => {\n    const skills = options.skills ?? []\n\n    return {\n      system: mapText(instructions(options.instructions), (text) => Skill.withCatalog(text, skills)),\n      toolkit: Toolkits.merge(\n        Toolkits.merge(builtins, Skills.toTools(skills)),\n        Toolkits.fromToolkitOrEmpty(options.toolkit)\n      ),\n      view: options.history ?? identity\n    }\n  }\n\n  return {\n    chatId: chat.chatId,\n    history,\n    instructions,\n    replyIfOwed,\n    loop: (options) => {\n      const { system, toolkit, view } = prepare(options)\n      const twice = Toolkits.duplicateNames(toolkit)\n\n      const deciding = toolkit.definitions.filter(\n        (tool) => tool.needsApproval !== undefined && tool.needsApproval !== false\n      )\n\n      const loop =\n        twice.length > 0\n          ? Stream.die(`Tool names used twice, like one named after a built-in: ${twice.join(\", \")}`)\n          : deciding.length > 0 && definition.blocks?.byKind.get(Decision.kind) === undefined\n            ? Stream.die(\n                `${deciding.map((tool) => tool.name).join(\", \")} can wait for the user's decision: add Decision.block to the assistant's blocks.`\n              )\n            : Loop.run({\n                instructions: system,\n                toolkit,\n                history: history(view),\n                maxSteps: options.maxSteps ?? 16\n              })\n\n      return Stream.concat(loop, replyPass({ instructions: system, toolkit, view, nudge: options.replyNudge }))\n    }\n  }\n}\n\n// Every event the handler's loop emits is recorded before the loop is pulled again.\n/** @internal */\nexport const run = Effect.fnUntraced(\n  function* (options: {\n    readonly registration: Registration\n    readonly handler: TurnHandler\n    readonly chat: Writer\n    readonly services: Context.Context<Assistant.TurnServices | LanguageModel.LanguageModel>\n    // A chat the app deleted is deleted here, and the turn stops.\n    readonly checkOpen: Effect.Effect<void>\n  }) {\n    const { chat } = options\n    const before = yield* chat.entries\n\n    yield* Telemetry.agentInput(History.unhandledInputs(before, options.registration.definition.app.wakes))\n\n    const assistant = options.registration.definition.name\n    const traceId = yield* Telemetry.currentTraceId\n\n    const started = yield* chat.append([\n      AssistantEvent.TurnStarted.make(\n        Option.match(traceId, {\n          onNone: () => ({ assistant }),\n          onSome: (id) => ({ assistant, traceId: id })\n        })\n      )\n    ])\n\n    const startSeq = lastSeq(started, 0)\n    const turn = makeTurnApi(options.registration, chat, startSeq, options.checkOpen)\n\n    const record = (event: AssistantLoop.Event) => chat.append([event])\n\n    yield* options.handler(turn).pipe(\n      Stream.runForEach(record),\n      Effect.onExit((exit) => (Exit.hasInterrupts(exit) ? Effect.void : closeOpenCalls(chat, startSeq))),\n      // A loop the app writes gets the assistant's own tools too, with this turn's services.\n      Effect.provideService(\n        Loop.TurnTools,\n        Option.some(Toolkits.provide(options.registration.builtins, options.services))\n      ),\n      Effect.provideContext(options.services),\n      Effect.matchCauseEffect({\n        onSuccess: Effect.fnUntraced(function* () {\n          const all = yield* chat.entries\n\n          yield* finishTurn(chat, handledThrough(all, startSeq), options.registration.definition.app.wakes)\n        }),\n        onFailure: (cause) => failTurn(chat, cause)\n      })\n    )\n\n    // The trace's output is what the user saw this turn, and a failure if any.\n    const shown = (yield* chat.entries).flatMap(({ event, seq }) =>\n      seq > startSeq && (Predicate.isTagged(event, \"AssistantMessage\") || Predicate.isTagged(event, \"TurnFailed\"))\n        ? [event]\n        : []\n    )\n\n    yield* Telemetry.agentOutput(shown)\n  },\n  (effect, options) =>\n    effect.pipe(\n      Telemetry.agentSpan(options.registration.definition.name, {\n        chatId: options.chat.chatId,\n        root: true\n      })\n    )\n)\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAqCA,MAAa,oBAAoB;;AAGjC,MAAa,oBACX;;AAGF,MAAa,gBACX;;AAsCF,MAAa,WAAW,OAAO,WAAW,WACxC,YACA,SACA;CACA,MAAM,QAAQ,OAAO,OAAO,QAAqC;CAEjE,MAAM,gBAAgB,WAAW,QAAQ,OAAO,IAAIA,IAAa;CAEjE,IAAI,kBAAkB,KAAA,KAAa,kBAAkBC,OACnD,OAAO,OAAO,OAAO,IAAI,OAAOD,KAAc,kDAAkD;CAGlG,MAAM,cAAc,OAAO,OAAO,QAChC,WAAW,aACX,OAAO,WAAW,WAAW,YAAY;EACvC,MAAM,QAAQ,OAAO,OAAO,cAAc,WAAW,OAAO;EAE5D,IAAI,OAAO,OAAO,KAAK,GACrB,OAAO,OAAO,OAAO,IACnB,sBAAsB,WAAW,KAAK,uBAAuB,WAAW,KAAK,UAC/E;EAGF,OAAO;GAAE;GAAY,OAAO,MAAM;EAAM;CAC1C,CAAC,CACH;CAEA,MAAM,WAAWE,MACf,OAAOC,cAAoB,WAAW,MAAM,GAC5C,OAAOC,QAAoB,WAAW,WAAW,CACnD;CAUA,OAAO;EAPL;EACA;EACA,MAAM,QAAQ;EACd;EACA;CAGgB;AACpB,CAAC;AAED,MAAM,gBAAgB,OAAO,OAAO;CAAE,MAAM,OAAO,SAAS,OAAO,MAAM;CAAG,KAAK,OAAO;AAAQ,CAAC;AAGjG,MAAM,kBAAkB,UACtB,OAAO,MAAM,OAAO,oBAAoB,aAAa,CAAC,CAAC,MAAM,OAAO,KAAK,CAAC,GAAG;CAC3E,cAAc,MAAM,OAAO,KAAK;CAChC,SAAS,EAAE,MAAM,UAAU,GAAG,QAAQ,QAAQ,IAAI,UAAU,SAAS,GAAG,IAAI,MAAM,WAAW,GAAG;AAClG,CAAC;AAEH,MAAM,WAAW,SAAiD,cAAsB,QAAQ,GAAG,EAAE,CAAC,EAAE,OAAO;AAE/G,MAAM,aACJ,QACA,QACkC;CAClC,MAAM,MAA6B,CAAC;CACpC,IAAI,MAAsC,CAAC;CAE3C,MAAM,cAAc;EAClB,IAAI,KAAK,GAAGC,YAAoB,MAAM,UAAUC,KAAe,KAAK,KAAK,CAAC,CAAC;EAC3E,MAAM,CAAC;CACT;CAEA,KAAK,MAAM,QAAQ,QACjB,IAAI,QAAQ,IAAI,GAAG,IAAI,KAAK,IAAI;MAC3B;EACH,MAAM;EACN,IAAI,KAAK,IAAI;CACf;CAGF,MAAM;CAEN,OAAO;AACT;AAEA,MAAM,WAAW,SACf,UAAU,YAAY,MAAM,KAAK;AAInC,MAAM,iBAAiB,OAAO,WAAW,WAAW,MAAc,UAAkB;CAClF,MAAM,WAAW,OAAO,KAAK,QAAA,CAAS,QAAQ,EAAE,UAAU,MAAM,QAAQ;CAExE,MAAM,UAAU,IAAI,IAClB,QAAQ,SAAS,EAAE,YAAa,UAAU,SAAS,OAAO,aAAa,IAAI,CAAC,MAAM,MAAM,IAAI,CAAC,CAAE,CACjG;CAGA,MAAM,MAAM,OAAO,KAAK;CACxB,MAAM,WAAWC,cAAwB,GAAG,CAAC,CAAC,QAAQ,SAAS,QAAQ,IAAI,KAAK,EAAE,CAAC;CACnF,MAAM,OAAO,CAAC,GAAGC,gBAAwBH,YAAoB,eAAe,KAAA,CAAS,CAAC,GAAG,GAAG,QAAQ;CAEpG,IAAI,KAAK,WAAW,GAAG;CAEvB,OAAO,KAAK,OACV,KAAK,KAAK,SAAA,WACkB,KAAK;EAC7B,QAAQ,KAAK;EACb,MAAM,KAAK;EACX,SAAS;EACT,GAAI,QAAQ,IAAI,KAAK,EAAE,IACnB;GAAE,QAAQI;GAA0B,QAAQ;EAAa,IACzD;GAAE,QAAQC;GAAsB,QAAQ;EAAS;CACvD,CAAC,CACH,CACF;AACF,CAAC;AAID,MAAM,kBAAkB,SAAiD,aACvE,QAAQ,QACL,SAAS,EAAE,KAAK,YACf,MAAM,YACNC,eAA8B,KAAK,KACnC,UAAU,SAAS,OAAO,aAAa,KACvC,MAAM,mBAAmB,KAAA,IACrB,KAAK,IAAI,SAAS,MAAM,cAAc,IACtC,SACN,QACF;AAIF,MAAM,aAAa,OAAO,WAAW,WAAW,MAAc,MAAc,OAA4B;CACtG,MAAM,UAAU,OAAO,KAAK;CAE5B,MAAM,MACJC,UAAkB,SAAS,IAAI,KAAK,CAACC,YAAoB,SAAS,MAAM,KAAK,IAAA,WAC/C,KAAK;EAAE,YAAY;EAAM,SAAS;CAAkB,CAAC,IAAA,cAClD,KAAK,EAAE,YAAY,KAAK,CAAC;CAE5D,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC;AAC1B,CAAC;AAGD,MAAM,WAAW,OAAO,WAAW,WAAW,MAAc,OAA6B;CACvF,OAAO,OAAO,SAAS,yBAAyB,KAAK;CAErD,MAAM,OAAO,QAAQ,OAAO,KAAK,SAAS,CAAC;CAE3C,OAAO,KAAK,OAAO,CAAA,WAA2B,KAAK;EAAE,YAAY;EAAM,SAAS,eAAe,KAAK;CAAE,CAAC,CAAC,CAAC;AAC3G,CAAC;AAED,MAAM,eACJ,cACA,MACA,UACA,cACwB;CACxB,MAAM,EAAE,YAAY,aAAa;CACjC,MAAM,EAAE,QAAQ;CAIhB,MAAM,UAAU,OAAO,WAAW,WAAW,OAAmC,UAAU;EACxF,OAAO;EAEP,MAAM,MAAM,OAAO,KAAK;EAOxB,OAAO;GAJL,UAAU,UAAU,KAAKC,cAAwB,KAAK,GAAG,CAAC,GAAG,GAAG;GAChE,YAAY,QAAQ,KAAK,QAAQ;EAGzB;CACZ,CAAC;CAED,MAAM,gBAAgB,UACpB,QAAQ,QAAQ,SAAS,GAAGC,SAAsB,MAAM,MAAM;CAGhE,MAAM,aAAgB,YAMpB,OAAO,OACL,OAAO,IAAI,aAAa;EACtB,MAAM,MAAM,OAAO,KAAK;EACxB,MAAM,UAAU,eAAe,KAAK,QAAQ;EAG5C,IAAIF,YAAoB,KAAK,SAAS,IAAI,KAAK,GAAG,OAAO,OAAO;EAEhE,MAAM,OAAOD,UAAkB,KAAK,OAAO;EAC3C,MAAM,cAAc,CAAC,QAAQI,aAAqB,KAAK,OAAO;EAE9D,IAAI,CAAC,QAAQ,CAAC,aAAa,OAAO,OAAO;EAEzC,MAAM,QAAQ,cAAc,gBAAiB,QAAQ,SAAA;EAErD,OAAOC,MAAS;GACd,cAAc,QAAQ;GAEtB,SAASC,QACP,QAAQ,SACR,OAAO,CAACC,mBAAyB,IAAI,CAACA,qBAA2BC,YAAkB,GACnF,oDACF;GACA,SAAS,OAAO,IAAI,aAAa;IAC/B,OAAO;IAEP,MAAM,UAAU,OAAO,KAAK;IAE5B,OAAO;KACL,UAAU,CACR,GAAG,UAAU,QAAQ,KAAKN,cAAwB,KAAK,OAAO,CAAC,GAAG,GAAG,GACrEO,SAAiB,KAAK,CACxB;KACA,YAAY,QAAQ,SAAS,QAAQ;IACvC;GACF,CAAC;GAED,UAAU;EACZ,CAAC;CACH,CAAC,CACH;CAEF,MAAM,eAAe,YACnB,UAAU;EACR,cAAc,aAAa,QAAQ,YAAY;EAC/C,SAAS;EACT,MAAM;EACN,OAAO,QAAQ;CACjB,CAAC;CAEH,MAAM,WAAmD,YAA+C;EACtG,MAAM,SAAS,QAAQ,UAAU,CAAC;EAElC,OAAO;GACL,QAAQ,QAAQ,aAAa,QAAQ,YAAY,IAAI,SAASC,YAAkB,MAAM,MAAM,CAAC;GAC7F,SAASpB,MACPA,MAAe,UAAUqB,QAAe,MAAM,CAAC,GAC/CC,mBAA4B,QAAQ,OAAO,CAC7C;GACA,MAAM,QAAQ,WAAW;EAC3B;CACF;CAEA,OAAO;EACL,QAAQ,KAAK;EACb;EACA;EACA;EACA,OAAO,YAAY;GACjB,MAAM,EAAE,QAAQ,SAAS,SAAS,QAAQ,OAAO;GACjD,MAAM,QAAQC,eAAwB,OAAO;GAE7C,MAAM,WAAW,QAAQ,YAAY,QAClC,SAAS,KAAK,kBAAkB,KAAA,KAAa,KAAK,kBAAkB,KACvE;GAEA,MAAM,OACJ,MAAM,SAAS,IACX,OAAO,IAAI,2DAA2D,MAAM,KAAK,IAAI,GAAG,IACxF,SAAS,SAAS,KAAK,WAAW,QAAQ,OAAO,IAAI,UAAa,MAAM,KAAA,IACtE,OAAO,IACL,GAAG,SAAS,KAAK,SAAS,KAAK,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,iFAClD,IACAR,MAAS;IACP,cAAc;IACd;IACA,SAAS,QAAQ,IAAI;IACrB,UAAU,QAAQ,YAAY;GAChC,CAAC;GAET,OAAO,OAAO,OAAO,MAAM,UAAU;IAAE,cAAc;IAAQ;IAAS;IAAM,OAAO,QAAQ;GAAW,CAAC,CAAC;EAC1G;CACF;AACF;;AAIA,MAAa,MAAM,OAAO,WACxB,WAAW,SAOR;CACD,MAAM,EAAE,SAAS;CACjB,MAAM,SAAS,OAAO,KAAK;CAE3B,OAAOS,WAAqBC,gBAAwB,QAAQ,QAAQ,aAAa,WAAW,IAAI,KAAK,CAAC;CAEtG,MAAM,YAAY,QAAQ,aAAa,WAAW;CAClD,MAAM,UAAU,OAAOC;CAEvB,MAAM,UAAU,OAAO,KAAK,OAAO,CAAA,YACN,KACzB,OAAO,MAAM,SAAS;EACpB,eAAe,EAAE,UAAU;EAC3B,SAAS,QAAQ;GAAE;GAAW,SAAS;EAAG;CAC5C,CAAC,CACH,CACF,CAAC;CAED,MAAM,WAAW,QAAQ,SAAS,CAAC;CACnC,MAAM,OAAO,YAAY,QAAQ,cAAc,MAAM,UAAU,QAAQ,SAAS;CAEhF,MAAM,UAAU,UAA+B,KAAK,OAAO,CAAC,KAAK,CAAC;CAElE,OAAO,QAAQ,QAAQ,IAAI,CAAC,CAAC,KAC3B,OAAO,WAAW,MAAM,GACxB,OAAO,QAAQ,SAAU,KAAK,cAAc,IAAI,IAAI,OAAO,OAAO,eAAe,MAAM,QAAQ,CAAE,GAEjG,OAAO,eACLC,WACA,OAAO,KAAKC,QAAiB,QAAQ,aAAa,UAAU,QAAQ,QAAQ,CAAC,CAC/E,GACA,OAAO,eAAe,QAAQ,QAAQ,GACtC,OAAO,iBAAiB;EACtB,WAAW,OAAO,WAAW,aAAa;GACxC,MAAM,MAAM,OAAO,KAAK;GAExB,OAAO,WAAW,MAAM,eAAe,KAAK,QAAQ,GAAG,QAAQ,aAAa,WAAW,IAAI,KAAK;EAClG,CAAC;EACD,YAAY,UAAU,SAAS,MAAM,KAAK;CAC5C,CAAC,CACH;CAGA,MAAM,SAAS,OAAO,KAAK,QAAA,CAAS,SAAS,EAAE,OAAO,UACpD,MAAM,aAAa,UAAU,SAAS,OAAO,kBAAkB,KAAK,UAAU,SAAS,OAAO,YAAY,KACtG,CAAC,KAAK,IACN,CAAC,CACP;CAEA,OAAOC,YAAsB,KAAK;AACpC,IACC,QAAQ,YACP,OAAO,KACLC,UAAoB,QAAQ,aAAa,WAAW,MAAM;CACxD,QAAQ,QAAQ,KAAK;CACrB,MAAM;AACR,CAAC,CACH,CACJ"}
+{"version":3,"file":"turns.js","names":["Toolkits.merge","Tools.makeMessaging","Specialists.toolkit","History.unansweredCalls","History.fromEntries","History.mayHaveRunOutput","History.notRunOutput","AssistantEvent.isLibraryEvent","History.owesReply","History.unreadAfter","AppEvents.decodeEntries","Instructions.protocol","History.owesDelivery","Loop.run","Toolkits.runOnly","Tools.sendUserMessageName","Tools.waitToolName","History.userText","Toolkits.fromToolkitOrEmpty","Skills.available","Skill.withCatalog","Skills.toTools","Toolkits.duplicateNames","Telemetry.agentInput","History.unhandledInputs","Telemetry.currentTraceId","Loop.TurnTools","Toolkits.provide","Telemetry.agentOutput","Telemetry.agentSpan"],"sources":["../../src/internal/turns.ts"],"sourcesContent":["import type * as LanguageModel from \"effect/ai/LanguageModel\"\nimport type * as Tool from \"effect/ai/Tool\"\nimport * as Cause from \"effect/Cause\"\nimport * as Context from \"effect/Context\"\nimport * as Effect from \"effect/Effect\"\nimport * as Exit from \"effect/Exit\"\nimport { identity } from \"effect/Function\"\nimport * as Option from \"effect/Option\"\nimport * as Predicate from \"effect/Predicate\"\nimport * as Ref from \"effect/Ref\"\nimport * as Schema from \"effect/Schema\"\nimport type * as Scope from \"effect/Scope\"\nimport * as Stream from \"effect/Stream\"\nimport type * as Assistant from \"../Assistant.ts\"\nimport type { ChatId } from \"../ChatId.ts\"\nimport * as AssistantEvent from \"../AssistantEvent.ts\"\nimport type * as AssistantLoop from \"../AssistantLoop.ts\"\nimport * as Loop from \"./loop.ts\"\nimport type * as BlockKit from \"../BlockKit.ts\"\nimport type { CurrentChat } from \"../CurrentChat.ts\"\nimport * as Instructions from \"../Instructions.ts\"\nimport * as Skill from \"../Skill.ts\"\nimport * as Skills from \"./skills.ts\"\nimport type * as Specialist from \"../Specialist.ts\"\nimport * as AppEvents from \"./events.ts\"\nimport * as History from \"./history.ts\"\nimport { mapText } from \"./instructions.ts\"\nimport { toJsonText } from \"./schema.ts\"\nimport * as Specialists from \"./specialists.ts\"\nimport * as Telemetry from \"./telemetry.ts\"\nimport * as Toolkits from \"./toolkit.ts\"\nimport type { Writer } from \"./writer.ts\"\nimport * as Tools from \"./tools.ts\"\n\n/** @internal */\nexport const silentTurnMessage = \"I finished without sending a reply.\"\n\n/** @internal */\nexport const defaultReplyNudge =\n  \"You haven't replied to the user's latest message yet. Reply now with send_user_message.\"\n\n/** @internal */\nexport const deliveryNudge =\n  \"You told the user you're on it, but stopped without giving them the result. Send it now with send_user_message; if part of it is still running, say what and that you'll report back. If they already have everything, call wait.\"\n\n/** @internal */\nexport interface Definition {\n  readonly name: string\n  readonly blocks: BlockKit.BlockKit | undefined\n  readonly specialists: ReadonlyArray<Specialist.Any>\n  readonly app: AppEvents.AppEvents\n}\n\n// Once its build ran the layer's services are provided, so its streams need only what a turn provides.\n/** @internal */\nexport type TurnHandler = (\n  turn: Assistant.Turn<any>\n) => Stream.Stream<AssistantLoop.Event, unknown, Assistant.TurnServices | LanguageModel.LanguageModel>\n\n// The chat `CurrentChat` gives, with its entries typed as the assistant's decode returns them: the assistant's typed\n// chat is this one, so it needs no check of its own.\n/** @internal */\nexport interface TypedChat {\n  readonly chatId: ChatId\n  readonly entries: Effect.Effect<AppEvents.DecodedEntries>\n  readonly append: CurrentChat[\"Service\"][\"append\"]\n}\n\n/** @internal */\nexport interface Registration {\n  readonly definition: Definition\n  readonly model: Context.Context<LanguageModel.LanguageModel>\n  readonly open: (chat: TypedChat) => Effect.Effect<TurnHandler, never, Scope.Scope | CurrentChat>\n  readonly specialists: ReadonlyArray<{\n    readonly specialist: Specialist.Any\n    readonly built: Specialist.Built\n  }>\n  readonly builtins: Toolkits.Tools<Assistant.TurnServices>\n}\n\n/** @internal */\nexport const register = Effect.fnUntraced(function* (\n  definition: Definition,\n  options: { readonly open: Registration[\"open\"] }\n) {\n  const model = yield* Effect.context<LanguageModel.LanguageModel>()\n\n  const specialists = yield* Effect.forEach(\n    definition.specialists,\n    Effect.fnUntraced(function* (specialist) {\n      const built = yield* Effect.serviceOption(specialist.Handler)\n\n      if (Option.isNone(built)) {\n        return yield* Effect.die(\n          `No handler for the ${specialist.name} specialist: provide ${specialist.name}.toLayer.`\n        )\n      }\n\n      return { specialist, built: built.value }\n    })\n  )\n\n  const builtins = Toolkits.merge(\n    yield* Tools.makeMessaging(definition.blocks),\n    yield* Specialists.toolkit(definition.specialists)\n  )\n\n  const registration: Registration = {\n    definition,\n    model,\n    open: options.open,\n    specialists,\n    builtins\n  }\n\n  return registration\n})\n\nconst ProviderError = Schema.Struct({ _tag: Schema.optional(Schema.String), raw: Schema.Unknown })\n\n// Provider errors keep their response body.\nconst failureMessage = (cause: Cause.Cause<unknown>): string =>\n  Option.match(Schema.decodeUnknownOption(ProviderError)(Cause.squash(cause)), {\n    onNone: () => Cause.pretty(cause),\n    onSome: ({ _tag, raw }) => `${_tag ?? \"Error\"}: ${Predicate.isString(raw) ? raw : toJsonText(raw)}`\n  })\n\nconst lastSeq = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, otherwise: number) => entries.at(-1)?.seq ?? otherwise\n\n// The handler's stream can end between a step's output and its tools, or while they run. An interrupted turn (a\n// shutdown) leaves its calls open instead: the next turn runs them again.\nconst closeOpenCalls = Effect.fnUntraced(function* (chat: Writer, startSeq: number) {\n  const entries = (yield* chat.entries).filter(({ seq }) => seq > startSeq)\n\n  const started = new Set(\n    entries.flatMap(({ event }) => (Predicate.isTagged(event, \"ToolStarted\") ? [event.callId] : []))\n  )\n\n  const open = History.unansweredCalls(History.fromEntries(entries))\n\n  if (open.length === 0) return\n\n  yield* chat.append(\n    open.map((call) =>\n      AssistantEvent.ToolResult.make({\n        callId: call.id,\n        tool: call.name,\n        outcome: \"failure\",\n        ...(started.has(call.id)\n          ? { result: History.mayHaveRunOutput, reason: \"MayHaveRun\" }\n          : { result: History.notRunOutput, reason: \"NotRun\" })\n      })\n    )\n  )\n})\n\n// The inputs before the turn's `TurnStarted` (at `startSeq`) woke it; past that, what its model outputs record\n// reading.\nconst handledThrough = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, startSeq: number) =>\n  entries.reduce(\n    (through, { seq, event }) =>\n      seq > startSeq &&\n      AssistantEvent.isLibraryEvent(event) &&\n      Predicate.isTagged(event, \"ModelOutput\") &&\n      event.seenThroughSeq !== undefined\n        ? Math.max(through, event.seenThroughSeq)\n        : through,\n    startSeq\n  )\n\n// A turn that ran the loop fails visibly when the user's latest input got no reply; an input that arrived after what\n// its model read gets the next turn, which replies. A handler that ended without the loop decided that itself.\nconst finishTurn = Effect.fnUntraced(function* (chat: Writer, read: number, ranLoop: boolean) {\n  const entries = yield* chat.entries\n\n  const end =\n    ranLoop && History.owesReply(entries, read) && !History.unreadAfter(entries, read)\n      ? AssistantEvent.TurnFailed.make({ throughSeq: read, message: silentTurnMessage })\n      : AssistantEvent.TurnCompleted.make({ throughSeq: read })\n\n  yield* chat.append([end])\n})\n\n// Everything stored so far counts as read, so a failing input isn't retried forever.\nconst failTurn = Effect.fnUntraced(function* (chat: Writer, cause: Cause.Cause<unknown>) {\n  yield* Effect.logError(\"assistant turn failed\", cause)\n\n  const last = lastSeq(yield* chat.entries, 0)\n\n  yield* chat.append([AssistantEvent.TurnFailed.make({ throughSeq: last, message: failureMessage(cause) })])\n})\n\nconst makeTurnApi = (\n  registration: Registration,\n  chat: Writer,\n  startSeq: number,\n  checkOpen: Effect.Effect<void>,\n  ranLoop: Ref.Ref<boolean>\n): Assistant.Turn<any> => {\n  const { definition, builtins } = registration\n  const { app } = definition\n\n  const running = <A, E, R>(stream: Stream.Stream<A, E, R>) =>\n    Stream.unwrap(Ref.set(ranLoop, true).pipe(Effect.as(stream)))\n\n  // With how far into the chat it goes: the step records it on the model's output.\n  // Read before every model call: a chat the app deleted meanwhile stops here.\n  const history = Effect.fnUntraced(function* (view: Assistant.HistoryView<any> = identity) {\n    yield* checkOpen\n\n    const all = yield* chat.entries\n\n    const read: AssistantLoop.ChatHistory = {\n      messages: History.fromEntries(view(AppEvents.decodeEntries(app, all))),\n      throughSeq: lastSeq(all, startSeq)\n    }\n\n    return read\n  })\n\n  const instructions = (given: string | Instructions.Resolved) =>\n    mapText(given, (text) => `${Instructions.protocol}\\n\\n${text}`)\n\n  // The loop's own prompt and tools, so the prompt stays cached, with the nudge at the end.\n  const replyPass = <R>(options: {\n    readonly instructions: Instructions.Resolved\n    readonly toolkit: Toolkits.Tools<R>\n    readonly view: Assistant.HistoryView<any>\n    readonly nudge: string | undefined\n  }) =>\n    Stream.unwrap(\n      Effect.gen(function* () {\n        const all = yield* chat.entries\n        const through = handledThrough(all, startSeq)\n\n        // Something arrived after what the loop's model read: the next turn reads it with the full loop, and replies.\n        if (History.unreadAfter(all, through)) return Stream.empty\n\n        const owed = History.owesReply(all, through)\n        const undelivered = !owed && History.owesDelivery(all, through)\n\n        if (!owed && !undelivered) return Stream.empty\n\n        const nudge = undelivered ? deliveryNudge : (options.nudge ?? defaultReplyNudge)\n\n        return Loop.run({\n          instructions: options.instructions,\n          // A reply that's owed can only be sent; a result it may have given may also be for nobody.\n          toolkit: Toolkits.runOnly(\n            options.toolkit,\n            owed ? [Tools.sendUserMessageName] : [Tools.sendUserMessageName, Tools.waitToolName],\n            \"Not now: reply to the user with send_user_message.\"\n          ),\n          history: Effect.gen(function* () {\n            yield* checkOpen\n\n            const entries = yield* chat.entries\n\n            return {\n              messages: [\n                ...History.fromEntries(options.view(AppEvents.decodeEntries(app, entries))),\n                History.userText(nudge)\n              ],\n              throughSeq: lastSeq(entries, startSeq)\n            }\n          }),\n          // A second step, for a reply after a call it was refused.\n          maxSteps: 2\n        })\n      })\n    )\n\n  const replyIfOwed = (options: Assistant.ReplyOptions) =>\n    running(\n      replyPass({\n        instructions: instructions(options.instructions),\n        toolkit: builtins,\n        view: identity,\n        nudge: options.nudge\n      })\n    )\n\n  const prepare = <T extends Record<string, Tool.Any>, RS>(options: Assistant.LoopOptions<T, RS, any>) => {\n    const own = Toolkits.fromToolkitOrEmpty(options.toolkit)\n    const skills = Skills.available(options.skills ?? [], [...builtins.definitions, ...own.definitions])\n\n    return {\n      system: mapText(instructions(options.instructions), (text) => Skill.withCatalog(text, skills)),\n      toolkit: Toolkits.merge(Toolkits.merge(builtins, Skills.toTools(skills)), own),\n      view: options.history ?? identity\n    }\n  }\n\n  return {\n    chatId: chat.chatId,\n    history,\n    instructions,\n    replyIfOwed,\n    loop: (options) => {\n      const { system, toolkit, view } = prepare(options)\n      const twice = Toolkits.duplicateNames(toolkit)\n\n      const loop =\n        twice.length > 0\n          ? Stream.die(`Tool names used twice, like one named after a built-in: ${twice.join(\", \")}`)\n          : Loop.run({\n              instructions: system,\n              toolkit,\n              history: history(view),\n              maxSteps: options.maxSteps ?? 16\n            })\n\n      return running(Stream.concat(loop, replyPass({ instructions: system, toolkit, view, nudge: options.replyNudge })))\n    }\n  }\n}\n\n// Every event the handler's loop emits is recorded before the loop is pulled again.\n/** @internal */\nexport const run = Effect.fnUntraced(\n  function* (options: {\n    readonly registration: Registration\n    readonly handler: TurnHandler\n    readonly chat: Writer\n    readonly services: Context.Context<Assistant.TurnServices | LanguageModel.LanguageModel>\n    // A chat the app deleted is deleted here, and the turn stops.\n    readonly checkOpen: Effect.Effect<void>\n  }) {\n    const { chat } = options\n    const before = yield* chat.entries\n\n    yield* Telemetry.agentInput(History.unhandledInputs(before))\n\n    const assistant = options.registration.definition.name\n    const traceId = yield* Telemetry.currentTraceId\n\n    const started = yield* chat.append([\n      AssistantEvent.TurnStarted.make(\n        Option.match(traceId, {\n          onNone: () => ({ assistant }),\n          onSome: (id) => ({ assistant, traceId: id })\n        })\n      )\n    ])\n\n    const startSeq = lastSeq(started, 0)\n    const ranLoop = yield* Ref.make(false)\n    const turn = makeTurnApi(options.registration, chat, startSeq, options.checkOpen, ranLoop)\n\n    const record = (event: AssistantLoop.Event) => chat.append([event])\n\n    yield* options.handler(turn).pipe(\n      Stream.runForEach(record),\n      Effect.onExit((exit) => (Exit.hasInterrupts(exit) ? Effect.void : closeOpenCalls(chat, startSeq))),\n      // A loop the app writes gets the assistant's own tools too, with this turn's services.\n      Effect.provideService(\n        Loop.TurnTools,\n        Option.some(Toolkits.provide(options.registration.builtins, options.services))\n      ),\n      Effect.provideContext(options.services),\n      Effect.matchCauseEffect({\n        onSuccess: Effect.fnUntraced(function* () {\n          const all = yield* chat.entries\n\n          yield* finishTurn(chat, handledThrough(all, startSeq), yield* Ref.get(ranLoop))\n        }),\n        onFailure: (cause) => failTurn(chat, cause)\n      })\n    )\n\n    // The trace's output is what the user saw this turn, and a failure if any.\n    const shown = (yield* chat.entries).flatMap(({ event, seq }) =>\n      seq > startSeq && (Predicate.isTagged(event, \"AssistantMessage\") || Predicate.isTagged(event, \"TurnFailed\"))\n        ? [event]\n        : []\n    )\n\n    yield* Telemetry.agentOutput(shown)\n  },\n  (effect, options) =>\n    effect.pipe(\n      Telemetry.agentSpan(options.registration.definition.name, {\n        chatId: options.chat.chatId,\n        root: true\n      })\n    )\n)\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-assistant",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "A colleague assistant on Effect: an append-only event log per chat, an interruptible agent loop, specialists, skills, and UI blocks",
   "license": "MIT",
   "repository": {
@@ -50,5 +50,6 @@
     "build": "vp pack",
     "test": "vp test run --exclude test/contract.test.ts",
     "test:contract": "vp test run test/contract.test.ts"
-  }
+  },
+  "types": "./dist/index.d.ts"
 }

package/src/Assistant.ts

@@ -24,7 +24,6 @@ import * as Predicate from "effect/Predicate"
 import * as Schema from "effect/Schema"
 import type * as Scope from "effect/Scope"
 import * as Stream from "effect/Stream"
-import type * as AppEvent from "./AppEvent.ts"
 import { AssistantEngine } from "./AssistantEngine.ts"
 import * as AssistantEvent from "./AssistantEvent.ts"
 import type * as AssistantLoop from "./AssistantLoop.ts"
@@ -66,7 +65,8 @@ export interface LoopOptions<T extends Record<string, Tool.Any> = Record<never,
   readonly toolkit?: Toolkit.Toolkit<T> | undefined
   /**
    * Playbooks the model can follow. The prompt lists them as a catalog, and the model loads one
-   * with `load_skill` when a task matches it.
+   * with `load_skill` when a task matches it. A skill made with `tools` is left out when the turn's
+   * tools lack one of them.
    */
   readonly skills?: ReadonlyArray<Skill<RS>> | undefined
   /** The maximum number of model calls per turn. Defaults to 16. */
@@ -75,7 +75,8 @@ export interface LoopOptions<T extends Record<string, Tool.Any> = Record<never,
   readonly replyNudge?: string | undefined
   /**
    * Selects which of the chat's entries the model reads, for example only those since the last
-   * summary. Defaults to all entries.
+   * summary, and maps the app's own events it should read into prompt messages. Defaults to all
+   * entries, without the app's events.
    */
   readonly history?: HistoryView<Events> | undefined
 }
@@ -86,9 +87,43 @@ export interface LoopOptions<T extends Record<string, Tool.Any> = Record<never,
  *
  * **Details**
  *
- * The function receives the chat's entries and returns, in order, a mix of entries and
- * `Prompt.Message`s. The model reads the returned entries the same way it reads the full history,
- * and reads each prompt message unchanged.
+ * The function receives the chat's entries, the app's own events among them, and returns, in
+ * order, a mix of entries and `Prompt.Message`s. The model reads the returned entries the same way
+ * it reads the full history, and reads each prompt message unchanged, where the view put it. The
+ * model reads none of the app's events by itself: map those it should read to a message, and an
+ * app event's entry left in the result is dropped.
+ *
+ * A message stands right after the entry before it: one that came after the model's last read, or
+ * between a tool call and its result, moves after them, as an input does.
+ *
+ * **Example** (Telling the model about an order the user placed)
+ *
+ * ```ts
+ * import { Assistant, InputId } from "effect-assistant"
+ * import * as Prompt from "effect/ai/Prompt"
+ * import * as Schema from "effect/Schema"
+ *
+ * class OrderPlaced extends Schema.TaggedClass<OrderPlaced>()("OrderPlaced", {
+ *   id: InputId.InputId,
+ *   reference: Schema.String
+ * }) {}
+ *
+ * const MyAssistant = Assistant.make("my-assistant", { events: [OrderPlaced] })
+ *
+ * const withOrders: Assistant.HistoryView<OrderPlaced> = (entries) =>
+ *   entries.map((entry) =>
+ *     entry.event instanceof OrderPlaced
+ *       ? Prompt.userMessage({
+ *           content: [Prompt.textPart({ text: `The user placed order ${entry.event.reference}.` })]
+ *         })
+ *       : entry
+ *   )
+ *
+ * // An `OrderPlaced` that the API submits wakes a turn, which reads it as this note.
+ * const MyAssistantLive = MyAssistant.toLayer((turn) =>
+ *   turn.loop({ instructions: "Be brief.", history: withOrders })
+ * )
+ * ```
  *
  * @category models
  * @since 0.1.0
@@ -249,8 +284,8 @@ export interface Chat<Events = never> {
   readonly entries: Effect.Effect<ReadonlyArray<Entry<Events>>>
   /**
    * Appends events after the chat's last entry and sends them to the chat's subscribers. The
-   * events can be the library's or the assistant's own, such as a summary. An event that wakes a
-   * turn is handled by the next turn.
+   * events can be the library's or the assistant's own, such as a summary. None of them wakes a
+   * turn: only what comes in through the assistant's `submit` does.
    */
   append(...events: ReadonlyArray<AssistantEvent.AssistantEvent | Events>): Effect.Effect<void>
 }
@@ -266,8 +301,11 @@ export interface Chat<Events = never> {
 export interface Service<Events = never> {
   /**
    * Stores an input or one of the assistant's own events, then returns. Examples are a user's
-   * message or block answer, a workflow's progress, or the draft the user opened. The assistant
-   * works on events that wake a turn in the background.
+   * message or block answer, a workflow's progress, or the order the user placed. Each one is an
+   * input: storing it wakes a turn, which the assistant runs in the background. The handler decides
+   * what the turn does with it, and an app event the model should read needs a history view that
+   * maps it (see {@link HistoryView}). To store an app event without waking a turn, append it from
+   * within the chat instead (`yield* MyAssistant.Chat`).
    *
    * Fails with `GetChatError` when the app's `Chats` service reports that the chat can't be used,
    * because the app doesn't know the chat or has deleted it.
@@ -279,9 +317,10 @@ export interface Service<Events = never> {
    * A reader that already has the earlier entries passes `after` and receives only the entries
    * after that `seq`.
    *
-   * For a chat client, pipe the whole log into `ChatView.updates(MyAssistant, { after })`, which
-   * streams the chat as its user sees it. Its `after` goes there, not here: the view of a message
-   * depends on earlier entries.
+   * For a chat client, pipe the whole log into `Timeline.changes(MyAssistant, { after })`, which
+   * streams the chat's timeline, as its user sees it. Its `after` goes there, not here: a message
+   * on the timeline depends on earlier entries. The timeline shows only the app events named in its
+   * `show`, none by default (see `Timeline.changes`).
    */
   readonly subscribe: (
     chatId: ChatId,
@@ -323,8 +362,8 @@ export interface Assistant<
   readonly blocks: BlockKit.BlockKit | undefined
   /** The specialists the assistant can hand work to. */
   readonly specialists: ReadonlyArray<Specs>
-  /** The app's own events the assistant registered. */
-  readonly events: ReadonlyArray<AppEvent.Any>
+  /** The schemas of the app's own events the assistant stores. */
+  readonly events: ReadonlyArray<AssistantEvent.AppEventSchema>
   /**
    * Creates a layer that registers the assistant's handler with the engine and provides the
    * assistant's service.
@@ -387,9 +426,9 @@ export interface Assistant<
    *
    * export const MyAssistant = Assistant.make("my-assistant")
    *
-   * // Requires `ChatLog` and `Sharding`. The cluster's runners run the chats.
+   * // Requires `Sharding`. The cluster's runners run the chats, with `AssistantEngine.layerCluster`.
    * const MyAssistantClient = MyAssistant.layerClient.pipe(
-   *   Layer.provide(AssistantEngine.layerCluster)
+   *   Layer.provide(AssistantEngine.layerClusterClient)
    * )
    * ```
    */
@@ -419,28 +458,35 @@ export type Any = Assistant<any, any, any>
  */
 export const isAssistant = (u: unknown): u is Any => Predicate.hasProperty(u, TypeId)
 
-function entrySchema<E>(events: ReadonlyArray<AppEvent.Any>): Schema.Codec<Entry<E>, Schema.Json>
+function entrySchema<E>(events: ReadonlyArray<AssistantEvent.AppEventSchema>): Schema.Codec<Entry<E>, Schema.Json>
 // The overload states the decoded type: the library's events, or one of these schemas' types.
-function entrySchema(events: ReadonlyArray<AppEvent.Any>): Schema.Top {
+function entrySchema(events: ReadonlyArray<AssistantEvent.AppEventSchema>): Schema.Top {
   return Schema.toCodecJson(
     Schema.Struct({
       chatId: ChatId,
       seq: Schema.Int,
       at: Schema.Finite,
-      event: Schema.Union([AssistantEvent.AssistantEvent, ...events.map((event) => event.schema)])
+      event: Schema.Union([AssistantEvent.AssistantEvent, ...events])
     })
   )
 }
 
 /**
- * Creates an assistant definition from its name, its UI blocks, its specialists, and the app's own
- * events it stores (see `AppEvent`).
+ * Creates an assistant definition from its name, its UI blocks, its specialists, and the schemas of
+ * the app's own events it stores.
  *
  * **Details**
  *
  * The definition holds no code that runs turns. Provide a handler with its `toLayer`, then yield
  * the definition to get the assistant's {@link Service}.
  *
+ * The definition only says which of the app's events a chat stores. What happens with one is up
+ * to the places that use it. One that comes in through the service's `submit`, from outside a
+ * turn, is an input and wakes a turn, like a user's message; one a turn appends to its chat never
+ * does. The handler decides what a turn does, a history view says how the model reads an event
+ * ({@link HistoryView}), and the chat's timeline says which its user sees
+ * (`Timeline.changes`).
+ *
  * **Example** (Defining an assistant and submitting a message)
  *
  * ```ts
@@ -466,7 +512,7 @@ function entrySchema(events: ReadonlyArray<AppEvent.Any>): Schema.Top {
 export const make = <
   const Name extends string,
   const Specs extends ReadonlyArray<Specialist.Any> = readonly [],
-  const Events extends ReadonlyArray<AppEvent.Any> = readonly []
+  const Events extends ReadonlyArray<AssistantEvent.AppEventSchema> = readonly []
 >(
   name: Name,
   options?: {
@@ -478,14 +524,14 @@ export const make = <
      */
     readonly specialists?: Specs | undefined
     /**
-     * The app's own events, each created with `AppEvent.make(schema, { wakes, render })`.
-     * `submit` and the chat's `append` store them, and the chat's `entries` read them back,
-     * decoded. Events that wake a turn are inputs, and the model reads each event that has a
-     * `render`.
+     * The schemas of the app's own events, each a tagged struct or class. `submit` and the chat's
+     * `append` store them, in their JSON form, and the chat's `entries` and `subscribe` read them
+     * back, decoded. Each needs a tag of its own that isn't one of the library's: `make` throws
+     * otherwise.
      */
     readonly events?: Events | undefined
   }
-): Assistant<Name, Specs[number], AppEvent.Type<Events[number]>> => {
+): Assistant<Name, Specs[number], Events[number]["Type"]> => {
   const events = options?.events ?? []
 
   const definition: Turns.Definition = {
@@ -495,7 +541,7 @@ export const make = <
     app: AppEvents.make(events)
   }
 
-  type OwnEvents = AppEvent.Type<Events[number]>
+  type OwnEvents = Events[number]["Type"]
 
   const Key = Context.Service<Identifier<Name>, Service<OwnEvents>>(`effect-assistant/Assistant/${name}`)
 

package/src/AssistantActivity.ts

@@ -71,32 +71,25 @@ const withoutRun = (activity: State, runId: RunId): State => {
   return { ...activity, specialists }
 }
 
-/**
- * Represents the options for folding a chat's entries into its activity.
- *
- * @category models
- * @since 0.1.0
- */
-export interface Options {
-  /**
-   * The tags of the app's events that wake a turn (see `AppEvent`). These events count as inputs
-   * too. Defaults to none.
-   */
-  readonly wakes?: ReadonlySet<string> | undefined
-}
-
 /**
  * Returns the activity after one more entry. Fold a chat's entries in order, or use
  * {@link fromEntries}.
  *
+ * **Details**
+ *
+ * One of the app's events counts as an input, and a turn as about to start, when it came in
+ * through the assistant's `submit`. The log marks it so (`AssistantEvent.isAppInput`), as
+ * `ChatLog.read` returns it; `subscribe` streams it decoded, without the mark, so there the turn
+ * shows from its `TurnStarted`.
+ *
  * @category combinators
  * @since 0.1.0
  */
-export const apply = (activity: State, entry: AssistantEvent.AnyEntry, options?: Options): State => {
+export const apply = (activity: State, entry: AssistantEvent.AnyEntry): State => {
   const event = entry.event
 
   if (!AssistantEvent.isLibraryEvent(event)) {
-    return options?.wakes?.has(event._tag) === true ? { ...activity, queued: true, lastInputSeq: entry.seq } : activity
+    return AssistantEvent.isAppInput(event) ? { ...activity, queued: true, lastInputSeq: entry.seq } : activity
   }
 
   if (AssistantEvent.isInput(event)) {
@@ -136,8 +129,8 @@ export const apply = (activity: State, entry: AssistantEvent.AnyEntry, options?:
  * @category constructors
  * @since 0.1.0
  */
-export const fromEntries = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, options?: Options): State =>
-  entries.reduce((activity, entry) => apply(activity, entry, options), empty)
+export const fromEntries = (entries: ReadonlyArray<AssistantEvent.AnyEntry>): State =>
+  entries.reduce((activity, entry) => apply(activity, entry), empty)
 
 /**
  * Returns whether anything is working: a turn that is running or about to start, or a specialist