effect-assistant 0.1.0 → 0.3.0

package/dist/ToolDiscovery.d.ts

@@ -1,5 +1,4 @@
 import { AssistantToolCall } from "./AssistantToolCall.js";
-import { ToolServices, toolkit_d_exports } from "./internal/toolkit.js";
 import * as Schema from "effect/Schema";
 import * as Tool from "effect/ai/Tool";
 import * as Toolkit from "effect/ai/Toolkit";
@@ -15,8 +14,8 @@ declare namespace ToolDiscovery_d_exports {
  * the tools' handlers. A catalog tool's services are `execute_tool`'s, so the turn provides them
  * as it does for any tool.
  *
- * `execute_tool` doesn't run a tool that needs the user's decision; keep such tools in the loop's
- * toolkit directly.
+ * A catalog tool with Effect's `needsApproval` set fails the layer when it is built, as it would
+ * fail a loop: the library doesn't run calls that wait for approval.
  *
  * **Example** (Finding rarely used tools when needed)
  *
@@ -51,7 +50,7 @@ export declare const make: <T extends Record<string, Tool.Any>>(_catalog: Toolki
     readonly success: Schema.Codec<Schema.Json, Schema.Json, never, never>;
     readonly failure: Schema.Codec<Schema.Json, Schema.Json, never, never>;
     readonly failureMode: "error";
-  }, AssistantToolCall | ToolServices<T>>;
+  }, AssistantToolCall | Exclude<Tool.HandlerServices<T[keyof T]>, AssistantToolCall>>;
   readonly search_tools: Tool.Tool<"search_tools", {
     readonly parameters: Schema.Struct<{
       readonly query: Schema.String;
@@ -89,7 +88,7 @@ export declare const layer: <T extends Record<string, Tool.Any>>(catalog: Toolki
     readonly success: Schema.Codec<Schema.Json, Schema.Json, never, never>;
     readonly failure: Schema.Codec<Schema.Json, Schema.Json, never, never>;
     readonly failureMode: "error";
-  }, AssistantToolCall | ToolServices<T>>;
+  }, AssistantToolCall | Exclude<Tool.HandlerServices<T[keyof T]>, AssistantToolCall>>;
   readonly search_tools: Tool.Tool<"search_tools", {
     readonly parameters: Schema.Struct<{
       readonly query: Schema.String;

package/dist/ToolDiscovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ToolDiscovery.d.ts","names":[],"sources":["../src/ToolDiscovery.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA2Ha,OAAQ,UAAU,eAAe,KAAK,MAAI,UAE3C,QAAQ,QAAQ,OAAE,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAkBjB,QAAS,UAAU,eAAe,KAAK,MAAI,SAAW,QAAQ,QAAQ,8BAAE,MAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;WA2ClF,QAAA,KAAA,YAAA,2BAAA"}
+{"version":3,"file":"ToolDiscovery.d.ts","names":[],"sources":["../src/ToolDiscovery.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA2Ha,OAAQ,UAAU,eAAe,KAAK,MAAI,UAE3C,QAAQ,QAAQ,OAAE,QAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBAkBjB,QAAS,UAAU,eAAe,KAAK,MAAI,SAAW,QAAQ,QAAQ,8BAAE,MAAA,KAAA;;;;;;;;;;;;;;;;;;;;;;WAmClF,QAAA,KAAA,YAAA,2BAAA"}

package/dist/ToolDiscovery.js

@@ -1,7 +1,7 @@
 import { __exportAll } from "./_virtual/_rolldown/runtime.js";
 import { toJson } from "./internal/schema.js";
 import { AssistantToolCall } from "./AssistantToolCall.js";
-import { failed, needsDecision, runNative } from "./internal/toolkit.js";
+import { needingApproval, needsApprovalMessage, runNative } from "./internal/toolkit.js";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import * as Response from "effect/ai/Response";
@@ -67,8 +67,8 @@ const requiring = () => (tool) => tool;
 * the tools' handlers. A catalog tool's services are `execute_tool`'s, so the turn provides them
 * as it does for any tool.
 *
-* `execute_tool` doesn't run a tool that needs the user's decision; keep such tools in the loop's
-* toolkit directly.
+* A catalog tool with Effect's `needsApproval` set fails the layer when it is built, as it would
+* fail a loop: the library doesn't run calls that wait for approval.
 *
 * **Example** (Finding rarely used tools when needed)
 *
@@ -113,6 +113,8 @@ const make = (_catalog) => Toolkit.make(SearchTools, requiring()(ExecuteTool));
 const layer = (catalog) => make(catalog).toLayer(Effect.gen(function* () {
 	const resolved = yield* catalog;
 	const definitions = Object.values(resolved.tools);
+	const needingApproval$1 = needingApproval(definitions);
+	if (needingApproval$1.length > 0) return yield* Effect.die(needsApprovalMessage(needingApproval$1));
 	return {
 		search_tools: ({ query }) => Effect.sync(() => search(definitions, query, 5).map((tool) => ({
 			name: tool.name,
@@ -127,7 +129,6 @@ const layer = (catalog) => make(catalog).toLayer(Effect.gen(function* () {
 				params: input,
 				providerExecuted: false
 			});
-			if (yield* needsDecision(resolved, call, [])) return yield* Effect.fail(failed(`${name} needs the user's decision, so it can't run through execute_tool.`, "NeedsDecision").result);
 			const { outcome, result } = yield* runNative(resolved, call);
 			return outcome === "failure" ? yield* Effect.fail(result) : result;
 		})

package/dist/ToolDiscovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ToolDiscovery.js","names":["Toolkits.needsDecision","Toolkits.failed","Toolkits.runNative"],"sources":["../src/ToolDiscovery.ts"],"sourcesContent":["/**\n * Turns a catalog toolkit into two tools, so the prompt doesn't carry every tool definition.\n *\n * `search_tools` finds tools by what the model needs to do and returns their names, descriptions,\n * and input schemas. `execute_tool` validates an input and runs one of them. {@link make} returns\n * the two tools as a native toolkit, and {@link layer} their handlers.\n *\n * @since 0.1.0\n */\nimport * as Response from \"effect/ai/Response\"\nimport * as Tool from \"effect/ai/Tool\"\nimport * as Toolkit from \"effect/ai/Toolkit\"\nimport * as Effect from \"effect/Effect\"\nimport * as Schema from \"effect/Schema\"\nimport { AssistantToolCall } from \"./AssistantToolCall.ts\"\nimport { toJson } from \"./internal/schema.ts\"\nimport * as Toolkits from \"./internal/toolkit.ts\"\n\nconst words = (text: string): ReadonlySet<string> =>\n  new Set(\n    text\n      .toLowerCase()\n      .split(/[^a-z0-9]+/)\n      .filter((word) => word.length >= 3)\n  )\n\nconst score = (query: ReadonlySet<string>, text: string): number => {\n  const target = [...words(text)]\n\n  const matches = (word: string) =>\n    target.some((t) => t === word || (word.length >= 4 && (t.startsWith(word) || word.startsWith(t))))\n\n  return [...query].filter(matches).length\n}\n\n// Everything when nothing matches, so the model can pick or search again.\nconst search = (tools: ReadonlyArray<Tool.Any>, query: string, limit: number): ReadonlyArray<Tool.Any> => {\n  const queryWords = words(query)\n\n  const ranked = tools\n    .flatMap((tool) => {\n      const hits = score(queryWords, `${tool.name} ${Tool.getDescription(tool) ?? \"\"}`)\n\n      return hits > 0 ? [{ tool, score: hits }] : []\n    })\n    .sort((a, b) => b.score - a.score)\n\n  return (ranked.length > 0 ? ranked.map((hit) => hit.tool) : tools).slice(0, limit)\n}\n\nconst SearchTools = Tool.make(\"search_tools\", {\n  description:\n    \"Search for more tools by what you need to do. Returns their names, descriptions, and input schemas; call one with execute_tool.\",\n  parameters: Schema.Struct({\n    query: Schema.String.annotate({ description: \"What you need to do, in a few words.\" })\n  }),\n  success: Schema.Array(\n    Schema.Struct({\n      name: Schema.String,\n      description: Schema.optional(Schema.String),\n      inputSchema: Schema.Json\n    })\n  )\n})\n\nconst ExecuteTool = Tool.make(\"execute_tool\", {\n  description: \"Run a tool found with search_tools. Pass its name and an input matching its input schema.\",\n  parameters: Schema.Struct({\n    name: Schema.String,\n    input: Schema.Record(Schema.String, Schema.Json)\n  }),\n  success: Schema.Json,\n  // The tool's failure is this call's, so the loop sees it failed (a `wait: true` message doesn't\n  // end the turn).\n  failure: Schema.Json,\n  dependencies: [AssistantToolCall]\n})\n\n// A tool's requirements are a covariant phantom type, so one that needs nothing is one that needs\n// any.\nconst requiring =\n  <R>() =>\n  <N extends string, C extends (Tool.Any extends Tool.Tool<string, infer K, unknown> ? K : never), R0>(\n    tool: Tool.Tool<N, C, R0>\n  ): Tool.Tool<N, C, R0 | R> =>\n    tool\n\n/**\n * Creates the `search_tools` and `execute_tool` tools over a catalog toolkit, as a native toolkit.\n *\n * **Details**\n *\n * Merge the toolkit into the loop's, and provide {@link layer} for the same catalog, which has\n * the tools' handlers. A catalog tool's services are `execute_tool`'s, so the turn provides them\n * as it does for any tool.\n *\n * `execute_tool` doesn't run a tool that needs the user's decision; keep such tools in the loop's\n * toolkit directly.\n *\n * **Example** (Finding rarely used tools when needed)\n *\n * ```ts\n * import { ToolDiscovery } from \"effect-assistant\"\n * import * as Toolkit from \"effect/ai/Toolkit\"\n * import * as Layer from \"effect/Layer\"\n *\n * // OfficeTools is a big toolkit, found when needed. CommonTools stays in the prompt.\n * const OfficeDiscovery = ToolDiscovery.make(OfficeTools)\n * const OfficeDiscoveryLive = ToolDiscovery.layer(OfficeTools).pipe(Layer.provide(OfficeToolsLive))\n *\n * const MyAssistantLive = MyAssistant.toLayer((turn) =>\n *   turn.loop({\n *     instructions,\n *     toolkit: Toolkit.merge(CommonTools, OfficeDiscovery)\n *   })\n * ).pipe(Layer.provide([CommonToolsLive, OfficeDiscoveryLive]))\n * ```\n *\n * @see {@link layer} for the tools' handlers\n *\n * @category constructors\n * @since 0.1.0\n */\nexport const make = <T extends Record<string, Tool.Any>>(\n  // Only its type is used here, for `execute_tool`'s services: `layer` runs its tools.\n  _catalog: Toolkit.Toolkit<T>\n) => Toolkit.make(SearchTools, requiring<Toolkits.ToolServices<T>>()(ExecuteTool))\n\n/**\n * Creates the layer with the handlers of the `search_tools` and `execute_tool` tools over a\n * catalog toolkit.\n *\n * **Details**\n *\n * The layer needs the catalog's handlers. It provides the handlers of the toolkit that\n * {@link make} returns for the same catalog: handlers are keyed by tool name, so the two calls\n * don't need to share a value. Give both the same catalog.\n *\n * @see {@link make} for the toolkit and an example\n *\n * @category layers\n * @since 0.1.0\n */\nexport const layer = <T extends Record<string, Tool.Any>>(catalog: Toolkit.Toolkit<T>) =>\n  make(catalog).toLayer(\n    Effect.gen(function* () {\n      const resolved = yield* catalog\n      const definitions = Object.values(resolved.tools)\n\n      return {\n        search_tools: ({ query }) =>\n          Effect.sync(() =>\n            search(definitions, query, 5).map((tool) => ({\n              name: tool.name,\n              description: Tool.getDescription(tool),\n              inputSchema: toJson(Tool.getJsonSchema(tool))\n            }))\n          ),\n        execute_tool: Effect.fnUntraced(function* ({ name, input }) {\n          // Named after the call that runs it: the same id when a crash runs that call again.\n          const outer = yield* AssistantToolCall\n\n          const call = Response.makePart(\"tool-call\", {\n            id: `${outer.callId}:${name}`,\n            name,\n            params: input,\n            providerExecuted: false\n          })\n\n          // A call that needs the user's decision parks only as a call the model made itself,\n          // where it can ask for it.\n          if (yield* Toolkits.needsDecision(resolved, call, [])) {\n            return yield* Effect.fail(\n              Toolkits.failed(\n                `${name} needs the user's decision, so it can't run through execute_tool.`,\n                \"NeedsDecision\"\n              ).result\n            )\n          }\n\n          const { outcome, result } = yield* Toolkits.runNative(resolved, call)\n\n          return outcome === \"failure\" ? yield* Effect.fail(result) : result\n        })\n      }\n    })\n  )\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAkBA,MAAM,SAAS,SACb,IAAI,IACF,KACG,YAAY,CAAC,CACb,MAAM,YAAY,CAAC,CACnB,QAAQ,SAAS,KAAK,UAAU,CAAC,CACtC;AAEF,MAAM,SAAS,OAA4B,SAAyB;CAClE,MAAM,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC;CAE9B,MAAM,WAAW,SACf,OAAO,MAAM,MAAM,MAAM,QAAS,KAAK,UAAU,MAAM,EAAE,WAAW,IAAI,KAAK,KAAK,WAAW,CAAC,EAAG;CAEnG,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,OAAO,CAAC,CAAC;AACpC;AAGA,MAAM,UAAU,OAAgC,OAAe,UAA2C;CACxG,MAAM,aAAa,MAAM,KAAK;CAE9B,MAAM,SAAS,MACZ,SAAS,SAAS;EACjB,MAAM,OAAO,MAAM,YAAY,GAAG,KAAK,KAAK,GAAG,KAAK,eAAe,IAAI,KAAK,IAAI;EAEhF,OAAO,OAAO,IAAI,CAAC;GAAE;GAAM,OAAO;EAAK,CAAC,IAAI,CAAC;CAC/C,CAAC,CAAC,CACD,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK;CAEnC,QAAQ,OAAO,SAAS,IAAI,OAAO,KAAK,QAAQ,IAAI,IAAI,IAAI,MAAA,CAAO,MAAM,GAAG,KAAK;AACnF;AAEA,MAAM,cAAc,KAAK,KAAK,gBAAgB;CAC5C,aACE;CACF,YAAY,OAAO,OAAO,EACxB,OAAO,OAAO,OAAO,SAAS,EAAE,aAAa,uCAAuC,CAAC,EACvF,CAAC;CACD,SAAS,OAAO,MACd,OAAO,OAAO;EACZ,MAAM,OAAO;EACb,aAAa,OAAO,SAAS,OAAO,MAAM;EAC1C,aAAa,OAAO;CACtB,CAAC,CACH;AACF,CAAC;AAED,MAAM,cAAc,KAAK,KAAK,gBAAgB;CAC5C,aAAa;CACb,YAAY,OAAO,OAAO;EACxB,MAAM,OAAO;EACb,OAAO,OAAO,OAAO,OAAO,QAAQ,OAAO,IAAI;CACjD,CAAC;CACD,SAAS,OAAO;CAGhB,SAAS,OAAO;CAChB,cAAc,CAAC,iBAAiB;AAClC,CAAC;AAID,MAAM,mBAGF,SAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsCJ,MAAa,QAEX,aACG,QAAQ,KAAK,aAAa,UAAoC,CAAC,CAAC,WAAW,CAAC;;;;;;;;;;;;;;;;AAiBjF,MAAa,SAA6C,YACxD,KAAK,OAAO,CAAC,CAAC,QACZ,OAAO,IAAI,aAAa;CACtB,MAAM,WAAW,OAAO;CACxB,MAAM,cAAc,OAAO,OAAO,SAAS,KAAK;CAEhD,OAAO;EACL,eAAe,EAAE,YACf,OAAO,WACL,OAAO,aAAa,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU;GAC3C,MAAM,KAAK;GACX,aAAa,KAAK,eAAe,IAAI;GACrC,aAAa,OAAO,KAAK,cAAc,IAAI,CAAC;EAC9C,EAAE,CACJ;EACF,cAAc,OAAO,WAAW,WAAW,EAAE,MAAM,SAAS;GAE1D,MAAM,QAAQ,OAAO;GAErB,MAAM,OAAO,SAAS,SAAS,aAAa;IAC1C,IAAI,GAAG,MAAM,OAAO,GAAG;IACvB;IACA,QAAQ;IACR,kBAAkB;GACpB,CAAC;GAID,IAAI,OAAOA,cAAuB,UAAU,MAAM,CAAC,CAAC,GAClD,OAAO,OAAO,OAAO,KACnBC,OACE,GAAG,KAAK,oEACR,eACF,CAAC,CAAC,MACJ;GAGF,MAAM,EAAE,SAAS,WAAW,OAAOC,UAAmB,UAAU,IAAI;GAEpE,OAAO,YAAY,YAAY,OAAO,OAAO,KAAK,MAAM,IAAI;EAC9D,CAAC;CACH;AACF,CAAC,CACH"}
+{"version":3,"file":"ToolDiscovery.js","names":["needingApproval","Toolkits.needingApproval","Toolkits.needsApprovalMessage","Toolkits.runNative"],"sources":["../src/ToolDiscovery.ts"],"sourcesContent":["/**\n * Turns a catalog toolkit into two tools, so the prompt doesn't carry every tool definition.\n *\n * `search_tools` finds tools by what the model needs to do and returns their names, descriptions,\n * and input schemas. `execute_tool` validates an input and runs one of them. {@link make} returns\n * the two tools as a native toolkit, and {@link layer} their handlers.\n *\n * @since 0.1.0\n */\nimport * as Response from \"effect/ai/Response\"\nimport * as Tool from \"effect/ai/Tool\"\nimport * as Toolkit from \"effect/ai/Toolkit\"\nimport * as Effect from \"effect/Effect\"\nimport * as Schema from \"effect/Schema\"\nimport { AssistantToolCall } from \"./AssistantToolCall.ts\"\nimport { toJson } from \"./internal/schema.ts\"\nimport * as Toolkits from \"./internal/toolkit.ts\"\n\nconst words = (text: string): ReadonlySet<string> =>\n  new Set(\n    text\n      .toLowerCase()\n      .split(/[^a-z0-9]+/)\n      .filter((word) => word.length >= 3)\n  )\n\nconst score = (query: ReadonlySet<string>, text: string): number => {\n  const target = [...words(text)]\n\n  const matches = (word: string) =>\n    target.some((t) => t === word || (word.length >= 4 && (t.startsWith(word) || word.startsWith(t))))\n\n  return [...query].filter(matches).length\n}\n\n// Everything when nothing matches, so the model can pick or search again.\nconst search = (tools: ReadonlyArray<Tool.Any>, query: string, limit: number): ReadonlyArray<Tool.Any> => {\n  const queryWords = words(query)\n\n  const ranked = tools\n    .flatMap((tool) => {\n      const hits = score(queryWords, `${tool.name} ${Tool.getDescription(tool) ?? \"\"}`)\n\n      return hits > 0 ? [{ tool, score: hits }] : []\n    })\n    .sort((a, b) => b.score - a.score)\n\n  return (ranked.length > 0 ? ranked.map((hit) => hit.tool) : tools).slice(0, limit)\n}\n\nconst SearchTools = Tool.make(\"search_tools\", {\n  description:\n    \"Search for more tools by what you need to do. Returns their names, descriptions, and input schemas; call one with execute_tool.\",\n  parameters: Schema.Struct({\n    query: Schema.String.annotate({ description: \"What you need to do, in a few words.\" })\n  }),\n  success: Schema.Array(\n    Schema.Struct({\n      name: Schema.String,\n      description: Schema.optional(Schema.String),\n      inputSchema: Schema.Json\n    })\n  )\n})\n\nconst ExecuteTool = Tool.make(\"execute_tool\", {\n  description: \"Run a tool found with search_tools. Pass its name and an input matching its input schema.\",\n  parameters: Schema.Struct({\n    name: Schema.String,\n    input: Schema.Record(Schema.String, Schema.Json)\n  }),\n  success: Schema.Json,\n  // The tool's failure is this call's, so the loop sees it failed (a `wait: true` message doesn't\n  // end the turn).\n  failure: Schema.Json,\n  dependencies: [AssistantToolCall]\n})\n\n// A tool's requirements are a covariant phantom type, so one that needs nothing is one that needs\n// any.\nconst requiring =\n  <R>() =>\n  <N extends string, C extends (Tool.Any extends Tool.Tool<string, infer K, unknown> ? K : never), R0>(\n    tool: Tool.Tool<N, C, R0>\n  ): Tool.Tool<N, C, R0 | R> =>\n    tool\n\n/**\n * Creates the `search_tools` and `execute_tool` tools over a catalog toolkit, as a native toolkit.\n *\n * **Details**\n *\n * Merge the toolkit into the loop's, and provide {@link layer} for the same catalog, which has\n * the tools' handlers. A catalog tool's services are `execute_tool`'s, so the turn provides them\n * as it does for any tool.\n *\n * A catalog tool with Effect's `needsApproval` set fails the layer when it is built, as it would\n * fail a loop: the library doesn't run calls that wait for approval.\n *\n * **Example** (Finding rarely used tools when needed)\n *\n * ```ts\n * import { ToolDiscovery } from \"effect-assistant\"\n * import * as Toolkit from \"effect/ai/Toolkit\"\n * import * as Layer from \"effect/Layer\"\n *\n * // OfficeTools is a big toolkit, found when needed. CommonTools stays in the prompt.\n * const OfficeDiscovery = ToolDiscovery.make(OfficeTools)\n * const OfficeDiscoveryLive = ToolDiscovery.layer(OfficeTools).pipe(Layer.provide(OfficeToolsLive))\n *\n * const MyAssistantLive = MyAssistant.toLayer((turn) =>\n *   turn.loop({\n *     instructions,\n *     toolkit: Toolkit.merge(CommonTools, OfficeDiscovery)\n *   })\n * ).pipe(Layer.provide([CommonToolsLive, OfficeDiscoveryLive]))\n * ```\n *\n * @see {@link layer} for the tools' handlers\n *\n * @category constructors\n * @since 0.1.0\n */\nexport const make = <T extends Record<string, Tool.Any>>(\n  // Only its type is used here, for `execute_tool`'s services: `layer` runs its tools.\n  _catalog: Toolkit.Toolkit<T>\n) => Toolkit.make(SearchTools, requiring<Toolkits.ToolServices<T>>()(ExecuteTool))\n\n/**\n * Creates the layer with the handlers of the `search_tools` and `execute_tool` tools over a\n * catalog toolkit.\n *\n * **Details**\n *\n * The layer needs the catalog's handlers. It provides the handlers of the toolkit that\n * {@link make} returns for the same catalog: handlers are keyed by tool name, so the two calls\n * don't need to share a value. Give both the same catalog.\n *\n * @see {@link make} for the toolkit and an example\n *\n * @category layers\n * @since 0.1.0\n */\nexport const layer = <T extends Record<string, Tool.Any>>(catalog: Toolkit.Toolkit<T>) =>\n  make(catalog).toLayer(\n    Effect.gen(function* () {\n      const resolved = yield* catalog\n      const definitions = Object.values(resolved.tools)\n      const needingApproval = Toolkits.needingApproval(definitions)\n\n      if (needingApproval.length > 0) return yield* Effect.die(Toolkits.needsApprovalMessage(needingApproval))\n\n      return {\n        search_tools: ({ query }) =>\n          Effect.sync(() =>\n            search(definitions, query, 5).map((tool) => ({\n              name: tool.name,\n              description: Tool.getDescription(tool),\n              inputSchema: toJson(Tool.getJsonSchema(tool))\n            }))\n          ),\n        execute_tool: Effect.fnUntraced(function* ({ name, input }) {\n          // Named after the call that runs it: the same id when a crash runs that call again.\n          const outer = yield* AssistantToolCall\n\n          const call = Response.makePart(\"tool-call\", {\n            id: `${outer.callId}:${name}`,\n            name,\n            params: input,\n            providerExecuted: false\n          })\n\n          const { outcome, result } = yield* Toolkits.runNative(resolved, call)\n\n          return outcome === \"failure\" ? yield* Effect.fail(result) : result\n        })\n      }\n    })\n  )\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAkBA,MAAM,SAAS,SACb,IAAI,IACF,KACG,YAAY,CAAC,CACb,MAAM,YAAY,CAAC,CACnB,QAAQ,SAAS,KAAK,UAAU,CAAC,CACtC;AAEF,MAAM,SAAS,OAA4B,SAAyB;CAClE,MAAM,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC;CAE9B,MAAM,WAAW,SACf,OAAO,MAAM,MAAM,MAAM,QAAS,KAAK,UAAU,MAAM,EAAE,WAAW,IAAI,KAAK,KAAK,WAAW,CAAC,EAAG;CAEnG,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,OAAO,CAAC,CAAC;AACpC;AAGA,MAAM,UAAU,OAAgC,OAAe,UAA2C;CACxG,MAAM,aAAa,MAAM,KAAK;CAE9B,MAAM,SAAS,MACZ,SAAS,SAAS;EACjB,MAAM,OAAO,MAAM,YAAY,GAAG,KAAK,KAAK,GAAG,KAAK,eAAe,IAAI,KAAK,IAAI;EAEhF,OAAO,OAAO,IAAI,CAAC;GAAE;GAAM,OAAO;EAAK,CAAC,IAAI,CAAC;CAC/C,CAAC,CAAC,CACD,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,KAAK;CAEnC,QAAQ,OAAO,SAAS,IAAI,OAAO,KAAK,QAAQ,IAAI,IAAI,IAAI,MAAA,CAAO,MAAM,GAAG,KAAK;AACnF;AAEA,MAAM,cAAc,KAAK,KAAK,gBAAgB;CAC5C,aACE;CACF,YAAY,OAAO,OAAO,EACxB,OAAO,OAAO,OAAO,SAAS,EAAE,aAAa,uCAAuC,CAAC,EACvF,CAAC;CACD,SAAS,OAAO,MACd,OAAO,OAAO;EACZ,MAAM,OAAO;EACb,aAAa,OAAO,SAAS,OAAO,MAAM;EAC1C,aAAa,OAAO;CACtB,CAAC,CACH;AACF,CAAC;AAED,MAAM,cAAc,KAAK,KAAK,gBAAgB;CAC5C,aAAa;CACb,YAAY,OAAO,OAAO;EACxB,MAAM,OAAO;EACb,OAAO,OAAO,OAAO,OAAO,QAAQ,OAAO,IAAI;CACjD,CAAC;CACD,SAAS,OAAO;CAGhB,SAAS,OAAO;CAChB,cAAc,CAAC,iBAAiB;AAClC,CAAC;AAID,MAAM,mBAGF,SAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsCJ,MAAa,QAEX,aACG,QAAQ,KAAK,aAAa,UAAoC,CAAC,CAAC,WAAW,CAAC;;;;;;;;;;;;;;;;AAiBjF,MAAa,SAA6C,YACxD,KAAK,OAAO,CAAC,CAAC,QACZ,OAAO,IAAI,aAAa;CACtB,MAAM,WAAW,OAAO;CACxB,MAAM,cAAc,OAAO,OAAO,SAAS,KAAK;CAChD,MAAMA,oBAAkBC,gBAAyB,WAAW;CAE5D,IAAID,kBAAgB,SAAS,GAAG,OAAO,OAAO,OAAO,IAAIE,qBAA8BF,iBAAe,CAAC;CAEvG,OAAO;EACL,eAAe,EAAE,YACf,OAAO,WACL,OAAO,aAAa,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU;GAC3C,MAAM,KAAK;GACX,aAAa,KAAK,eAAe,IAAI;GACrC,aAAa,OAAO,KAAK,cAAc,IAAI,CAAC;EAC9C,EAAE,CACJ;EACF,cAAc,OAAO,WAAW,WAAW,EAAE,MAAM,SAAS;GAE1D,MAAM,QAAQ,OAAO;GAErB,MAAM,OAAO,SAAS,SAAS,aAAa;IAC1C,IAAI,GAAG,MAAM,OAAO,GAAG;IACvB;IACA,QAAQ;IACR,kBAAkB;GACpB,CAAC;GAED,MAAM,EAAE,SAAS,WAAW,OAAOG,UAAmB,UAAU,IAAI;GAEpE,OAAO,YAAY,YAAY,OAAO,OAAO,KAAK,MAAM,IAAI;EAC9D,CAAC;CACH;AACF,CAAC,CACH"}

package/dist/ToolFailure.d.ts

@@ -13,7 +13,7 @@ declare const ToolFailure_base: Schema.Class<ToolFailure, Schema.Struct<{
  *
  * It holds a message that says what went wrong and, optionally, a `reason` the model can tell
  * apart, such as `"NotFound"` or `"OverBudget"`. The library's own reasons are PascalCase, like
- * `"NeedsDecision"`.
+ * `"ToolNotFoundError"`.
  *
  * @category errors
  * @since 0.1.0

package/dist/ToolFailure.js

@@ -20,7 +20,7 @@ var ToolFailure_exports = /* @__PURE__ */ __exportAll({
 *
 * It holds a message that says what went wrong and, optionally, a `reason` the model can tell
 * apart, such as `"NotFound"` or `"OverBudget"`. The library's own reasons are PascalCase, like
-* `"NeedsDecision"`.
+* `"ToolNotFoundError"`.
 *
 * @category errors
 * @since 0.1.0

package/dist/ToolFailure.js.map

@@ -1 +1 @@
-{"version":3,"file":"ToolFailure.js","names":[],"sources":["../src/ToolFailure.ts"],"sourcesContent":["/**\n * Defines the failure a tool returns to the model.\n *\n * A {@link ToolFailure} carries a message the model reads and adapts to, such as \"No office named\n * Paris\", instead of failing the turn. Tools declare it as their `failure` schema and fail with\n * {@link fail}.\n *\n * @since 0.1.0\n */\nimport * as Effect from \"effect/Effect\"\nimport * as Schema from \"effect/Schema\"\n\n/**\n * Represents a tool's failure, written for the model.\n *\n * It holds a message that says what went wrong and, optionally, a `reason` the model can tell\n * apart, such as `\"NotFound\"` or `\"OverBudget\"`. The library's own reasons are PascalCase, like\n * `\"NeedsDecision\"`.\n *\n * @category errors\n * @since 0.1.0\n */\nexport class ToolFailure extends Schema.Error<ToolFailure>(\"effect-assistant/ToolFailure/ToolFailure\")({\n  _tag: Schema.tag(\"ToolFailure\"),\n  message: Schema.String,\n  reason: Schema.optional(Schema.String)\n}) {}\n\n/**\n * Fails a tool's handler with a message for the model.\n *\n * **Details**\n *\n * The tool must declare `failure: ToolFailure.ToolFailure`. The model reads the failure as the\n * call's result, with its `reason` when one is given.\n *\n * **Example** (Failing a tool call the model can correct)\n *\n * ```ts\n * import { ToolFailure } from \"effect-assistant\"\n * import * as Tool from \"effect/ai/Tool\"\n * import * as Toolkit from \"effect/ai/Toolkit\"\n * import * as Effect from \"effect/Effect\"\n * import * as Schema from \"effect/Schema\"\n *\n * const budgets = new Map([[\"Oslo\", 1200]])\n *\n * const BudgetTools = Toolkit.make(\n *   Tool.make(\"office_budget\", {\n *     description: \"The budget left for an office.\",\n *     parameters: Schema.Struct({ office: Schema.String }),\n *     success: Schema.Number,\n *     failure: ToolFailure.ToolFailure\n *   })\n * )\n *\n * const BudgetToolsLive = BudgetTools.toLayer({\n *   office_budget: ({ office }) =>\n *     Effect.fromNullishOr(budgets.get(office)).pipe(\n *       Effect.catch(() => ToolFailure.fail(`No office named ${office}.`, { reason: \"NotFound\" }))\n *     )\n * })\n * ```\n *\n * @category constructors\n * @since 0.1.0\n */\nexport const fail = (\n  message: string,\n  options?: { readonly reason?: string | undefined }\n): Effect.Effect<never, ToolFailure> =>\n  Effect.fail(\n    options?.reason === undefined ? new ToolFailure({ message }) : new ToolFailure({ message, reason: options.reason })\n  )\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,IAAa,cAAb,cAAiC,OAAO,MAAmB,0CAA0C,CAAC,CAAC;CACrG,MAAM,OAAO,IAAI,aAAa;CAC9B,SAAS,OAAO;CAChB,QAAQ,OAAO,SAAS,OAAO,MAAM;AACvC,CAAC,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyCJ,MAAa,QACX,SACA,YAEA,OAAO,KACL,SAAS,WAAW,KAAA,IAAY,IAAI,YAAY,EAAE,QAAQ,CAAC,IAAI,IAAI,YAAY;CAAE;CAAS,QAAQ,QAAQ;AAAO,CAAC,CACpH"}
+{"version":3,"file":"ToolFailure.js","names":[],"sources":["../src/ToolFailure.ts"],"sourcesContent":["/**\n * Defines the failure a tool returns to the model.\n *\n * A {@link ToolFailure} carries a message the model reads and adapts to, such as \"No office named\n * Paris\", instead of failing the turn. Tools declare it as their `failure` schema and fail with\n * {@link fail}.\n *\n * @since 0.1.0\n */\nimport * as Effect from \"effect/Effect\"\nimport * as Schema from \"effect/Schema\"\n\n/**\n * Represents a tool's failure, written for the model.\n *\n * It holds a message that says what went wrong and, optionally, a `reason` the model can tell\n * apart, such as `\"NotFound\"` or `\"OverBudget\"`. The library's own reasons are PascalCase, like\n * `\"ToolNotFoundError\"`.\n *\n * @category errors\n * @since 0.1.0\n */\nexport class ToolFailure extends Schema.Error<ToolFailure>(\"effect-assistant/ToolFailure/ToolFailure\")({\n  _tag: Schema.tag(\"ToolFailure\"),\n  message: Schema.String,\n  reason: Schema.optional(Schema.String)\n}) {}\n\n/**\n * Fails a tool's handler with a message for the model.\n *\n * **Details**\n *\n * The tool must declare `failure: ToolFailure.ToolFailure`. The model reads the failure as the\n * call's result, with its `reason` when one is given.\n *\n * **Example** (Failing a tool call the model can correct)\n *\n * ```ts\n * import { ToolFailure } from \"effect-assistant\"\n * import * as Tool from \"effect/ai/Tool\"\n * import * as Toolkit from \"effect/ai/Toolkit\"\n * import * as Effect from \"effect/Effect\"\n * import * as Schema from \"effect/Schema\"\n *\n * const budgets = new Map([[\"Oslo\", 1200]])\n *\n * const BudgetTools = Toolkit.make(\n *   Tool.make(\"office_budget\", {\n *     description: \"The budget left for an office.\",\n *     parameters: Schema.Struct({ office: Schema.String }),\n *     success: Schema.Number,\n *     failure: ToolFailure.ToolFailure\n *   })\n * )\n *\n * const BudgetToolsLive = BudgetTools.toLayer({\n *   office_budget: ({ office }) =>\n *     Effect.fromNullishOr(budgets.get(office)).pipe(\n *       Effect.catch(() => ToolFailure.fail(`No office named ${office}.`, { reason: \"NotFound\" }))\n *     )\n * })\n * ```\n *\n * @category constructors\n * @since 0.1.0\n */\nexport const fail = (\n  message: string,\n  options?: { readonly reason?: string | undefined }\n): Effect.Effect<never, ToolFailure> =>\n  Effect.fail(\n    options?.reason === undefined ? new ToolFailure({ message }) : new ToolFailure({ message, reason: options.reason })\n  )\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,IAAa,cAAb,cAAiC,OAAO,MAAmB,0CAA0C,CAAC,CAAC;CACrG,MAAM,OAAO,IAAI,aAAa;CAC9B,SAAS,OAAO;CAChB,QAAQ,OAAO,SAAS,OAAO,MAAM;AACvC,CAAC,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyCJ,MAAa,QACX,SACA,YAEA,OAAO,KACL,SAAS,WAAW,KAAA,IAAY,IAAI,YAAY,EAAE,QAAQ,CAAC,IAAI,IAAI,YAAY;CAAE;CAAS,QAAQ,QAAQ;AAAO,CAAC,CACpH"}

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-import { AppEvent_d_exports } from "./AppEvent.js";
 import { ChatId_d_exports } from "./ChatId.js";
 import { AssistantEvent_d_exports } from "./AssistantEvent.js";
 import { ChatLog_d_exports } from "./ChatLog.js";
@@ -6,7 +5,7 @@ import { Instructions_d_exports } from "./Instructions.js";
 import { AssistantToolCall_d_exports } from "./AssistantToolCall.js";
 import { AssistantLoop_d_exports } from "./AssistantLoop.js";
 import { Block_d_exports } from "./Block.js";
-import { ChatView_d_exports } from "./ChatView.js";
+import { Timeline_d_exports } from "./Timeline.js";
 import { CurrentChat_d_exports } from "./CurrentChat.js";
 import { BlockKit_d_exports } from "./BlockKit.js";
 import { RunId_d_exports } from "./RunId.js";
@@ -18,9 +17,7 @@ import { Assistant_d_exports } from "./Assistant.js";
 import { AssistantActivity_d_exports } from "./AssistantActivity.js";
 import { Compaction_d_exports } from "./Compaction.js";
 import { InputId_d_exports } from "./InputId.js";
-import { Decision_d_exports } from "./Decision.js";
-import { DecisionId_d_exports } from "./DecisionId.js";
 import { ToolFailure_d_exports } from "./ToolFailure.js";
 import { Memory_d_exports } from "./Memory.js";
 import { ToolDiscovery_d_exports } from "./ToolDiscovery.js";
-export { AppEvent_d_exports as AppEvent, Assistant_d_exports as Assistant, AssistantActivity_d_exports as AssistantActivity, AssistantEngine_d_exports as AssistantEngine, AssistantEvent_d_exports as AssistantEvent, AssistantLoop_d_exports as AssistantLoop, AssistantToolCall_d_exports as AssistantToolCall, Block_d_exports as Block, BlockKit_d_exports as BlockKit, ChatId_d_exports as ChatId, ChatLog_d_exports as ChatLog, ChatView_d_exports as ChatView, Chats_d_exports as Chats, Compaction_d_exports as Compaction, CurrentChat_d_exports as CurrentChat, Decision_d_exports as Decision, DecisionId_d_exports as DecisionId, InputId_d_exports as InputId, Instructions_d_exports as Instructions, Memory_d_exports as Memory, RunId_d_exports as RunId, Skill_d_exports as Skill, Specialist_d_exports as Specialist, ToolDiscovery_d_exports as ToolDiscovery, ToolFailure_d_exports as ToolFailure };
+export { Assistant_d_exports as Assistant, AssistantActivity_d_exports as AssistantActivity, AssistantEngine_d_exports as AssistantEngine, AssistantEvent_d_exports as AssistantEvent, AssistantLoop_d_exports as AssistantLoop, AssistantToolCall_d_exports as AssistantToolCall, Block_d_exports as Block, BlockKit_d_exports as BlockKit, ChatId_d_exports as ChatId, ChatLog_d_exports as ChatLog, Chats_d_exports as Chats, Compaction_d_exports as Compaction, CurrentChat_d_exports as CurrentChat, InputId_d_exports as InputId, Instructions_d_exports as Instructions, Memory_d_exports as Memory, RunId_d_exports as RunId, Skill_d_exports as Skill, Specialist_d_exports as Specialist, Timeline_d_exports as Timeline, ToolDiscovery_d_exports as ToolDiscovery, ToolFailure_d_exports as ToolFailure };

package/dist/index.js

@@ -1,6 +1,4 @@
-import { AppEvent_exports } from "./AppEvent.js";
 import { ChatId_exports } from "./ChatId.js";
-import { DecisionId_exports } from "./DecisionId.js";
 import { InputId_exports } from "./InputId.js";
 import { RunId_exports } from "./RunId.js";
 import { AssistantEvent_exports } from "./AssistantEvent.js";
@@ -8,9 +6,6 @@ import { ChatLog_exports } from "./ChatLog.js";
 import { CurrentChat_exports } from "./CurrentChat.js";
 import { Chats_exports } from "./Chats.js";
 import { Specialist_exports } from "./Specialist.js";
-import { Block_exports } from "./Block.js";
-import { Decision_exports } from "./Decision.js";
-import { BlockKit_exports } from "./BlockKit.js";
 import { AssistantToolCall_exports } from "./AssistantToolCall.js";
 import { ToolFailure_exports } from "./ToolFailure.js";
 import { Skill_exports } from "./Skill.js";
@@ -19,8 +14,10 @@ import { AssistantEngine_exports } from "./AssistantEngine.js";
 import { Assistant_exports } from "./Assistant.js";
 import { AssistantActivity_exports } from "./AssistantActivity.js";
 import { AssistantLoop_exports } from "./AssistantLoop.js";
-import { ChatView_exports } from "./ChatView.js";
+import { Block_exports } from "./Block.js";
+import { BlockKit_exports } from "./BlockKit.js";
 import { Compaction_exports } from "./Compaction.js";
 import { Memory_exports } from "./Memory.js";
+import { Timeline_exports } from "./Timeline.js";
 import { ToolDiscovery_exports } from "./ToolDiscovery.js";
-export { AppEvent_exports as AppEvent, Assistant_exports as Assistant, AssistantActivity_exports as AssistantActivity, AssistantEngine_exports as AssistantEngine, AssistantEvent_exports as AssistantEvent, AssistantLoop_exports as AssistantLoop, AssistantToolCall_exports as AssistantToolCall, Block_exports as Block, BlockKit_exports as BlockKit, ChatId_exports as ChatId, ChatLog_exports as ChatLog, ChatView_exports as ChatView, Chats_exports as Chats, Compaction_exports as Compaction, CurrentChat_exports as CurrentChat, Decision_exports as Decision, DecisionId_exports as DecisionId, InputId_exports as InputId, Instructions_exports as Instructions, Memory_exports as Memory, RunId_exports as RunId, Skill_exports as Skill, Specialist_exports as Specialist, ToolDiscovery_exports as ToolDiscovery, ToolFailure_exports as ToolFailure };
+export { Assistant_exports as Assistant, AssistantActivity_exports as AssistantActivity, AssistantEngine_exports as AssistantEngine, AssistantEvent_exports as AssistantEvent, AssistantLoop_exports as AssistantLoop, AssistantToolCall_exports as AssistantToolCall, Block_exports as Block, BlockKit_exports as BlockKit, ChatId_exports as ChatId, ChatLog_exports as ChatLog, Chats_exports as Chats, Compaction_exports as Compaction, CurrentChat_exports as CurrentChat, InputId_exports as InputId, Instructions_exports as Instructions, Memory_exports as Memory, RunId_exports as RunId, Skill_exports as Skill, Specialist_exports as Specialist, Timeline_exports as Timeline, ToolDiscovery_exports as ToolDiscovery, ToolFailure_exports as ToolFailure };

package/dist/internal/chat.js

@@ -1,19 +1,17 @@
-import { ChatDeleted, DecisionResolved, isInput, isLibraryEvent } from "../AssistantEvent.js";
+import { ChatDeleted, isInput, isLibraryEvent } from "../AssistantEvent.js";
 import { ChatLog } from "../ChatLog.js";
 import { CurrentChat } from "../CurrentChat.js";
 import { Chats } from "../Chats.js";
 import { Runner } from "../Specialist.js";
-import { TurnDecisions, approvedCalls, unresolved, verdict } from "./decisions.js";
-import { decodeEntries, encode, isRegistered } from "./events.js";
+import { decodeEntries, encode, isRegistered, markInput } from "./events.js";
 import { needsTurn } from "./history.js";
 import { makeRunner } from "./specialists.js";
 import { run } from "./turns.js";
-import * as Predicate from "effect/Predicate";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as Predicate from "effect/Predicate";
 import * as Stream from "effect/Stream";
 import * as Exit from "effect/Exit";
-import * as Option from "effect/Option";
 import * as Scope from "effect/Scope";
 import * as Ref from "effect/Ref";
 import * as Cause from "effect/Cause";
@@ -53,14 +51,12 @@ const refused = (input, why) => Effect.logDebug(`assistant chat ${why}: ${input.
 const make = Effect.fnUntraced(function* (options) {
 	const { registration, chatId } = options;
 	const { app } = registration.definition;
-	const { wakes } = app;
 	const storage = yield* ChatLog;
 	const chats = yield* Chats;
 	const initial = yield* storage.read(chatId);
 	if (initial.some(isChatDeleted)) return deletedChat(initial);
 	const channel = yield* makeChannelPubSub;
 	const writes = yield* Semaphore.make(1);
-	const storing = yield* Semaphore.make(1);
 	const turnsLock = yield* Semaphore.make(1);
 	const holding = yield* makeHolding(options.keepAlive);
 	const deleted = yield* Deferred.make();
@@ -93,36 +89,17 @@ const make = Effect.fnUntraced(function* (options) {
 		entries: Effect.map(chat.entries, (all) => decodeEntries(app, all)),
 		append: (...events) => Effect.asVoid(Effect.flatMap(Effect.forEach(events, toStored), chat.append))
 	};
-	const resolve = Effect.fnUntraced(function* (decided, answer) {
-		yield* chat.append(decided.map(({ request, outcome }) => DecisionResolved.make({
-			id: request.id,
-			outcome,
-			answer
-		})));
-	});
 	const checkAvailable = chats.get(chatId).pipe(Effect.as(true), Effect.catchTag("GetChatError", (unavailable) => unavailable.reason === "Deleted" ? Effect.as(Effect.suspend(() => remove), false) : Effect.succeed(false)));
 	const store = Effect.fnUntraced(function* (input) {
 		if (yield* isDeleted) return yield* refused(input, "is deleted");
 		if (!(yield* checkAvailable)) return yield* refused(input, "is unavailable");
-		const verdict$2 = yield* Semaphore.withPermit(writes)(Effect.gen(function* () {
-			if (yield* isDeleted) {
-				yield* refused(input, "is deleted");
-				return Option.none();
-			}
-			const stored = yield* Ref.get(entries);
+		yield* Semaphore.withPermit(writes)(Effect.gen(function* () {
+			if (yield* isDeleted) return yield* refused(input, "is deleted");
 			const id = idOf(input);
-			if (id !== void 0 && stored.some(({ event }) => idOf(event) === id)) return Option.none();
-			const verdict$1 = verdict(stored, input);
-			if (Predicate.isTagged(verdict$1, "Refuse")) {
-				yield* Effect.logWarning(`assistant chat refused ${input._tag}: ${verdict$1.reason}`);
-				return Option.none();
-			}
-			yield* write([input]);
-			return Option.some(verdict$1);
+			if (id !== void 0 && (yield* Ref.get(entries)).some(({ event }) => idOf(event) === id)) return;
+			yield* write([isLibraryEvent(input) ? input : markInput(input)]);
 		}));
-		if (Option.isSome(verdict$2) && Predicate.isTagged(verdict$2.value, "Decide")) yield* resolve(verdict$2.value.decided, verdict$2.value.answer);
-	}, Semaphore.withPermit(storing));
-	yield* Effect.forEach(unresolved(yield* Ref.get(entries)), (decided) => resolve([decided], decided.answer), { discard: true });
+	});
 	const handler = yield* inWorking(Effect.provideService(registration.open(handle), CurrentChat, handle));
 	const specialists = yield* Effect.forEach(registration.specialists, Effect.fnUntraced(function* ({ specialist, built }) {
 		return {
@@ -137,7 +114,7 @@ const make = Effect.fnUntraced(function* (options) {
 		if (Exit.isFailure(exit) && !Cause.hasInterruptsOnly(exit.cause)) return yield* Effect.failCause(exit.cause);
 	}, Effect.orDie);
 	const drain = Semaphore.withPermit(turnsLock)(Effect.gen(function* () {
-		while (!(yield* isDeleted) && needsTurn(yield* chat.entries, wakes)) yield* run({
+		while (!(yield* isDeleted) && needsTurn(yield* chat.entries)) yield* run({
 			registration,
 			handler,
 			chat,
@@ -156,10 +133,7 @@ const make = Effect.fnUntraced(function* (options) {
 			yield* inBackground(drain);
 		})
 	}));
-	const services = Context.make(CurrentChat, handle).pipe(Context.add(Runner, runner), Context.add(TurnDecisions, Option.some({ approved: Effect.gen(function* () {
-		const all = yield* chat.entries;
-		return approvedCalls(all);
-	}) })), Context.merge(registration.model));
+	const services = Context.make(CurrentChat, handle).pipe(Context.add(Runner, runner), Context.merge(registration.model));
 	const remove = Effect.gen(function* () {
 		if (!(yield* Semaphore.withPermit(writes)(Effect.gen(function* () {
 			if (yield* isDeleted) return false;
@@ -183,7 +157,7 @@ const make = Effect.fnUntraced(function* (options) {
 			yield* inBackground(drain);
 		}),
 		resume: Effect.gen(function* () {
-			if (needsTurn(yield* chat.entries, wakes)) yield* inBackground(drain);
+			if (needsTurn(yield* chat.entries)) yield* inBackground(drain);
 		}),
 		stream: (after) => Stream.unwrap(Effect.gen(function* () {
 			const subscription = yield* PubSub.subscribe(channel);

package/dist/internal/chat.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat.js","names":["AssistantEvent.isLibraryEvent","AssistantEvent.isInput","Chats.Chats","AppEvents.isRegistered","AppEvents.encode","AppEvents.decodeEntries","verdict","Decisions.verdict","Decisions.unresolved","History.needsTurn","Turns.run","Specialists.makeRunner","SpecialistService.Runner","Decisions.TurnDecisions","Decisions.approvedCalls"],"sources":["../../src/internal/chat.ts"],"sourcesContent":["import * as Cause from \"effect/Cause\"\nimport * as Context from \"effect/Context\"\nimport * as Deferred from \"effect/Deferred\"\nimport * as Effect from \"effect/Effect\"\nimport * as Exit from \"effect/Exit\"\nimport * as Fiber from \"effect/Fiber\"\nimport * as FiberSet from \"effect/FiberSet\"\nimport * as Option from \"effect/Option\"\nimport * as Predicate from \"effect/Predicate\"\nimport * as PubSub from \"effect/PubSub\"\nimport * as Ref from \"effect/Ref\"\nimport * as Scope from \"effect/Scope\"\nimport * as Semaphore from \"effect/Semaphore\"\nimport * as Stream from \"effect/Stream\"\nimport * as SynchronizedRef from \"effect/SynchronizedRef\"\nimport * as AssistantEvent from \"../AssistantEvent.ts\"\nimport type { ChatId } from \"../ChatId.ts\"\nimport { ChatLog } from \"../ChatLog.ts\"\nimport { CurrentChat } from \"../CurrentChat.ts\"\nimport type { InputId } from \"../InputId.ts\"\nimport * as Chats from \"../Chats.ts\"\nimport * as SpecialistService from \"../Specialist.ts\"\nimport * as Decisions from \"./decisions.ts\"\nimport * as AppEvents from \"./events.ts\"\nimport * as History from \"./history.ts\"\nimport * as Specialists from \"./specialists.ts\"\nimport * as Turns from \"./turns.ts\"\nimport type { Writer } from \"./writer.ts\"\n\nconst idOf = (event: { readonly _tag: string }): string | undefined =>\n  AssistantEvent.isLibraryEvent(event)\n    ? AssistantEvent.isInput(event)\n      ? event.id\n      : undefined\n    : Predicate.hasProperty(event, \"id\") && Predicate.isString(event.id)\n      ? event.id\n      : undefined\n\nconst makeChannelPubSub = Effect.acquireRelease(PubSub.unbounded<AssistantEvent.Entry>(), PubSub.shutdown)\n\nconst makeHolding = Effect.fnUntraced(function* (keepAlive: (enabled: boolean) => Effect.Effect<void>) {\n  const holds = yield* SynchronizedRef.make(0)\n\n  const acquire = SynchronizedRef.updateEffect(\n    holds,\n    Effect.fnUntraced(function* (n: number) {\n      if (n !== 0) return n + 1\n\n      yield* keepAlive(true)\n\n      return 1\n    })\n  )\n\n  const release = SynchronizedRef.updateEffect(\n    holds,\n    Effect.fnUntraced(function* (n: number) {\n      if (n !== 1) return n - 1\n\n      yield* keepAlive(false)\n\n      return 0\n    })\n  )\n\n  return (effect: Effect.Effect<void>) =>\n    Effect.acquireUseRelease(\n      acquire,\n      () => effect,\n      // An interrupted effect (a shutdown) keeps its hold, so the chat starts again and picks up where it was cut off.\n      (_, exit) => (Exit.hasInterrupts(exit) ? Effect.void : release)\n    )\n})\n\n/** @internal */\nexport interface Chat {\n  readonly submit: (input: AssistantEvent.Input | AssistantEvent.StoredAppEvent) => Effect.Effect<void>\n  readonly submitInBackground: (input: AssistantEvent.Input | AssistantEvent.StoredAppEvent) => Effect.Effect<void>\n  // For inputs no turn has read, like a report stored during a shutdown.\n  readonly resume: Effect.Effect<void>\n  readonly stream: (after: number) => Stream.Stream<AssistantEvent.Entry>\n  // Stops what works in the chat and ends its subscribers' streams; its log stays.\n  readonly delete: Effect.Effect<void>\n}\n\nconst isChatDeleted = (entry: AssistantEvent.Entry) => Predicate.isTagged(entry.event, \"ChatDeleted\")\n\nconst deletedChat = (entries: ReadonlyArray<AssistantEvent.Entry>): Chat => ({\n  submit: () => Effect.void,\n  submitInBackground: () => Effect.void,\n  resume: Effect.void,\n  stream: (after) => Stream.fromIterable(entries.filter((entry) => entry.seq > after)),\n  delete: Effect.void\n})\n\nconst refused = (input: { readonly _tag: string }, why: string) =>\n  Effect.logDebug(`assistant chat ${why}: ${input._tag} not stored`)\n\n/** @internal */\nexport const make = Effect.fnUntraced(function* (options: {\n  readonly registration: Turns.Registration\n  readonly chatId: ChatId\n  readonly keepAlive: (enabled: boolean) => Effect.Effect<void>\n}) {\n  const { registration, chatId } = options\n  const { app } = registration.definition\n  const { wakes } = app\n  const storage = yield* ChatLog\n  const chats = yield* Chats.Chats\n  const initial = yield* storage.read(chatId)\n\n  if (initial.some(isChatDeleted)) return deletedChat(initial)\n\n  const channel = yield* makeChannelPubSub\n  const writes = yield* Semaphore.make(1)\n  // Inputs are stored one at a time with the decisions they make: an answer checks the decisions the last one made.\n  const storing = yield* Semaphore.make(1)\n  const turnsLock = yield* Semaphore.make(1)\n  const holding = yield* makeHolding(options.keepAlive)\n  const deleted = yield* Deferred.make<undefined>()\n  // So deleting the chat stops all its work: its turns, runs, and the builds' resources.\n  const working = yield* Scope.fork(yield* Effect.scope)\n  const inWorking = Effect.provideService(Scope.Scope, working)\n  const background = yield* inWorking(FiberSet.make())\n  const requests = yield* inWorking(FiberSet.make())\n\n  const isDeleted = Deferred.isDone(deleted)\n\n  // The chat is its log's only writer, so it reads the log once and turns read memory.\n  const entries = yield* Ref.make(initial)\n\n  // Every writer goes through here, one at a time, so each append is numbered after the last. After a delete it\n  // stores nothing.\n  const write = Effect.fnUntraced(function* (\n    events: ReadonlyArray<AssistantEvent.AssistantEvent | AssistantEvent.StoredAppEvent>\n  ) {\n    const unknown = events.find((event) => !AssistantEvent.isLibraryEvent(event) && !AppEvents.isRegistered(app, event))\n\n    if (unknown !== undefined) {\n      return yield* Effect.die(`${unknown._tag} isn't one of the ${registration.definition.name} assistant's events.`)\n    }\n\n    if (yield* isDeleted) return []\n\n    return yield* stored(events)\n  })\n\n  // Uninterruptible: a stored append must reach memory and the subscribers too, or a turn misses it and replies twice.\n  const stored = Effect.fnUntraced(function* (\n    events: ReadonlyArray<AssistantEvent.AssistantEvent | AssistantEvent.StoredAppEvent>\n  ) {\n    const stored = yield* storage.append(chatId, events)\n\n    yield* Ref.update(entries, (all) => [...all, ...stored])\n    yield* PubSub.publishAll(channel, stored)\n\n    return stored\n  }, Effect.uninterruptible)\n\n  const chat: Writer = {\n    chatId,\n    entries: Ref.get(entries),\n    append: (events) => Semaphore.withPermit(writes)(write(events))\n  }\n\n  const toStored = (event: {\n    readonly _tag: string\n  }): Effect.Effect<AssistantEvent.AssistantEvent | AssistantEvent.StoredAppEvent> =>\n    AssistantEvent.isLibraryEvent(event)\n      ? Effect.succeed(event)\n      : AppEvents.isRegistered(app, event)\n        ? AppEvents.encode(app, event)\n        : Effect.die(`${event._tag} isn't one of the ${registration.definition.name} assistant's events.`)\n\n  // What handlers, tools, and runs see: the assistant's own events decoded, and encoded when appended.\n  const handle: Turns.TypedChat = {\n    chatId,\n    entries: Effect.map(chat.entries, (all) => AppEvents.decodeEntries(app, all)),\n    append: (...events) => Effect.asVoid(Effect.flatMap(Effect.forEach(events, toStored), chat.append))\n  }\n\n  // An approved call runs at the turn's next step.\n  const resolve = Effect.fnUntraced(function* (decided: ReadonlyArray<Decisions.Decided>, answer: InputId) {\n    yield* chat.append(\n      decided.map(({ request, outcome }) => AssistantEvent.DecisionResolved.make({ id: request.id, outcome, answer }))\n    )\n  })\n\n  // A chat the app deleted is deleted here too, which stops what works in it: a turn that checks stops there.\n  const checkAvailable: Effect.Effect<boolean> = chats.get(chatId).pipe(\n    Effect.as(true),\n    Effect.catchTag(\"GetChatError\", (unavailable) =>\n      unavailable.reason === \"Deleted\"\n        ? Effect.as(\n            Effect.suspend(() => remove),\n            false\n          )\n        : Effect.succeed(false)\n    )\n  )\n\n  // Under `storing`: an answer's decisions are resolved before the next input is stored.\n  const store = Effect.fnUntraced(function* (input: AssistantEvent.Input | AssistantEvent.StoredAppEvent) {\n    if (yield* isDeleted) return yield* refused(input, \"is deleted\")\n\n    if (!(yield* checkAvailable)) return yield* refused(input, \"is unavailable\")\n\n    // Checked under the write lock: a retry that arrives while the first submit is storing is stored once.\n    const verdict = yield* Semaphore.withPermit(writes)(\n      Effect.gen(function* () {\n        if (yield* isDeleted) {\n          yield* refused(input, \"is deleted\")\n\n          return Option.none()\n        }\n\n        const stored = yield* Ref.get(entries)\n        const id = idOf(input)\n\n        if (id !== undefined && stored.some(({ event }) => idOf(event) === id)) return Option.none()\n\n        const verdict = Decisions.verdict(stored, input)\n\n        if (Predicate.isTagged(verdict, \"Refuse\")) {\n          yield* Effect.logWarning(`assistant chat refused ${input._tag}: ${verdict.reason}`)\n\n          return Option.none()\n        }\n\n        yield* write([input])\n\n        return Option.some(verdict)\n      })\n    )\n\n    if (Option.isSome(verdict) && Predicate.isTagged(verdict.value, \"Decide\")) {\n      yield* resolve(verdict.value.decided, verdict.value.answer)\n    }\n  }, Semaphore.withPermit(storing))\n\n  // A restart between storing an answer and resolving it: resolve it now, before anything reads the chat.\n  yield* Effect.forEach(\n    Decisions.unresolved(yield* Ref.get(entries)),\n    (decided) => resolve([decided], decided.answer),\n    { discard: true }\n  )\n\n  // The handlers' builds run in the chat's working scope: what they set up lives until the chat closes or is deleted.\n  const handler = yield* inWorking(Effect.provideService(registration.open(handle), CurrentChat, handle))\n\n  const specialists = yield* Effect.forEach(\n    registration.specialists,\n    Effect.fnUntraced(function* ({ specialist, built }) {\n      const handler = yield* inWorking(Effect.provideService(built.open, CurrentChat, handle))\n\n      return { specialist, handler }\n    })\n  )\n\n  const inBackground = (effect: Effect.Effect<void>) => FiberSet.run(background, holding(effect)).pipe(Effect.asVoid)\n\n  // A request's turns run in the working scope too, so a delete stops them; the request ends quietly then.\n  const inRequest = Effect.fnUntraced(function* (effect: Effect.Effect<void>) {\n    const fiber = yield* FiberSet.run(requests, effect)\n    const exit = yield* Fiber.await(fiber).pipe(Effect.onInterrupt(() => Fiber.interrupt(fiber)))\n\n    if (Exit.isFailure(exit) && !Cause.hasInterruptsOnly(exit.cause)) {\n      return yield* Effect.failCause(exit.cause)\n    }\n  }, Effect.orDie)\n\n  const drain: Effect.Effect<void> = Semaphore.withPermit(turnsLock)(\n    Effect.gen(function* () {\n      while (!(yield* isDeleted) && History.needsTurn(yield* chat.entries, wakes)) {\n        yield* Turns.run({ registration, handler, chat, services, checkOpen: Effect.asVoid(checkAvailable) })\n      }\n    })\n  )\n\n  const runner = yield* inWorking(\n    Specialists.makeRunner({\n      chat,\n      handle,\n      specialists,\n      model: registration.model,\n      holding,\n      report: Effect.fnUntraced(function* (finished) {\n        yield* store(finished)\n        yield* inBackground(drain)\n      })\n    })\n  )\n\n  const services = Context.make(CurrentChat, handle).pipe(\n    Context.add(SpecialistService.Runner, runner),\n    Context.add(\n      Decisions.TurnDecisions,\n      Option.some({\n        approved: Effect.gen(function* () {\n          const all = yield* chat.entries\n\n          return Decisions.approvedCalls(all)\n        })\n      })\n    ),\n    Context.merge(registration.model)\n  )\n\n  const remove = Effect.gen(function* () {\n    // Under the write lock: an append in flight is stored before the `ChatDeleted`; none comes after.\n    const first = yield* Semaphore.withPermit(writes)(\n      Effect.gen(function* () {\n        if (yield* isDeleted) return false\n\n        yield* stored([AssistantEvent.ChatDeleted.make({})])\n\n        return yield* Deferred.succeed(deleted, undefined)\n      })\n    ).pipe(Effect.uninterruptible)\n\n    if (!first) return\n\n    // Its own fiber: a tool that deletes its own chat is in the working scope, and closing it interrupts that tool.\n    // Interrupted work keeps its hold (see `makeHolding`), so the chat lets go of it here.\n    const closing = yield* Effect.forkDetach(\n      Effect.gen(function* () {\n        yield* Scope.close(working, Exit.void)\n        yield* options.keepAlive(false)\n      })\n    )\n\n    yield* Fiber.await(closing)\n  })\n\n  // A chat the app deleted while it was closed is deleted now, so its subscribers hear it.\n  yield* checkAvailable\n\n  const chatApi: Chat = {\n    submit: Effect.fnUntraced(function* (input) {\n      yield* store(input)\n      yield* inRequest(drain)\n    }),\n    submitInBackground: Effect.fnUntraced(function* (input) {\n      yield* store(input)\n      yield* inBackground(drain)\n    }),\n    resume: Effect.gen(function* () {\n      if (History.needsTurn(yield* chat.entries, wakes)) yield* inBackground(drain)\n    }),\n    stream: (after) =>\n      Stream.unwrap(\n        Effect.gen(function* () {\n          // Subscribes before it reads, so nothing appended in between is missed.\n          const subscription = yield* PubSub.subscribe(channel)\n          const all = yield* chat.entries\n          const stored = all.filter((entry) => entry.seq > after)\n          const last = stored.at(-1)?.seq ?? after\n\n          // Deleted: what the reader hasn't seen, then the end. Otherwise the stream ends with the `ChatDeleted`.\n          if (all.some(isChatDeleted)) return Stream.fromIterable(stored)\n\n          return Stream.concat(\n            Stream.fromIterable(stored),\n            Stream.fromSubscription(subscription).pipe(Stream.filter((entry) => entry.seq > last))\n          ).pipe(Stream.takeUntil(isChatDeleted))\n        })\n      ),\n    delete: remove\n  }\n\n  return chatApi\n})\n"],"mappings":"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"}
+{"version":3,"file":"chat.js","names":["AssistantEvent.isLibraryEvent","AssistantEvent.isInput","Chats.Chats","AppEvents.isRegistered","AppEvents.encode","AppEvents.decodeEntries","AppEvents.markInput","History.needsTurn","Turns.run","Specialists.makeRunner","SpecialistService.Runner"],"sources":["../../src/internal/chat.ts"],"sourcesContent":["import * as Cause from \"effect/Cause\"\nimport * as Context from \"effect/Context\"\nimport * as Deferred from \"effect/Deferred\"\nimport * as Effect from \"effect/Effect\"\nimport * as Exit from \"effect/Exit\"\nimport * as Fiber from \"effect/Fiber\"\nimport * as FiberSet from \"effect/FiberSet\"\nimport * as Predicate from \"effect/Predicate\"\nimport * as PubSub from \"effect/PubSub\"\nimport * as Ref from \"effect/Ref\"\nimport * as Scope from \"effect/Scope\"\nimport * as Semaphore from \"effect/Semaphore\"\nimport * as Stream from \"effect/Stream\"\nimport * as SynchronizedRef from \"effect/SynchronizedRef\"\nimport * as AssistantEvent from \"../AssistantEvent.ts\"\nimport type { ChatId } from \"../ChatId.ts\"\nimport { ChatLog } from \"../ChatLog.ts\"\nimport { CurrentChat } from \"../CurrentChat.ts\"\nimport * as Chats from \"../Chats.ts\"\nimport * as SpecialistService from \"../Specialist.ts\"\nimport * as AppEvents from \"./events.ts\"\nimport * as History from \"./history.ts\"\nimport * as Specialists from \"./specialists.ts\"\nimport * as Turns from \"./turns.ts\"\nimport type { Writer } from \"./writer.ts\"\n\nconst idOf = (event: { readonly _tag: string }): string | undefined =>\n  AssistantEvent.isLibraryEvent(event)\n    ? AssistantEvent.isInput(event)\n      ? event.id\n      : undefined\n    : Predicate.hasProperty(event, \"id\") && Predicate.isString(event.id)\n      ? event.id\n      : undefined\n\nconst makeChannelPubSub = Effect.acquireRelease(PubSub.unbounded<AssistantEvent.Entry>(), PubSub.shutdown)\n\nconst makeHolding = Effect.fnUntraced(function* (keepAlive: (enabled: boolean) => Effect.Effect<void>) {\n  const holds = yield* SynchronizedRef.make(0)\n\n  const acquire = SynchronizedRef.updateEffect(\n    holds,\n    Effect.fnUntraced(function* (n: number) {\n      if (n !== 0) return n + 1\n\n      yield* keepAlive(true)\n\n      return 1\n    })\n  )\n\n  const release = SynchronizedRef.updateEffect(\n    holds,\n    Effect.fnUntraced(function* (n: number) {\n      if (n !== 1) return n - 1\n\n      yield* keepAlive(false)\n\n      return 0\n    })\n  )\n\n  return (effect: Effect.Effect<void>) =>\n    Effect.acquireUseRelease(\n      acquire,\n      () => effect,\n      // An interrupted effect (a shutdown) keeps its hold, so the chat starts again and picks up where it was cut off.\n      (_, exit) => (Exit.hasInterrupts(exit) ? Effect.void : release)\n    )\n})\n\n/** @internal */\nexport interface Chat {\n  readonly submit: (input: AssistantEvent.Input | AssistantEvent.StoredAppEvent) => Effect.Effect<void>\n  readonly submitInBackground: (input: AssistantEvent.Input | AssistantEvent.StoredAppEvent) => Effect.Effect<void>\n  // For inputs no turn has read, like a report stored during a shutdown.\n  readonly resume: Effect.Effect<void>\n  readonly stream: (after: number) => Stream.Stream<AssistantEvent.Entry>\n  // Stops what works in the chat and ends its subscribers' streams; its log stays.\n  readonly delete: Effect.Effect<void>\n}\n\nconst isChatDeleted = (entry: AssistantEvent.Entry) => Predicate.isTagged(entry.event, \"ChatDeleted\")\n\nconst deletedChat = (entries: ReadonlyArray<AssistantEvent.Entry>): Chat => ({\n  submit: () => Effect.void,\n  submitInBackground: () => Effect.void,\n  resume: Effect.void,\n  stream: (after) => Stream.fromIterable(entries.filter((entry) => entry.seq > after)),\n  delete: Effect.void\n})\n\nconst refused = (input: { readonly _tag: string }, why: string) =>\n  Effect.logDebug(`assistant chat ${why}: ${input._tag} not stored`)\n\n/** @internal */\nexport const make = Effect.fnUntraced(function* (options: {\n  readonly registration: Turns.Registration\n  readonly chatId: ChatId\n  readonly keepAlive: (enabled: boolean) => Effect.Effect<void>\n}) {\n  const { registration, chatId } = options\n  const { app } = registration.definition\n  const storage = yield* ChatLog\n  const chats = yield* Chats.Chats\n  const initial = yield* storage.read(chatId)\n\n  if (initial.some(isChatDeleted)) return deletedChat(initial)\n\n  const channel = yield* makeChannelPubSub\n  const writes = yield* Semaphore.make(1)\n  const turnsLock = yield* Semaphore.make(1)\n  const holding = yield* makeHolding(options.keepAlive)\n  const deleted = yield* Deferred.make<undefined>()\n  // So deleting the chat stops all its work: its turns, runs, and the builds' resources.\n  const working = yield* Scope.fork(yield* Effect.scope)\n  const inWorking = Effect.provideService(Scope.Scope, working)\n  const background = yield* inWorking(FiberSet.make())\n  const requests = yield* inWorking(FiberSet.make())\n\n  const isDeleted = Deferred.isDone(deleted)\n\n  // The chat is its log's only writer, so it reads the log once and turns read memory.\n  const entries = yield* Ref.make(initial)\n\n  // Every writer goes through here, one at a time, so each append is numbered after the last. After a delete it\n  // stores nothing.\n  const write = Effect.fnUntraced(function* (\n    events: ReadonlyArray<AssistantEvent.AssistantEvent | AssistantEvent.StoredAppEvent>\n  ) {\n    const unknown = events.find((event) => !AssistantEvent.isLibraryEvent(event) && !AppEvents.isRegistered(app, event))\n\n    if (unknown !== undefined) {\n      return yield* Effect.die(`${unknown._tag} isn't one of the ${registration.definition.name} assistant's events.`)\n    }\n\n    if (yield* isDeleted) return []\n\n    return yield* stored(events)\n  })\n\n  // Uninterruptible: a stored append must reach memory and the subscribers too, or a turn misses it and replies twice.\n  const stored = Effect.fnUntraced(function* (\n    events: ReadonlyArray<AssistantEvent.AssistantEvent | AssistantEvent.StoredAppEvent>\n  ) {\n    const stored = yield* storage.append(chatId, events)\n\n    yield* Ref.update(entries, (all) => [...all, ...stored])\n    yield* PubSub.publishAll(channel, stored)\n\n    return stored\n  }, Effect.uninterruptible)\n\n  const chat: Writer = {\n    chatId,\n    entries: Ref.get(entries),\n    append: (events) => Semaphore.withPermit(writes)(write(events))\n  }\n\n  const toStored = (event: {\n    readonly _tag: string\n  }): Effect.Effect<AssistantEvent.AssistantEvent | AssistantEvent.StoredAppEvent> =>\n    AssistantEvent.isLibraryEvent(event)\n      ? Effect.succeed(event)\n      : AppEvents.isRegistered(app, event)\n        ? AppEvents.encode(app, event)\n        : Effect.die(`${event._tag} isn't one of the ${registration.definition.name} assistant's events.`)\n\n  // What handlers, tools, and runs see: the assistant's own events decoded, and encoded when appended.\n  const handle: Turns.TypedChat = {\n    chatId,\n    entries: Effect.map(chat.entries, (all) => AppEvents.decodeEntries(app, all)),\n    append: (...events) => Effect.asVoid(Effect.flatMap(Effect.forEach(events, toStored), chat.append))\n  }\n\n  // A chat the app deleted is deleted here too, which stops what works in it: a turn that checks stops there.\n  const checkAvailable: Effect.Effect<boolean> = chats.get(chatId).pipe(\n    Effect.as(true),\n    Effect.catchTag(\"GetChatError\", (unavailable) =>\n      unavailable.reason === \"Deleted\"\n        ? Effect.as(\n            Effect.suspend(() => remove),\n            false\n          )\n        : Effect.succeed(false)\n    )\n  )\n\n  const store = Effect.fnUntraced(function* (input: AssistantEvent.Input | AssistantEvent.StoredAppEvent) {\n    if (yield* isDeleted) return yield* refused(input, \"is deleted\")\n\n    if (!(yield* checkAvailable)) return yield* refused(input, \"is unavailable\")\n\n    // Checked under the write lock: a retry that arrives while the first submit is storing is stored once.\n    yield* Semaphore.withPermit(writes)(\n      Effect.gen(function* () {\n        if (yield* isDeleted) return yield* refused(input, \"is deleted\")\n\n        const id = idOf(input)\n\n        if (id !== undefined && (yield* Ref.get(entries)).some(({ event }) => idOf(event) === id)) return\n\n        // Stored as an input: it came in from outside a turn, so it wakes one, also after a restart.\n        yield* write([AssistantEvent.isLibraryEvent(input) ? input : AppEvents.markInput(input)])\n      })\n    )\n  })\n\n  // The handlers' builds run in the chat's working scope: what they set up lives until the chat closes or is deleted.\n  const handler = yield* inWorking(Effect.provideService(registration.open(handle), CurrentChat, handle))\n\n  const specialists = yield* Effect.forEach(\n    registration.specialists,\n    Effect.fnUntraced(function* ({ specialist, built }) {\n      const handler = yield* inWorking(Effect.provideService(built.open, CurrentChat, handle))\n\n      return { specialist, handler }\n    })\n  )\n\n  const inBackground = (effect: Effect.Effect<void>) => FiberSet.run(background, holding(effect)).pipe(Effect.asVoid)\n\n  // A request's turns run in the working scope too, so a delete stops them; the request ends quietly then.\n  const inRequest = Effect.fnUntraced(function* (effect: Effect.Effect<void>) {\n    const fiber = yield* FiberSet.run(requests, effect)\n    const exit = yield* Fiber.await(fiber).pipe(Effect.onInterrupt(() => Fiber.interrupt(fiber)))\n\n    if (Exit.isFailure(exit) && !Cause.hasInterruptsOnly(exit.cause)) {\n      return yield* Effect.failCause(exit.cause)\n    }\n  }, Effect.orDie)\n\n  const drain: Effect.Effect<void> = Semaphore.withPermit(turnsLock)(\n    Effect.gen(function* () {\n      while (!(yield* isDeleted) && History.needsTurn(yield* chat.entries)) {\n        yield* Turns.run({ registration, handler, chat, services, checkOpen: Effect.asVoid(checkAvailable) })\n      }\n    })\n  )\n\n  const runner = yield* inWorking(\n    Specialists.makeRunner({\n      chat,\n      handle,\n      specialists,\n      model: registration.model,\n      holding,\n      report: Effect.fnUntraced(function* (finished) {\n        yield* store(finished)\n        yield* inBackground(drain)\n      })\n    })\n  )\n\n  const services = Context.make(CurrentChat, handle).pipe(\n    Context.add(SpecialistService.Runner, runner),\n    Context.merge(registration.model)\n  )\n\n  const remove = Effect.gen(function* () {\n    // Under the write lock: an append in flight is stored before the `ChatDeleted`; none comes after.\n    const first = yield* Semaphore.withPermit(writes)(\n      Effect.gen(function* () {\n        if (yield* isDeleted) return false\n\n        yield* stored([AssistantEvent.ChatDeleted.make({})])\n\n        return yield* Deferred.succeed(deleted, undefined)\n      })\n    ).pipe(Effect.uninterruptible)\n\n    if (!first) return\n\n    // Its own fiber: a tool that deletes its own chat is in the working scope, and closing it interrupts that tool.\n    // Interrupted work keeps its hold (see `makeHolding`), so the chat lets go of it here.\n    const closing = yield* Effect.forkDetach(\n      Effect.gen(function* () {\n        yield* Scope.close(working, Exit.void)\n        yield* options.keepAlive(false)\n      })\n    )\n\n    yield* Fiber.await(closing)\n  })\n\n  // A chat the app deleted while it was closed is deleted now, so its subscribers hear it.\n  yield* checkAvailable\n\n  const chatApi: Chat = {\n    submit: Effect.fnUntraced(function* (input) {\n      yield* store(input)\n      yield* inRequest(drain)\n    }),\n    submitInBackground: Effect.fnUntraced(function* (input) {\n      yield* store(input)\n      yield* inBackground(drain)\n    }),\n    resume: Effect.gen(function* () {\n      if (History.needsTurn(yield* chat.entries)) yield* inBackground(drain)\n    }),\n    stream: (after) =>\n      Stream.unwrap(\n        Effect.gen(function* () {\n          // Subscribes before it reads, so nothing appended in between is missed.\n          const subscription = yield* PubSub.subscribe(channel)\n          const all = yield* chat.entries\n          const stored = all.filter((entry) => entry.seq > after)\n          const last = stored.at(-1)?.seq ?? after\n\n          // Deleted: what the reader hasn't seen, then the end. Otherwise the stream ends with the `ChatDeleted`.\n          if (all.some(isChatDeleted)) return Stream.fromIterable(stored)\n\n          return Stream.concat(\n            Stream.fromIterable(stored),\n            Stream.fromSubscription(subscription).pipe(Stream.filter((entry) => entry.seq > last))\n          ).pipe(Stream.takeUntil(isChatDeleted))\n        })\n      ),\n    delete: remove\n  }\n\n  return chatApi\n})\n"],"mappings":"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"}

package/dist/internal/events.d.ts

@@ -1,46 +1,45 @@
-import { Any, AppEvent_d_exports, EventSchema, Render } from "../AppEvent.js";
-import { AnyEntry, AssistantEvent_d_exports } from "../AssistantEvent.js";
+import { AnyEntry, AppEventSchema, AssistantEvent_d_exports, StoredAppEvent } from "../AssistantEvent.js";
 import { Assistant_d_exports, Entry } from "../Assistant.js";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import * as Option from "effect/Option";
 declare namespace events_d_exports {
-  export { AppEvents, DecodedEntries, decodeEntries, decodeEntry, encode, isRegistered, make, read };
+  export { AppEvents, DecodedEntries, decodeEntries, decodeEntry, decodeWith, encode, isRegistered, make, markInput, tagOf };
 }
 /** @internal */
 export interface AppEvents {
-  readonly byTag: ReadonlyMap<string, Registered>;
-  readonly wakes: ReadonlySet<string>;
-}
-interface Registered {
-  readonly schema: EventSchema;
-  readonly render: Render<{
-    readonly _tag: string;
-  }> | undefined;
+  readonly byTag: ReadonlyMap<string, AppEventSchema>;
 }
 /** @internal */
-export declare const make: (events: ReadonlyArray<Any>) => AppEvents;
+export declare const tagOf: (schema: AppEventSchema) => string;
+/** @internal */
+export declare const make: (events: ReadonlyArray<AppEventSchema>) => AppEvents;
 /** @internal */
 export declare const encode: (app: AppEvents, event: {
   readonly _tag: string;
 }) => Effect.Effect<{
   readonly [x: string]: Schema.Json;
   readonly _tag: string & import("effect/Brand").Brand<"~effect-assistant/AppTag">;
+  readonly "~effect-assistant/input"?: true | undefined;
 }, never, never>;
 /** @internal */
 export declare const isRegistered: (app: AppEvents, event: {
   readonly _tag: string;
 }) => boolean;
 /** @internal */
+export declare const decodeWith: (schema: AppEventSchema, event: {
+  readonly _tag: string;
+}) => Option.Option<{
+  readonly _tag: string;
+}>;
+/** @internal */
+export declare const markInput: (event: StoredAppEvent) => StoredAppEvent;
+/** @internal */
 export declare const decodeEntry: (app: AppEvents, entry: AnyEntry) => Option.Option<Entry<any>>;
 /** @internal */
 export declare const decodeEntries: (app: AppEvents, entries: ReadonlyArray<AnyEntry>) => ReadonlyArray<Entry<any>>;
 /** @internal */
 export type DecodedEntries = ReturnType<typeof decodeEntries>;
-/** @internal */
-export declare const read: (app: AppEvents, event: {
-  readonly _tag: string;
-}) => string | undefined;
 //#endregion
 export { events_d_exports };
 //# sourceMappingURL=events.d.ts.map

package/dist/internal/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","names":[],"sources":["../../src/internal/events.ts"],"mappings":";;;;;;;;;;iBASiB;WACN,OAAO,oBAAoB;WAC3B,OAAO;;UAGR;WACC,QAAQ;WACR,QAAQ;aAA2B;;;;qBAIjC,OAAI,QAAY,cAAc,SAAgB;;qBAe9C,SAAM,KAAA,WAAA;WAAwE;;;;;;qBAY9E,eAAY,KAAS,WAAS;WAAoB;;;qBAIlD,cAAW,KAAS,WAAS,OAAS,aAA0B,OAAO,OAAO;;qBAgB9E,gBAAa,KACnB,WAAS,SACL,cAAc,cACtB,cAAc;;YAGL,iBAAiB,kBAAkB;;qBAWlC,OAAI,KAAS,WAAS;WAAoB"}
+{"version":3,"file":"events.d.ts","names":[],"sources":["../../src/internal/events.ts"],"mappings":";;;;;;;;;iBAWiB;WACN,OAAO,oBAAoB;;;qBAIzB,QAAK,QAAY;;qBASjB,OAAI,QAAY,cAAc,oBAAiC;;qBAa/D,SAAM,KAAA,WAAA;WAAwE;;;;;;;qBAY9E,eAAY,KAAS,WAAS;WAAoB;;;qBAQlD,aAAU,QACb,gBAA6B;WACnB;MACjB,OAAO;WAAkB;;;qBAUf,YAAS,OAAW,mBAAgC;;qBAOpD,cAAW,KAAS,WAAS,OAAS,aAA0B,OAAO,OAAO;;qBAS9E,gBAAa,KACnB,WAAS,SACL,cAAc,cACtB,cAAc;;YAGL,iBAAiB,kBAAkB"}

package/dist/internal/events.js

@@ -1,31 +1,46 @@
+import { inputKey } from "./input.js";
 import { StoredAppEvent, isLibraryEvent } from "../AssistantEvent.js";
-import { toJsonText } from "./schema.js";
 import * as Effect from "effect/Effect";
+import * as Predicate from "effect/Predicate";
 import * as Schema from "effect/Schema";
 import * as Option from "effect/Option";
+import * as Record from "effect/Record";
+import * as SchemaAST from "effect/SchemaAST";
 //#region src/internal/events.ts
 /** @internal */
+const tagOf = (schema) => {
+	const ast = schema.fields._tag.ast;
+	if (SchemaAST.isLiteral(ast) && Predicate.isString(ast.literal)) return ast.literal;
+	throw new Error("An app event is a tagged struct or class.");
+};
+/** @internal */
 const make = (events) => {
-	const byTag = new Map(events.map((event) => [event.tag, {
-		schema: event.schema,
-		render: event.render
-	}]));
+	const byTag = new Map(events.map((schema) => [tagOf(schema), schema]));
 	for (const tag of byTag.keys()) if (isLibraryEvent({ _tag: tag })) throw new Error(`${tag} is one of the library's events.`);
 	if (byTag.size !== events.length) throw new Error("An assistant's events have different tags.");
-	return {
-		byTag,
-		wakes: new Set(events.flatMap((event) => event.wakes ? [event.tag] : []))
-	};
+	return { byTag };
 };
 /** @internal */
 const encode = Effect.fnUntraced(function* (app, event) {
-	const registered = app.byTag.get(event._tag);
-	if (registered === void 0) return yield* Effect.die(`${event._tag} isn't one of this assistant's events.`);
-	const json = yield* Schema.encodeUnknownEffect(Schema.toCodecJson(registered.schema))(event);
+	const schema = app.byTag.get(event._tag);
+	if (schema === void 0) return yield* Effect.die(`${event._tag} isn't one of this assistant's events.`);
+	const json = yield* Schema.encodeUnknownEffect(Schema.toCodecJson(schema))(event);
 	return yield* Schema.decodeUnknownEffect(StoredAppEvent)(json);
 }, Effect.orDie);
 /** @internal */
 const isRegistered = (app, event) => app.byTag.has(event._tag);
+const unmarked = (event) => Predicate.hasProperty(event, "~effect-assistant/input") ? Record.remove(event, inputKey) : event;
+/** @internal */
+const decodeWith = (schema, event) => Schema.decodeUnknownOption(Schema.toCodecJson(schema))(unmarked(event));
+const decodeEvent = (app, event) => {
+	const schema = app.byTag.get(event._tag);
+	return schema === void 0 ? Option.none() : decodeWith(schema, event);
+};
+/** @internal */
+const markInput = (event) => ({
+	...event,
+	[inputKey]: true
+});
 /** @internal */
 const decodeEntry = (app, entry) => {
 	const { event } = entry;
@@ -33,33 +48,19 @@ const decodeEntry = (app, entry) => {
 		...toEntry(entry),
 		event
 	});
-	const registered = app.byTag.get(event._tag);
-	if (registered === void 0) return Option.none();
-	return Option.map(Schema.decodeUnknownOption(Schema.toCodecJson(registered.schema))(event), (decoded) => ({
+	return Option.map(decodeEvent(app, event), (decoded) => ({
 		...toEntry(entry),
 		event: decoded
 	}));
 };
 /** @internal */
 const decodeEntries = (app, entries) => entries.flatMap((entry) => Option.toArray(decodeEntry(app, entry)));
-const decodeStored = Schema.decodeUnknownOption(StoredAppEvent);
 const toEntry = (entry) => ({
 	chatId: entry.chatId,
 	seq: entry.seq,
 	at: entry.at
 });
-/** @internal */
-const read = (app, event) => {
-	const registered = app.byTag.get(event._tag);
-	if (registered?.render === void 0) return void 0;
-	if (registered.render !== "json") return registered.render(event);
-	const stored = Schema.encodeUnknownOption(Schema.toCodecJson(registered.schema))(event).pipe(Option.flatMap(decodeStored));
-	return Option.match(stored, {
-		onNone: () => void 0,
-		onSome: ({ _tag, ...fields }) => `<${_tag}>\n${toJsonText(fields)}\n</${_tag}>`
-	});
-};
 //#endregion
-export { decodeEntries, decodeEntry, encode, isRegistered, make, read };
+export { decodeEntries, decodeEntry, decodeWith, encode, isRegistered, make, markInput, tagOf };
 
 //# sourceMappingURL=events.js.map