effect-assistant 0.12.0 → 0.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Assistant.d.ts +26 -5
- package/dist/Assistant.d.ts.map +1 -1
- package/dist/Assistant.js +7 -1
- package/dist/Assistant.js.map +1 -1
- package/dist/AssistantEngine.d.ts +6 -2
- package/dist/AssistantEngine.d.ts.map +1 -1
- package/dist/AssistantEngine.js +18 -10
- package/dist/AssistantEngine.js.map +1 -1
- package/dist/AssistantLoop.js +1 -1
- package/dist/AssistantTest.js +1 -1
- package/dist/BlockKit.js +1 -1
- package/dist/ChatSignal.d.ts +58 -0
- package/dist/ChatSignal.d.ts.map +1 -0
- package/dist/ChatSignal.js +73 -0
- package/dist/ChatSignal.js.map +1 -0
- package/dist/Compaction.js +1 -1
- package/dist/Memory.js +1 -1
- package/dist/StatusSummary.d.ts +70 -0
- package/dist/StatusSummary.d.ts.map +1 -0
- package/dist/StatusSummary.js +84 -0
- package/dist/StatusSummary.js.map +1 -0
- package/dist/Timeline.d.ts +10 -2
- package/dist/Timeline.d.ts.map +1 -1
- package/dist/Timeline.js +72 -18
- package/dist/Timeline.js.map +1 -1
- package/dist/ToolStatus.d.ts +72 -0
- package/dist/ToolStatus.d.ts.map +1 -0
- package/dist/ToolStatus.js +71 -0
- package/dist/ToolStatus.js.map +1 -0
- package/dist/index.d.ts +4 -1
- package/dist/index.js +4 -1
- package/dist/internal/chat.js +18 -10
- package/dist/internal/chat.js.map +1 -1
- package/dist/internal/events.d.ts +1 -1
- package/dist/internal/events.js +1 -1
- package/dist/internal/history.js +1 -1
- package/dist/internal/live.js +87 -0
- package/dist/internal/live.js.map +1 -0
- package/dist/internal/loop.d.ts +1 -1
- package/dist/internal/loop.d.ts.map +1 -1
- package/dist/internal/loop.js +42 -11
- package/dist/internal/loop.js.map +1 -1
- package/dist/internal/schema.js +1 -1
- package/dist/internal/specialists.js +3 -2
- package/dist/internal/specialists.js.map +1 -1
- package/dist/internal/stream.js +72 -0
- package/dist/internal/stream.js.map +1 -0
- package/dist/internal/summary.js +65 -0
- package/dist/internal/summary.js.map +1 -0
- package/dist/internal/telemetry.js +3 -2
- package/dist/internal/telemetry.js.map +1 -1
- package/dist/internal/toolkit.js +1 -1
- package/dist/internal/tools.js +1 -1
- package/dist/internal/turns.d.ts +3 -1
- package/dist/internal/turns.d.ts.map +1 -1
- package/dist/internal/turns.js +12 -3
- package/dist/internal/turns.js.map +1 -1
- package/dist/internal/writer.d.ts +2 -0
- package/dist/internal/writer.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/Assistant.ts +48 -13
- package/src/AssistantEngine.ts +25 -11
- package/src/ChatSignal.ts +71 -0
- package/src/StatusSummary.ts +126 -0
- package/src/Timeline.ts +82 -20
- package/src/ToolStatus.ts +90 -0
- package/src/index.ts +15 -0
- package/src/internal/chat.ts +40 -21
- package/src/internal/live.ts +133 -0
- package/src/internal/loop.ts +104 -25
- package/src/internal/specialists.ts +3 -0
- package/src/internal/stream.ts +98 -0
- package/src/internal/summary.ts +123 -0
- package/src/internal/telemetry.ts +5 -1
- package/src/internal/turns.ts +20 -1
- package/src/internal/writer.ts +3 -0
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { isLibraryEvent } from "../AssistantEvent.js";
|
|
2
|
+
import { toJsonText } from "./schema.js";
|
|
3
|
+
import { fromEntries } from "./history.js";
|
|
4
|
+
import * as Effect from "effect/Effect";
|
|
5
|
+
import * as Option from "effect/Option";
|
|
6
|
+
import * as Predicate from "effect/Predicate";
|
|
7
|
+
import * as Clock from "effect/Clock";
|
|
8
|
+
import * as Ref from "effect/Ref";
|
|
9
|
+
import * as Duration from "effect/Duration";
|
|
10
|
+
import * as Schedule from "effect/Schedule";
|
|
11
|
+
//#region src/internal/summary.ts
|
|
12
|
+
const MAX_LINE = 300;
|
|
13
|
+
const clip = (text) => text.length > MAX_LINE ? `${text.slice(0, MAX_LINE)}…` : text;
|
|
14
|
+
const assistantLines = (part) => {
|
|
15
|
+
switch (part.type) {
|
|
16
|
+
case "text": return [`Assistant: ${clip(part.text)}`];
|
|
17
|
+
case "tool-call": return [`Assistant runs ${part.name} ${clip(toJsonText(part.params))}`];
|
|
18
|
+
default: return [];
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
const lines = (message) => {
|
|
22
|
+
switch (message.role) {
|
|
23
|
+
case "system": return [];
|
|
24
|
+
case "user": return message.content.flatMap((part) => part.type === "text" ? [`User: ${clip(part.text)}`] : []);
|
|
25
|
+
case "assistant": return message.content.flatMap(assistantLines);
|
|
26
|
+
case "tool": return message.content.flatMap((part) => part.type === "tool-result" ? [`Result of ${part.name}: ${clip(Predicate.isString(part.result) ? part.result : toJsonText(part.result))}`] : []);
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
const runningCalls = (entries) => {
|
|
30
|
+
const events = entries.flatMap(({ event }) => isLibraryEvent(event) ? [event] : []);
|
|
31
|
+
const answered = new Set(events.flatMap((event) => Predicate.isTagged(event, "ToolResult") ? [event.callId] : []));
|
|
32
|
+
return events.flatMap((event) => Predicate.isTagged(event, "ToolStarted") && !answered.has(event.callId) ? [event.tool] : []);
|
|
33
|
+
};
|
|
34
|
+
/** @internal */
|
|
35
|
+
const transcript = (entries) => {
|
|
36
|
+
const running = runningCalls(entries);
|
|
37
|
+
return [...fromEntries(entries).slice(-12).flatMap(lines), ...running.length === 0 ? [] : [`Running now: ${running.join(", ")}`]].join("\n");
|
|
38
|
+
};
|
|
39
|
+
const lastSequence = (entries) => entries.at(-1)?.sequence ?? 0;
|
|
40
|
+
const isWork = (event) => Predicate.isTagged(event, "TurnStarted") || Predicate.isTagged(event, "ModelOutput") || Predicate.isTagged(event, "ToolStarted");
|
|
41
|
+
const workingSinceMessage = (entries) => {
|
|
42
|
+
const message = entries.findLastIndex(({ event }) => Predicate.isTagged(event, "AssistantMessage"));
|
|
43
|
+
return message === -1 || entries.slice(message + 1).some(({ event }) => isWork(event));
|
|
44
|
+
};
|
|
45
|
+
const MAX_CHECK_MILLIS = 500;
|
|
46
|
+
/** @internal */
|
|
47
|
+
const run = Effect.fnUntraced(function* (summary, live, chat) {
|
|
48
|
+
const summarized = yield* Ref.make(-1);
|
|
49
|
+
const after = Duration.toMillis(summary.after);
|
|
50
|
+
const staleAfter = Duration.toMillis(summary.staleAfter);
|
|
51
|
+
yield* Effect.gen(function* () {
|
|
52
|
+
const current = yield* live.state;
|
|
53
|
+
const entries = yield* chat.entries;
|
|
54
|
+
const through = lastSequence(entries);
|
|
55
|
+
const waited = (yield* Clock.currentTimeMillis) - current.shownAt;
|
|
56
|
+
if (current.typing || current.running.length > 0 || waited < (current.shown === void 0 ? after : staleAfter) || through === (yield* Ref.get(summarized)) || !workingSinceMessage(entries)) return;
|
|
57
|
+
const written = yield* summary.summarize(transcript(entries));
|
|
58
|
+
yield* Ref.set(summarized, through);
|
|
59
|
+
if (Option.isSome(written)) yield* live.summarized(written.value);
|
|
60
|
+
}).pipe(Effect.repeat(Schedule.spaced(Math.min(MAX_CHECK_MILLIS, after / 2, staleAfter / 2))));
|
|
61
|
+
});
|
|
62
|
+
//#endregion
|
|
63
|
+
export { run, transcript };
|
|
64
|
+
|
|
65
|
+
//# sourceMappingURL=summary.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"summary.js","names":["AssistantEvent.isLibraryEvent","History.fromEntries"],"sources":["../../src/internal/summary.ts"],"sourcesContent":["import type * as Prompt from \"effect/ai/Prompt\"\nimport * as Clock from \"effect/Clock\"\nimport * as Duration from \"effect/Duration\"\nimport * as Effect from \"effect/Effect\"\nimport * as Option from \"effect/Option\"\nimport * as Predicate from \"effect/Predicate\"\nimport * as Ref from \"effect/Ref\"\nimport * as Schedule from \"effect/Schedule\"\nimport * as AssistantEvent from \"../AssistantEvent.ts\"\nimport type * as StatusSummary from \"../StatusSummary.ts\"\nimport * as History from \"./history.ts\"\nimport * as Live from \"./live.ts\"\nimport { toJsonText } from \"./schema.ts\"\nimport type { Writer } from \"./writer.ts\"\n\nconst MAX_LINE = 300\n\nconst MAX_MESSAGES = 12\n\nconst clip = (text: string) => (text.length > MAX_LINE ? `${text.slice(0, MAX_LINE)}…` : text)\n\nconst assistantLines = (part: Prompt.AssistantMessagePart): ReadonlyArray<string> => {\n switch (part.type) {\n case \"text\":\n return [`Assistant: ${clip(part.text)}`]\n case \"tool-call\":\n return [`Assistant runs ${part.name} ${clip(toJsonText(part.params))}`]\n default:\n return []\n }\n}\n\nconst lines = (message: Prompt.Message): ReadonlyArray<string> => {\n switch (message.role) {\n case \"system\":\n return []\n case \"user\":\n return message.content.flatMap((part) => (part.type === \"text\" ? [`User: ${clip(part.text)}`] : []))\n case \"assistant\":\n return message.content.flatMap(assistantLines)\n case \"tool\":\n return message.content.flatMap((part) =>\n part.type === \"tool-result\"\n ? [`Result of ${part.name}: ${clip(Predicate.isString(part.result) ? part.result : toJsonText(part.result))}`]\n : []\n )\n }\n}\n\n// The calls started and not answered yet: what the assistant is doing right now.\nconst runningCalls = (entries: ReadonlyArray<AssistantEvent.AnyEntry>) => {\n const events = entries.flatMap(({ event }) => (AssistantEvent.isLibraryEvent(event) ? [event] : []))\n const answered = new Set(events.flatMap((event) => (Predicate.isTagged(event, \"ToolResult\") ? [event.callId] : [])))\n\n return events.flatMap((event) =>\n Predicate.isTagged(event, \"ToolStarted\") && !answered.has(event.callId) ? [event.tool] : []\n )\n}\n\n// The latest messages, as plain lines, and what still runs: the summary's model gets no tools, so no tool call parts.\n/** @internal */\nexport const transcript = (entries: ReadonlyArray<AssistantEvent.AnyEntry>): string => {\n const running = runningCalls(entries)\n const lastLines = History.fromEntries(entries).slice(-MAX_MESSAGES).flatMap(lines)\n\n return [...lastLines, ...(running.length === 0 ? [] : [`Running now: ${running.join(\", \")}`])].join(\"\\n\")\n}\n\nconst lastSequence = (entries: ReadonlyArray<AssistantEvent.AnyEntry>) => entries.at(-1)?.sequence ?? 0\n\nconst isWork = (event: { readonly _tag: string }) =>\n Predicate.isTagged(event, \"TurnStarted\") ||\n Predicate.isTagged(event, \"ModelOutput\") ||\n Predicate.isTagged(event, \"ToolStarted\")\n\n// After a message the user is up to date: a summary shows again only for work the model started since, not for what a\n// handler does after its reply (a compaction, say).\nconst workingSinceMessage = (entries: ReadonlyArray<AssistantEvent.AnyEntry>) => {\n const message = entries.findLastIndex(({ event }) => Predicate.isTagged(event, \"AssistantMessage\"))\n\n return message === -1 || entries.slice(message + 1).some(({ event }) => isWork(event))\n}\n\nconst MAX_CHECK_MILLIS = 500\n\n// A line for a turn that shows nothing for a while, or whose line hasn't changed for longer: never while a described\n// call says what runs, or the model writes to the user, and only after something new happened.\n/** @internal */\nexport const run = Effect.fnUntraced(function* (\n summary: StatusSummary.StatusSummary[\"Service\"],\n live: Live.Live,\n chat: Writer\n) {\n const summarized = yield* Ref.make(-1)\n const after = Duration.toMillis(summary.after)\n const staleAfter = Duration.toMillis(summary.staleAfter)\n\n const tick = Effect.gen(function* () {\n const current = yield* live.state\n const entries = yield* chat.entries\n const through = lastSequence(entries)\n const waited = (yield* Clock.currentTimeMillis) - current.shownAt\n\n if (\n current.typing ||\n current.running.length > 0 ||\n waited < (current.shown === undefined ? after : staleAfter) ||\n through === (yield* Ref.get(summarized)) ||\n !workingSinceMessage(entries)\n ) {\n return\n }\n\n const written = yield* summary.summarize(transcript(entries))\n\n yield* Ref.set(summarized, through)\n\n if (Option.isSome(written)) yield* live.summarized(written.value)\n })\n\n // Often enough that a line is filled or refreshed close to when it's due.\n yield* tick.pipe(Effect.repeat(Schedule.spaced(Math.min(MAX_CHECK_MILLIS, after / 2, staleAfter / 2))))\n})\n"],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { ModelPart } from "../AssistantEvent.js";
|
|
2
2
|
import { toJsonText } from "./schema.js";
|
|
3
|
+
import { collect } from "./stream.js";
|
|
3
4
|
import * as Context from "effect/Context";
|
|
4
5
|
import * as Effect from "effect/Effect";
|
|
5
|
-
import * as Schema from "effect/Schema";
|
|
6
6
|
import * as Option from "effect/Option";
|
|
7
|
+
import * as Schema from "effect/Schema";
|
|
7
8
|
import * as Model from "effect/ai/Model";
|
|
8
9
|
import * as Prompt from "effect/ai/Prompt";
|
|
9
10
|
import * as Telemetry from "effect/ai/Telemetry";
|
|
@@ -42,7 +43,7 @@ const agentInput = (input) => Effect.annotateCurrentSpan("input.value", toJsonTe
|
|
|
42
43
|
const agentOutput = (output) => Effect.annotateCurrentSpan("output.value", toJsonText(output));
|
|
43
44
|
const encodePrompt = Schema.encodeOption(Prompt.Prompt);
|
|
44
45
|
const encodeParts = Schema.encodeOption(Schema.Array(ModelPart));
|
|
45
|
-
const completionOf = (response) => encodeParts(response.flatMap((part) => Option.toArray(Schema.decodeUnknownOption(ModelPart)(part))));
|
|
46
|
+
const completionOf = (response) => encodeParts(collect(response).flatMap((part) => Option.toArray(Schema.decodeUnknownOption(ModelPart)(part))));
|
|
46
47
|
const annotateModelSpan = ({ span, prompt, response }, name, attributes) => {
|
|
47
48
|
span.attribute("gen_ai.prompt", toJsonText(Option.getOrUndefined(Option.map(encodePrompt(prompt), (encoded) => encoded.content))));
|
|
48
49
|
span.attribute("gen_ai.completion", toJsonText(Option.getOrUndefined(completionOf(response))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","names":["AssistantEvent.ModelPart"],"sources":["../../src/internal/telemetry.ts"],"sourcesContent":["import * as Model from \"effect/ai/Model\"\nimport * as Prompt from \"effect/ai/Prompt\"\nimport * as Telemetry from \"effect/ai/Telemetry\"\nimport * as Context from \"effect/Context\"\nimport * as Effect from \"effect/Effect\"\nimport * as Option from \"effect/Option\"\nimport * as References from \"effect/References\"\nimport * as Schema from \"effect/Schema\"\nimport * as Tracer from \"effect/Tracer\"\nimport * as AssistantEvent from \"../AssistantEvent.ts\"\nimport type { SpanAttributes } from \"../Instructions.ts\"\nimport { toJsonText } from \"./schema.ts\"\n\ntype Traced = string | ReadonlyArray<{ readonly _tag: string }>\n\n// Spans follow the OpenTelemetry GenAI conventions, so LLM tools (Langfuse, Phoenix, Datadog LLM Observability) can\n// pick the agent work out of a trace.\n/** @internal */\nexport const agentSpan = (name: string, options: { readonly chatId: string; readonly root?: boolean }) =>\n Effect.withSpan(`invoke_agent ${name}`, {\n kind: \"internal\",\n root: options.root ?? false,\n attributes: {\n \"gen_ai.operation.name\": \"invoke_agent\",\n \"gen_ai.agent.name\": name,\n \"gen_ai.conversation.id\": options.chatId,\n \"session.id\": options.chatId\n }\n })\n\n/** @internal */\nexport const TurnTracer = Context.Reference<Option.Option<Tracer.Tracer>>(\"effect-assistant/Assistant/TurnTracer\", {\n defaultValue: Option.none\n})\n\n// A layer's context carries the tracer and span it was built with: a turn's own must not be replaced by them.\n/** @internal */\nexport const withoutTracing = Context.omit(Tracer.ParentSpan, Tracer.Tracer)\n\n/** @internal */\nexport const onTracer =\n (tracer: Option.Option<Tracer.Tracer>) =>\n <A, E, R>(self: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>\n Option.match(tracer, { onNone: () => self, onSome: (tracer) => self.pipe(Effect.withTracer(tracer)) })\n\n// None when tracing is off, or when the tracer is Effect's own, which exports nothing.\n/** @internal */\nexport const currentTraceId: Effect.Effect<Option.Option<string>> = Effect.gen(function* () {\n const tracer = yield* Tracer.Tracer\n\n if (!(yield* References.TracerEnabled) || tracer === Tracer.nativeTracer) return Option.none()\n\n return Option.map(yield* Effect.option(Effect.currentSpan), (span) => span.traceId)\n})\n\n/** @internal */\nexport const agentInput = (input: Traced) => Effect.annotateCurrentSpan(\"input.value\", toJsonText(input))\n\n/** @internal */\nexport const agentOutput = (output: Traced) => Effect.annotateCurrentSpan(\"output.value\", toJsonText(output))\n\nconst encodePrompt = Schema.encodeOption(Prompt.Prompt)\n\nconst encodeParts = Schema.encodeOption(Schema.Array(AssistantEvent.ModelPart))\n\ntype ModelCall = Parameters<Telemetry.SpanTransformer>[0]\n\nconst completionOf = (response: ModelCall[\"response\"]) =>\n encodeParts(response.flatMap((part) => Option.toArray(Schema.decodeUnknownOption(AssistantEvent.ModelPart)(part))))\n\nconst annotateModelSpan = (\n { span, prompt, response }: ModelCall,\n name: Option.Option<string>,\n attributes: SpanAttributes | undefined\n) => {\n span.attribute(\n \"gen_ai.prompt\",\n toJsonText(Option.getOrUndefined(Option.map(encodePrompt(prompt), (encoded) => encoded.content)))\n )\n span.attribute(\"gen_ai.completion\", toJsonText(Option.getOrUndefined(completionOf(response))))\n\n for (const [key, value] of Object.entries(attributes ?? {})) {\n span.attribute(key, value)\n }\n\n const finish = response.find((part) => part.type === \"finish\")\n\n Telemetry.addGenAIAnnotations(span, {\n operation: { name: \"chat\" },\n request: { model: Option.getOrUndefined(name) },\n response: { finishReasons: finish === undefined ? undefined : [finish.reason] },\n usage: {\n inputTokens: finish?.usage.inputTokens.total,\n outputTokens: finish?.usage.outputTokens.total\n }\n })\n\n if (finish?.usage.inputTokens.cacheRead !== undefined) {\n span.attribute(\"gen_ai.usage.cache_read_input_tokens\", finish.usage.inputTokens.cacheRead)\n }\n\n if (finish?.usage.inputTokens.cacheWrite !== undefined) {\n span.attribute(\"gen_ai.usage.cache_creation_input_tokens\", finish.usage.inputTokens.cacheWrite)\n }\n}\n\n/** @internal */\nexport const annotateModelCall =\n (attributes: SpanAttributes | undefined) =>\n <A, E, R>(self: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>\n Effect.gen(function* () {\n const name = yield* Effect.serviceOption(Model.ModelName)\n const outer = yield* Effect.serviceOption(Telemetry.CurrentSpanTransformer)\n\n return yield* self.pipe(\n Effect.provideService(Telemetry.CurrentSpanTransformer, (call) => {\n if (Option.isSome(outer)) outer.value(call)\n\n annotateModelSpan(call, name, attributes)\n })\n )\n })\n\n/** @internal */\nexport const toolSpan = (call: AssistantEvent.ToolCallPart) =>\n Effect.withSpan(`execute_tool ${call.name}`, {\n kind: \"internal\",\n attributes: {\n \"gen_ai.operation.name\": \"execute_tool\",\n \"gen_ai.tool.name\": call.name,\n \"gen_ai.tool.call.id\": call.id,\n \"input.value\": toJsonText({ arguments: call.params })\n }\n })\n\n/** @internal */\nexport const toolOutput = (result: Schema.Json) =>\n Effect.annotateCurrentSpan(\"output.value\", Schema.is(Schema.String)(result) ? result : toJsonText(result))\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"telemetry.js","names":["AssistantEvent.ModelPart"],"sources":["../../src/internal/telemetry.ts"],"sourcesContent":["import * as Model from \"effect/ai/Model\"\nimport * as Prompt from \"effect/ai/Prompt\"\nimport * as Telemetry from \"effect/ai/Telemetry\"\nimport * as Context from \"effect/Context\"\nimport * as Effect from \"effect/Effect\"\nimport * as Option from \"effect/Option\"\nimport * as References from \"effect/References\"\nimport * as Schema from \"effect/Schema\"\nimport * as Tracer from \"effect/Tracer\"\nimport * as AssistantEvent from \"../AssistantEvent.ts\"\nimport type { SpanAttributes } from \"../Instructions.ts\"\nimport { toJsonText } from \"./schema.ts\"\nimport { collect } from \"./stream.ts\"\n\ntype Traced = string | ReadonlyArray<{ readonly _tag: string }>\n\n// Spans follow the OpenTelemetry GenAI conventions, so LLM tools (Langfuse, Phoenix, Datadog LLM Observability) can\n// pick the agent work out of a trace.\n/** @internal */\nexport const agentSpan = (name: string, options: { readonly chatId: string; readonly root?: boolean }) =>\n Effect.withSpan(`invoke_agent ${name}`, {\n kind: \"internal\",\n root: options.root ?? false,\n attributes: {\n \"gen_ai.operation.name\": \"invoke_agent\",\n \"gen_ai.agent.name\": name,\n \"gen_ai.conversation.id\": options.chatId,\n \"session.id\": options.chatId\n }\n })\n\n/** @internal */\nexport const TurnTracer = Context.Reference<Option.Option<Tracer.Tracer>>(\"effect-assistant/Assistant/TurnTracer\", {\n defaultValue: Option.none\n})\n\n// A layer's context carries the tracer and span it was built with: a turn's own must not be replaced by them.\n/** @internal */\nexport const withoutTracing = Context.omit(Tracer.ParentSpan, Tracer.Tracer)\n\n/** @internal */\nexport const onTracer =\n (tracer: Option.Option<Tracer.Tracer>) =>\n <A, E, R>(self: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>\n Option.match(tracer, { onNone: () => self, onSome: (tracer) => self.pipe(Effect.withTracer(tracer)) })\n\n// None when tracing is off, or when the tracer is Effect's own, which exports nothing.\n/** @internal */\nexport const currentTraceId: Effect.Effect<Option.Option<string>> = Effect.gen(function* () {\n const tracer = yield* Tracer.Tracer\n\n if (!(yield* References.TracerEnabled) || tracer === Tracer.nativeTracer) return Option.none()\n\n return Option.map(yield* Effect.option(Effect.currentSpan), (span) => span.traceId)\n})\n\n/** @internal */\nexport const agentInput = (input: Traced) => Effect.annotateCurrentSpan(\"input.value\", toJsonText(input))\n\n/** @internal */\nexport const agentOutput = (output: Traced) => Effect.annotateCurrentSpan(\"output.value\", toJsonText(output))\n\nconst encodePrompt = Schema.encodeOption(Prompt.Prompt)\n\nconst encodeParts = Schema.encodeOption(Schema.Array(AssistantEvent.ModelPart))\n\ntype ModelCall = Parameters<Telemetry.SpanTransformer>[0]\n\n// A streamed call's response is its stream's parts: joined first, as the log stores them.\nconst completionOf = (response: ModelCall[\"response\"]) =>\n encodeParts(\n collect(response).flatMap((part) => Option.toArray(Schema.decodeUnknownOption(AssistantEvent.ModelPart)(part)))\n )\n\nconst annotateModelSpan = (\n { span, prompt, response }: ModelCall,\n name: Option.Option<string>,\n attributes: SpanAttributes | undefined\n) => {\n span.attribute(\n \"gen_ai.prompt\",\n toJsonText(Option.getOrUndefined(Option.map(encodePrompt(prompt), (encoded) => encoded.content)))\n )\n span.attribute(\"gen_ai.completion\", toJsonText(Option.getOrUndefined(completionOf(response))))\n\n for (const [key, value] of Object.entries(attributes ?? {})) {\n span.attribute(key, value)\n }\n\n const finish = response.find((part) => part.type === \"finish\")\n\n Telemetry.addGenAIAnnotations(span, {\n operation: { name: \"chat\" },\n request: { model: Option.getOrUndefined(name) },\n response: { finishReasons: finish === undefined ? undefined : [finish.reason] },\n usage: {\n inputTokens: finish?.usage.inputTokens.total,\n outputTokens: finish?.usage.outputTokens.total\n }\n })\n\n if (finish?.usage.inputTokens.cacheRead !== undefined) {\n span.attribute(\"gen_ai.usage.cache_read_input_tokens\", finish.usage.inputTokens.cacheRead)\n }\n\n if (finish?.usage.inputTokens.cacheWrite !== undefined) {\n span.attribute(\"gen_ai.usage.cache_creation_input_tokens\", finish.usage.inputTokens.cacheWrite)\n }\n}\n\n/** @internal */\nexport const annotateModelCall =\n (attributes: SpanAttributes | undefined) =>\n <A, E, R>(self: Effect.Effect<A, E, R>): Effect.Effect<A, E, R> =>\n Effect.gen(function* () {\n const name = yield* Effect.serviceOption(Model.ModelName)\n const outer = yield* Effect.serviceOption(Telemetry.CurrentSpanTransformer)\n\n return yield* self.pipe(\n Effect.provideService(Telemetry.CurrentSpanTransformer, (call) => {\n if (Option.isSome(outer)) outer.value(call)\n\n annotateModelSpan(call, name, attributes)\n })\n )\n })\n\n/** @internal */\nexport const toolSpan = (call: AssistantEvent.ToolCallPart) =>\n Effect.withSpan(`execute_tool ${call.name}`, {\n kind: \"internal\",\n attributes: {\n \"gen_ai.operation.name\": \"execute_tool\",\n \"gen_ai.tool.name\": call.name,\n \"gen_ai.tool.call.id\": call.id,\n \"input.value\": toJsonText({ arguments: call.params })\n }\n })\n\n/** @internal */\nexport const toolOutput = (result: Schema.Json) =>\n Effect.annotateCurrentSpan(\"output.value\", Schema.is(Schema.String)(result) ? result : toJsonText(result))\n"],"mappings":"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"}
|
package/dist/internal/toolkit.js
CHANGED
|
@@ -5,10 +5,10 @@ import { ToolFailure } from "../ToolFailure.js";
|
|
|
5
5
|
import { ModelView } from "../ToolResult.js";
|
|
6
6
|
import * as Context from "effect/Context";
|
|
7
7
|
import * as Effect from "effect/Effect";
|
|
8
|
+
import * as Option from "effect/Option";
|
|
8
9
|
import * as Predicate from "effect/Predicate";
|
|
9
10
|
import * as Schema from "effect/Schema";
|
|
10
11
|
import * as Stream from "effect/Stream";
|
|
11
|
-
import * as Option from "effect/Option";
|
|
12
12
|
import * as AiError from "effect/ai/AiError";
|
|
13
13
|
//#region src/internal/toolkit.ts
|
|
14
14
|
const encodeFailure = Schema.encodeSync(ToolFailure);
|
package/dist/internal/tools.js
CHANGED
|
@@ -6,9 +6,9 @@ import { ToolFailure, fail } from "../ToolFailure.js";
|
|
|
6
6
|
import { fromWithHandler } from "./toolkit.js";
|
|
7
7
|
import { isToolResult } from "../Block.js";
|
|
8
8
|
import * as Effect from "effect/Effect";
|
|
9
|
+
import * as Option from "effect/Option";
|
|
9
10
|
import * as Predicate from "effect/Predicate";
|
|
10
11
|
import * as Schema from "effect/Schema";
|
|
11
|
-
import * as Option from "effect/Option";
|
|
12
12
|
import * as Tool from "effect/ai/Tool";
|
|
13
13
|
import * as Toolkit from "effect/ai/Toolkit";
|
|
14
14
|
//#region src/internal/tools.ts
|
package/dist/internal/turns.d.ts
CHANGED
|
@@ -3,15 +3,16 @@ import { Tools, toolkit_d_exports } from "./toolkit.js";
|
|
|
3
3
|
import { AssistantLoop_d_exports, Event } from "../AssistantLoop.js";
|
|
4
4
|
import { CurrentChat } from "../CurrentChat.js";
|
|
5
5
|
import { BlockKit, BlockKit_d_exports } from "../BlockKit.js";
|
|
6
|
+
import { StatusSummary } from "../StatusSummary.js";
|
|
6
7
|
import { Any, Built, Specialist_d_exports } from "../Specialist.js";
|
|
7
8
|
import { AppEvents, DecodedEntries, events_d_exports } from "./events.js";
|
|
8
9
|
import { Writer } from "./writer.js";
|
|
9
10
|
import { Assistant_d_exports, Turn, TurnServices } from "../Assistant.js";
|
|
10
11
|
import * as Context from "effect/Context";
|
|
11
12
|
import * as Effect from "effect/Effect";
|
|
13
|
+
import * as Option from "effect/Option";
|
|
12
14
|
import * as Scope from "effect/Scope";
|
|
13
15
|
import * as Stream from "effect/Stream";
|
|
14
|
-
import * as Option from "effect/Option";
|
|
15
16
|
import * as Tracer from "effect/Tracer";
|
|
16
17
|
import * as LanguageModel from "effect/ai/LanguageModel";
|
|
17
18
|
declare namespace turns_d_exports {
|
|
@@ -49,6 +50,7 @@ export interface Registration {
|
|
|
49
50
|
readonly built: Built;
|
|
50
51
|
}>;
|
|
51
52
|
readonly builtins: Tools<TurnServices>;
|
|
53
|
+
readonly summary: Option.Option<StatusSummary["Service"]>;
|
|
52
54
|
}
|
|
53
55
|
/** @internal */
|
|
54
56
|
export declare const register: (definition: Definition, options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turns.d.ts","names":[],"sources":["../../src/internal/turns.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"turns.d.ts","names":[],"sources":["../../src/internal/turns.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;qBAwCa;;qBAGA;;qBAIA;;iBAII;WACN;WACA,QAAQ;WACR,aAAa,cAAc;WAC3B,KAAK;;;YAKJ,eACV,MAAM,cACH,OAAO,OAAO,gBAA8B,eAAyB,cAAc;;iBAKvE;WACN,QAAQ;WACR,SAAS,OAAO,OAAO;WACvB,QAAQ;;;iBAIF;WACN,YAAY;WACZ,OAAO,QAAQ,QAAQ,cAAc;WACrC,QAAQ,OAAO,OAAO,OAAO;WAC7B,OAAO,MAAM,cAAc,OAAO,OAAO,oBAAoB,MAAM,QAAQ;WAC3E,aAAa;aACX,YAAY;aACZ,OAAO;;WAET,UAAU,MAAe;WAEzB,SAAS,OAAO,OAAO;;;qBAIrB,WAAQ,YAAA,YAAA;WAEO,MAAA;MAoC1B,OAAA,OAAA,qBAAA,cAAA;;qBAgOW,MAAG;WAEW,cAAA;WACL,SAAA;WACH,MAAA;WACI,UAAA,QAAQ,QAAQ,eAAyB,cAAc;WAEtD,WAAA,OAAO;MA6E9B,OAAA"}
|
package/dist/internal/turns.js
CHANGED
|
@@ -4,20 +4,23 @@ import { TurnTracer, agentInput, agentOutput, agentSpan, currentTraceId, onTrace
|
|
|
4
4
|
import { fromEntries } from "../ToolApproval.js";
|
|
5
5
|
import { decodeEntries } from "./events.js";
|
|
6
6
|
import { fromEntries as fromEntries$1, mayHaveRunOutput, notRunOutput, owesDelivery, owesReply, unansweredCalls, unhandledInputs, unreadAfter, userText } from "./history.js";
|
|
7
|
+
import { TurnLive, make } from "./live.js";
|
|
7
8
|
import { duplicateNames, fromToolkitOrEmpty, merge, provide, runOnly, showing } from "./toolkit.js";
|
|
8
9
|
import { makeMessaging, sendUserMessageName, waitToolName } from "./tools.js";
|
|
9
10
|
import { TurnApprovals, TurnTools, run as run$1 } from "./loop.js";
|
|
10
11
|
import { toolkit } from "./specialists.js";
|
|
11
12
|
import { toolNames } from "../BlockKit.js";
|
|
12
13
|
import { protocol } from "../Instructions.js";
|
|
14
|
+
import { StatusSummary } from "../StatusSummary.js";
|
|
13
15
|
import { mapText } from "./instructions.js";
|
|
16
|
+
import { run as run$2 } from "./summary.js";
|
|
14
17
|
import "effect/Context";
|
|
15
18
|
import * as Effect from "effect/Effect";
|
|
19
|
+
import * as Option from "effect/Option";
|
|
16
20
|
import * as Predicate from "effect/Predicate";
|
|
17
21
|
import * as Schema from "effect/Schema";
|
|
18
22
|
import * as Stream from "effect/Stream";
|
|
19
23
|
import * as Exit from "effect/Exit";
|
|
20
|
-
import * as Option from "effect/Option";
|
|
21
24
|
import * as Response from "effect/ai/Response";
|
|
22
25
|
import * as Ref from "effect/Ref";
|
|
23
26
|
import * as Cause from "effect/Cause";
|
|
@@ -49,7 +52,8 @@ const register = Effect.fnUntraced(function* (definition, options) {
|
|
|
49
52
|
tracer,
|
|
50
53
|
open: options.open,
|
|
51
54
|
specialists,
|
|
52
|
-
builtins
|
|
55
|
+
builtins,
|
|
56
|
+
summary: yield* Effect.serviceOption(StatusSummary)
|
|
53
57
|
};
|
|
54
58
|
});
|
|
55
59
|
const ProviderError = Schema.Struct({
|
|
@@ -195,7 +199,12 @@ const run = Effect.fnUntraced(function* (options) {
|
|
|
195
199
|
const ranLoop = yield* Ref.make(false);
|
|
196
200
|
const turn = makeTurnApi(options.registration, chat, startSequence, options.checkOpen, ranLoop);
|
|
197
201
|
const record = (event) => chat.append([event]);
|
|
198
|
-
|
|
202
|
+
const live = yield* make(chat.signal);
|
|
203
|
+
const summarizing = (work) => Option.match(options.registration.summary, {
|
|
204
|
+
onNone: () => work,
|
|
205
|
+
onSome: (summary) => Effect.forkScoped(run$2(summary, live, chat)).pipe(Effect.andThen(work), Effect.scoped)
|
|
206
|
+
});
|
|
207
|
+
yield* options.handler(turn).pipe(Stream.runForEach(record), Effect.onExit((exit) => Exit.hasInterrupts(exit) ? Effect.void : closeOpenCalls(chat, startSequence)), Effect.provideService(TurnLive, Option.some(live)), Effect.provideService(TurnTools, Option.some(provide(options.registration.builtins, options.services))), Effect.provideService(TurnApprovals, Option.some({ approved: Effect.map(chat.entries, approvedCalls) })), Effect.provideContext(options.services), summarizing, Effect.ensuring(live.reset), Effect.matchCauseEffect({
|
|
199
208
|
onSuccess: Effect.fnUntraced(function* () {
|
|
200
209
|
const all = yield* chat.entries;
|
|
201
210
|
yield* finishTurn(chat, handledThrough(all, startSequence), yield* Ref.get(ranLoop));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turns.js","names":["Telemetry.withoutTracing","Telemetry.TurnTracer","Toolkits.merge","Tools.makeMessaging","Specialists.toolkit","ToolApproval.fromEntries","History.unansweredCalls","History.fromEntries","History.mayHaveRunOutput","History.notRunOutput","AssistantEvent.isLibraryEvent","History.owesReply","History.unreadAfter","BlockKit.toolNames","AppEvents.decodeEntries","Instructions.protocol","History.owesDelivery","Loop.run","Toolkits.runOnly","Tools.sendUserMessageName","Tools.waitToolName","History.userText","Loop.TurnApprovals","Toolkits.showing","Toolkits.fromToolkitOrEmpty","Toolkits.duplicateNames","Telemetry.agentInput","History.unhandledInputs","Telemetry.currentTraceId","Loop.TurnTools","Toolkits.provide","Telemetry.agentOutput","Telemetry.agentSpan","Telemetry.onTracer"],"sources":["../../src/internal/turns.ts"],"sourcesContent":["import type * as LanguageModel from \"effect/ai/LanguageModel\"\nimport * as Response from \"effect/ai/Response\"\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 ErrorReporter from \"effect/ErrorReporter\"\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 type * as Tracer from \"effect/Tracer\"\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 * as BlockKit from \"../BlockKit.ts\"\nimport type { CurrentChat } from \"../CurrentChat.ts\"\nimport * as Instructions from \"../Instructions.ts\"\nimport * as ToolApproval from \"../ToolApproval.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 tracer: Option.Option<Tracer.Tracer>\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>().pipe(Effect.map(Telemetry.withoutTracing))\n const tracer = yield* Telemetry.TurnTracer\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 tracer,\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\n// Approved, and not run yet: also one a crash cut off while it ran, which runs again with the same id.\nconst approvedCalls = (entries: ReadonlyArray<AssistantEvent.AnyEntry>): ReadonlyArray<AssistantEvent.ToolCallPart> =>\n [...ToolApproval.fromEntries(entries).values()].flatMap(({ request, status, outcome }) =>\n status === \"approved\" && outcome === undefined\n ? [\n Response.makePart(\"tool-call\", {\n id: request.callId,\n name: request.tool,\n params: request.params,\n providerExecuted: false\n })\n ]\n : []\n )\n\nconst lastSequence = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, otherwise: number) =>\n entries.at(-1)?.sequence ?? 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, startSequence: number) {\n const entries = (yield* chat.entries).filter(({ sequence }) => sequence > startSequence)\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 `startSequence`) woke it; past that, what its model outputs record\n// reading.\nconst handledThrough = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, startSequence: number) =>\n entries.reduce(\n (through, { sequence, event }) =>\n sequence > startSequence &&\n AssistantEvent.isLibraryEvent(event) &&\n Predicate.isTagged(event, \"ModelOutput\") &&\n event.seenThroughSequence !== undefined\n ? Math.max(through, event.seenThroughSequence)\n : through,\n startSequence\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({ throughSequence: read, message: silentTurnMessage })\n : AssistantEvent.TurnCompleted.make({ throughSequence: 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 yield* ErrorReporter.report(cause)\n\n const last = lastSequence(yield* chat.entries, 0)\n\n yield* chat.append([AssistantEvent.TurnFailed.make({ throughSequence: last, message: failureMessage(cause) })])\n})\n\nconst makeTurnApi = (\n registration: Registration,\n chat: Writer,\n startSequence: 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 const shownTools = BlockKit.toolNames(definition.blocks)\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 throughSequence: lastSequence(all, startSequence)\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, startSequence)\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 throughSequence: lastSequence(entries, startSequence)\n }\n }),\n // A second step, for a reply after a call it was refused.\n maxSteps: 2,\n // The pass runs because the model wrote text of its own instead of replying, which reaches nobody: it has to\n // call a tool now. Changing the choice costs a read of the history at full price, on these rare turns only.\n toolChoice: \"required\"\n // The loop ran the approved calls; a pass that can only reply runs none.\n }).pipe(Stream.provideService(Loop.TurnApprovals, Option.none()))\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>>(options: Assistant.RunOptions<T, any>) => {\n const own = Toolkits.showing(Toolkits.fromToolkitOrEmpty(options.toolkit), shownTools)\n\n return {\n system: instructions(options.instructions),\n toolkit: Toolkits.merge(builtins, own),\n view: options.history ?? identity\n }\n }\n\n return {\n chatId: chat.chatId,\n history,\n instructions,\n replyIfOwed,\n run: (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 startSequence = lastSequence(started, 0)\n const ranLoop = yield* Ref.make(false)\n const turn = makeTurnApi(options.registration, chat, startSequence, 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, startSequence))),\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 // A turn's loop waits for the user's approval, and runs the calls they approved.\n Effect.provideService(Loop.TurnApprovals, Option.some({ approved: Effect.map(chat.entries, approvedCalls) })),\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, startSequence), 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, sequence }) =>\n sequence > startSequence &&\n (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 Telemetry.onTracer(options.registration.tracer)\n )\n)\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"turns.js","names":["Telemetry.withoutTracing","Telemetry.TurnTracer","Toolkits.merge","Tools.makeMessaging","Specialists.toolkit","ToolApproval.fromEntries","History.unansweredCalls","History.fromEntries","History.mayHaveRunOutput","History.notRunOutput","AssistantEvent.isLibraryEvent","History.owesReply","History.unreadAfter","BlockKit.toolNames","AppEvents.decodeEntries","Instructions.protocol","History.owesDelivery","Loop.run","Toolkits.runOnly","Tools.sendUserMessageName","Tools.waitToolName","History.userText","Loop.TurnApprovals","Toolkits.showing","Toolkits.fromToolkitOrEmpty","Toolkits.duplicateNames","Telemetry.agentInput","History.unhandledInputs","Telemetry.currentTraceId","Live.make","Summary.run","Live.TurnLive","Loop.TurnTools","Toolkits.provide","Telemetry.agentOutput","Telemetry.agentSpan","Telemetry.onTracer"],"sources":["../../src/internal/turns.ts"],"sourcesContent":["import type * as LanguageModel from \"effect/ai/LanguageModel\"\nimport * as Response from \"effect/ai/Response\"\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 ErrorReporter from \"effect/ErrorReporter\"\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 type * as Tracer from \"effect/Tracer\"\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 * as BlockKit from \"../BlockKit.ts\"\nimport type { CurrentChat } from \"../CurrentChat.ts\"\nimport * as Instructions from \"../Instructions.ts\"\nimport { StatusSummary } from \"../StatusSummary.ts\"\nimport * as ToolApproval from \"../ToolApproval.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 * as Live from \"./live.ts\"\nimport { toJsonText } from \"./schema.ts\"\nimport * as Specialists from \"./specialists.ts\"\nimport * as Summary from \"./summary.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 tracer: Option.Option<Tracer.Tracer>\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 // Writes a status for a turn that has been working a while with nothing to show.\n readonly summary: Option.Option<StatusSummary[\"Service\"]>\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>().pipe(Effect.map(Telemetry.withoutTracing))\n const tracer = yield* Telemetry.TurnTracer\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 tracer,\n open: options.open,\n specialists,\n builtins,\n summary: yield* Effect.serviceOption(StatusSummary)\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\n// Approved, and not run yet: also one a crash cut off while it ran, which runs again with the same id.\nconst approvedCalls = (entries: ReadonlyArray<AssistantEvent.AnyEntry>): ReadonlyArray<AssistantEvent.ToolCallPart> =>\n [...ToolApproval.fromEntries(entries).values()].flatMap(({ request, status, outcome }) =>\n status === \"approved\" && outcome === undefined\n ? [\n Response.makePart(\"tool-call\", {\n id: request.callId,\n name: request.tool,\n params: request.params,\n providerExecuted: false\n })\n ]\n : []\n )\n\nconst lastSequence = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, otherwise: number) =>\n entries.at(-1)?.sequence ?? 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, startSequence: number) {\n const entries = (yield* chat.entries).filter(({ sequence }) => sequence > startSequence)\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 `startSequence`) woke it; past that, what its model outputs record\n// reading.\nconst handledThrough = (entries: ReadonlyArray<AssistantEvent.AnyEntry>, startSequence: number) =>\n entries.reduce(\n (through, { sequence, event }) =>\n sequence > startSequence &&\n AssistantEvent.isLibraryEvent(event) &&\n Predicate.isTagged(event, \"ModelOutput\") &&\n event.seenThroughSequence !== undefined\n ? Math.max(through, event.seenThroughSequence)\n : through,\n startSequence\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({ throughSequence: read, message: silentTurnMessage })\n : AssistantEvent.TurnCompleted.make({ throughSequence: 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 yield* ErrorReporter.report(cause)\n\n const last = lastSequence(yield* chat.entries, 0)\n\n yield* chat.append([AssistantEvent.TurnFailed.make({ throughSequence: last, message: failureMessage(cause) })])\n})\n\nconst makeTurnApi = (\n registration: Registration,\n chat: Writer,\n startSequence: 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 const shownTools = BlockKit.toolNames(definition.blocks)\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 throughSequence: lastSequence(all, startSequence)\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, startSequence)\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 throughSequence: lastSequence(entries, startSequence)\n }\n }),\n // A second step, for a reply after a call it was refused.\n maxSteps: 2,\n // The pass runs because the model wrote text of its own instead of replying, which reaches nobody: it has to\n // call a tool now. Changing the choice costs a read of the history at full price, on these rare turns only.\n toolChoice: \"required\"\n // The loop ran the approved calls; a pass that can only reply runs none.\n }).pipe(Stream.provideService(Loop.TurnApprovals, Option.none()))\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>>(options: Assistant.RunOptions<T, any>) => {\n const own = Toolkits.showing(Toolkits.fromToolkitOrEmpty(options.toolkit), shownTools)\n\n return {\n system: instructions(options.instructions),\n toolkit: Toolkits.merge(builtins, own),\n view: options.history ?? identity\n }\n }\n\n return {\n chatId: chat.chatId,\n history,\n instructions,\n replyIfOwed,\n run: (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 startSequence = lastSequence(started, 0)\n const ranLoop = yield* Ref.make(false)\n const turn = makeTurnApi(options.registration, chat, startSequence, options.checkOpen, ranLoop)\n\n const record = (event: AssistantLoop.Event) => chat.append([event])\n const live = yield* Live.make(chat.signal)\n\n // The summary runs beside the turn's work and stops with it.\n const summarizing = <A, E, R>(work: Effect.Effect<A, E, R>) =>\n Option.match(options.registration.summary, {\n onNone: () => work,\n onSome: (summary) =>\n Effect.forkScoped(Summary.run(summary, live, chat)).pipe(Effect.andThen(work), Effect.scoped)\n })\n\n yield* options.handler(turn).pipe(\n Stream.runForEach(record),\n Effect.onExit((exit) => (Exit.hasInterrupts(exit) ? Effect.void : closeOpenCalls(chat, startSequence))),\n Effect.provideService(Live.TurnLive, Option.some(live)),\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 // A turn's loop waits for the user's approval, and runs the calls they approved.\n Effect.provideService(Loop.TurnApprovals, Option.some({ approved: Effect.map(chat.entries, approvedCalls) })),\n Effect.provideContext(options.services),\n summarizing,\n // Nothing the turn showed outlives it, also when it fails.\n Effect.ensuring(live.reset),\n Effect.matchCauseEffect({\n onSuccess: Effect.fnUntraced(function* () {\n const all = yield* chat.entries\n\n yield* finishTurn(chat, handledThrough(all, startSequence), 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, sequence }) =>\n sequence > startSequence &&\n (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 Telemetry.onTracer(options.registration.tracer)\n )\n)\n"],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ChatId } from "../ChatId.js";
|
|
2
2
|
import { AssistantEvent, AssistantEvent_d_exports, Entry, StoredAppEvent } from "../AssistantEvent.js";
|
|
3
|
+
import { ChatSignal } from "../ChatSignal.js";
|
|
3
4
|
import * as Effect from "effect/Effect";
|
|
4
5
|
//#region src/internal/writer.d.ts
|
|
5
6
|
/** @internal */
|
|
@@ -7,6 +8,7 @@ export interface Writer {
|
|
|
7
8
|
readonly chatId: ChatId;
|
|
8
9
|
readonly entries: Effect.Effect<ReadonlyArray<Entry>>;
|
|
9
10
|
readonly append: (events: ReadonlyArray<AssistantEvent | StoredAppEvent>) => Effect.Effect<ReadonlyArray<Entry>>;
|
|
11
|
+
readonly signal: (signal: ChatSignal) => Effect.Effect<void>;
|
|
10
12
|
}
|
|
11
13
|
//#endregion
|
|
12
14
|
//# sourceMappingURL=writer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.d.ts","names":[],"sources":["../../src/internal/writer.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"writer.d.ts","names":[],"sources":["../../src/internal/writer.ts"],"mappings":";;;;;;iBAMiB;WACN,QAAQ;WACR,SAAS,OAAO,OAAO,cAAc;WACrC,SACP,QAAQ,cAAc,iBAAgC,oBACnD,OAAO,OAAO,cAAc;WAExB,SAAS,QAAQ,eAAe,OAAO"}
|
package/package.json
CHANGED
package/src/Assistant.ts
CHANGED
|
@@ -20,7 +20,7 @@ import * as Context from "effect/Context"
|
|
|
20
20
|
import * as Effect from "effect/Effect"
|
|
21
21
|
import * as Filter from "effect/Filter"
|
|
22
22
|
import * as Layer from "effect/Layer"
|
|
23
|
-
import
|
|
23
|
+
import * as Option from "effect/Option"
|
|
24
24
|
import * as Predicate from "effect/Predicate"
|
|
25
25
|
import * as Schema from "effect/Schema"
|
|
26
26
|
import * as Scope from "effect/Scope"
|
|
@@ -31,6 +31,7 @@ import * as AssistantEvent from "./AssistantEvent.ts"
|
|
|
31
31
|
import type * as AssistantLoop from "./AssistantLoop.ts"
|
|
32
32
|
import type * as BlockKit from "./BlockKit.ts"
|
|
33
33
|
import { ChatId } from "./ChatId.ts"
|
|
34
|
+
import * as ChatSignal from "./ChatSignal.ts"
|
|
34
35
|
import * as Chats from "./Chats.ts"
|
|
35
36
|
import type { CurrentChat } from "./CurrentChat.ts"
|
|
36
37
|
import type * as Instructions from "./Instructions.ts"
|
|
@@ -310,6 +311,17 @@ export interface Chat<Events = never> {
|
|
|
310
311
|
append(...events: ReadonlyArray<AssistantEvent.AssistantEvent | Events>): Effect.Effect<void>
|
|
311
312
|
}
|
|
312
313
|
|
|
314
|
+
/**
|
|
315
|
+
* Represents the options accepted by an assistant's `subscribe`.
|
|
316
|
+
*
|
|
317
|
+
* @category models
|
|
318
|
+
* @since 0.13.0
|
|
319
|
+
*/
|
|
320
|
+
export interface SubscribeOptions {
|
|
321
|
+
/** The `sequence` after which the stream starts. Defaults to `0`, the whole log. */
|
|
322
|
+
readonly after?: number | undefined
|
|
323
|
+
}
|
|
324
|
+
|
|
313
325
|
/**
|
|
314
326
|
* Represents the service that `yield* MyAssistant` returns. It gives code outside a chat, such as
|
|
315
327
|
* a server or a workflow, access to the assistant's chats. Code that runs inside a chat uses
|
|
@@ -342,10 +354,18 @@ export interface Service<Events = never> {
|
|
|
342
354
|
* on the timeline depends on earlier entries. The timeline shows only the app events named in its
|
|
343
355
|
* `show`, none by default (see `Timeline.changes`).
|
|
344
356
|
*/
|
|
345
|
-
readonly subscribe:
|
|
346
|
-
chatId: ChatId,
|
|
347
|
-
|
|
348
|
-
|
|
357
|
+
readonly subscribe: {
|
|
358
|
+
(chatId: ChatId, options?: SubscribeOptions & { readonly live?: false | undefined }): Stream.Stream<Entry<Events>>
|
|
359
|
+
/**
|
|
360
|
+
* With `live: true`, the stream also has the chat's signals (see `ChatSignal`): the status of
|
|
361
|
+
* what a turn is doing, and whether a message to the user is on its way. They come in order
|
|
362
|
+
* with the entries, only while the stream runs, and are never stored.
|
|
363
|
+
*/
|
|
364
|
+
(
|
|
365
|
+
chatId: ChatId,
|
|
366
|
+
options: SubscribeOptions & { readonly live: true }
|
|
367
|
+
): Stream.Stream<Entry<Events> | ChatSignal.ChatSignal>
|
|
368
|
+
}
|
|
349
369
|
/**
|
|
350
370
|
* Deletes a chat by storing a `ChatDeleted` event and stopping everything that works in it.
|
|
351
371
|
*
|
|
@@ -578,20 +598,35 @@ export const make = <
|
|
|
578
598
|
const engine = yield* AssistantEngine
|
|
579
599
|
const chats = yield* Chats.Chats
|
|
580
600
|
|
|
601
|
+
const decode = (
|
|
602
|
+
item: AssistantEvent.Entry | ChatSignal.ChatSignal
|
|
603
|
+
): Option.Option<Entry<OwnEvents> | ChatSignal.ChatSignal> =>
|
|
604
|
+
ChatSignal.isChatSignal(item) ? Option.some(item) : AppEvents.decodeEntry(definition.app, item)
|
|
605
|
+
|
|
606
|
+
function subscribe(
|
|
607
|
+
chatId: ChatId,
|
|
608
|
+
options?: SubscribeOptions & { readonly live?: false | undefined }
|
|
609
|
+
): Stream.Stream<Entry<OwnEvents>>
|
|
610
|
+
function subscribe(
|
|
611
|
+
chatId: ChatId,
|
|
612
|
+
options: SubscribeOptions & { readonly live: true }
|
|
613
|
+
): Stream.Stream<Entry<OwnEvents> | ChatSignal.ChatSignal>
|
|
614
|
+
function subscribe(
|
|
615
|
+
chatId: ChatId,
|
|
616
|
+
options?: SubscribeOptions & { readonly live?: boolean | undefined }
|
|
617
|
+
): Stream.Stream<Entry<OwnEvents> | ChatSignal.ChatSignal> {
|
|
618
|
+
return engine
|
|
619
|
+
.subscribe(name, chatId, options?.after ?? 0, options?.live === true)
|
|
620
|
+
.pipe(Stream.filterMap(Filter.fromPredicateOption(decode)))
|
|
621
|
+
}
|
|
622
|
+
|
|
581
623
|
return Key.of({
|
|
582
624
|
submit: Effect.fn("Assistant.submit")(function* (chatId: ChatId, input: AssistantEvent.Input | OwnEvents) {
|
|
583
625
|
// Checked here, where the caller can handle it: the chat checks again when it stores the input.
|
|
584
626
|
yield* chats.get(chatId)
|
|
585
627
|
yield* engine.submit(name, chatId, yield* stored(input))
|
|
586
628
|
}),
|
|
587
|
-
subscribe
|
|
588
|
-
engine
|
|
589
|
-
.subscribe(name, chatId, options?.after ?? 0)
|
|
590
|
-
.pipe(
|
|
591
|
-
Stream.filterMap(
|
|
592
|
-
Filter.fromPredicateOption((entry: AssistantEvent.Entry) => AppEvents.decodeEntry(definition.app, entry))
|
|
593
|
-
)
|
|
594
|
-
),
|
|
629
|
+
subscribe,
|
|
595
630
|
delete: (chatId) => engine.delete(name, chatId)
|
|
596
631
|
})
|
|
597
632
|
})
|
package/src/AssistantEngine.ts
CHANGED
|
@@ -29,6 +29,7 @@ import * as Stream from "effect/Stream"
|
|
|
29
29
|
import * as AssistantEvent from "./AssistantEvent.ts"
|
|
30
30
|
import { ChatId } from "./ChatId.ts"
|
|
31
31
|
import { ChatLog } from "./ChatLog.ts"
|
|
32
|
+
import * as ChatSignal from "./ChatSignal.ts"
|
|
32
33
|
import * as Chat from "./internal/chat.ts"
|
|
33
34
|
import * as History from "./internal/history.ts"
|
|
34
35
|
import type * as Turns from "./internal/turns.ts"
|
|
@@ -54,8 +55,16 @@ export class AssistantEngine extends Context.Service<
|
|
|
54
55
|
chatId: ChatId,
|
|
55
56
|
input: AssistantEvent.Input | AssistantEvent.StoredAppEvent
|
|
56
57
|
) => Effect.Effect<void>
|
|
57
|
-
/**
|
|
58
|
-
|
|
58
|
+
/**
|
|
59
|
+
* Streams the chat's stored entries after the `after` sequence, then live ones. With `live`,
|
|
60
|
+
* the chat's signals too, in order with the entries.
|
|
61
|
+
*/
|
|
62
|
+
readonly subscribe: (
|
|
63
|
+
assistant: string,
|
|
64
|
+
chatId: ChatId,
|
|
65
|
+
after: number,
|
|
66
|
+
live: boolean
|
|
67
|
+
) => Stream.Stream<AssistantEvent.Entry | ChatSignal.ChatSignal>
|
|
59
68
|
/**
|
|
60
69
|
* Deletes one of the assistant's chats. The chat's log records the deletion, and everything
|
|
61
70
|
* that works in the chat stops.
|
|
@@ -182,12 +191,12 @@ export const layerMemory: Layer.Layer<AssistantEngine, never, ChatLog> = Layer.e
|
|
|
182
191
|
yield* RcMap.invalidate(chats, new ChatKey({ assistant, chatId }))
|
|
183
192
|
}),
|
|
184
193
|
// The subscriber holds the chat open while it streams.
|
|
185
|
-
subscribe: (assistant, chatId, after) =>
|
|
194
|
+
subscribe: (assistant, chatId, after, live) =>
|
|
186
195
|
Stream.unwrap(
|
|
187
196
|
Effect.gen(function* () {
|
|
188
197
|
const chat = yield* RcMap.get(chats, new ChatKey({ assistant, chatId }))
|
|
189
198
|
|
|
190
|
-
return chat.stream(after)
|
|
199
|
+
return live ? chat.live(after) : chat.stream(after)
|
|
191
200
|
})
|
|
192
201
|
)
|
|
193
202
|
})
|
|
@@ -196,7 +205,11 @@ export const layerMemory: Layer.Layer<AssistantEngine, never, ChatLog> = Layer.e
|
|
|
196
205
|
|
|
197
206
|
interface EntityClient {
|
|
198
207
|
readonly submit: (chatId: ChatId, input: AssistantEvent.Input | AssistantEvent.StoredAppEvent) => Effect.Effect<void>
|
|
199
|
-
readonly subscribe: (
|
|
208
|
+
readonly subscribe: (
|
|
209
|
+
chatId: ChatId,
|
|
210
|
+
after: number,
|
|
211
|
+
live: boolean
|
|
212
|
+
) => Stream.Stream<AssistantEvent.Entry | ChatSignal.ChatSignal>
|
|
200
213
|
readonly delete: (chatId: ChatId) => Effect.Effect<void>
|
|
201
214
|
}
|
|
202
215
|
|
|
@@ -205,8 +218,8 @@ const Submit = Rpc.make("Submit", {
|
|
|
205
218
|
}).annotate(ClusterSchema.Persisted, true)
|
|
206
219
|
|
|
207
220
|
const Subscribe = Rpc.make("Subscribe", {
|
|
208
|
-
payload: { after: Schema.Int },
|
|
209
|
-
success: AssistantEvent.Entry,
|
|
221
|
+
payload: { after: Schema.Int, live: Schema.optionalKey(Schema.Boolean) },
|
|
222
|
+
success: Schema.Union([AssistantEvent.Entry, ChatSignal.ChatSignal]),
|
|
210
223
|
stream: true
|
|
211
224
|
})
|
|
212
225
|
|
|
@@ -230,7 +243,7 @@ const makeClusterClient = Effect.gen(function* () {
|
|
|
230
243
|
|
|
231
244
|
const client: EntityClient = {
|
|
232
245
|
submit: (chatId, input) => makeClient(chatId).Submit({ input }, { discard: true }).pipe(Effect.orDie),
|
|
233
|
-
subscribe: (chatId, after) => makeClient(chatId).Subscribe({ after }).pipe(Stream.orDie),
|
|
246
|
+
subscribe: (chatId, after, live) => makeClient(chatId).Subscribe({ after, live }).pipe(Stream.orDie),
|
|
234
247
|
delete: (chatId) => makeClient(chatId).Delete().pipe(Effect.orDie)
|
|
235
248
|
}
|
|
236
249
|
|
|
@@ -249,12 +262,12 @@ const makeClusterClient = Effect.gen(function* () {
|
|
|
249
262
|
|
|
250
263
|
yield* client.submit(chatId, input)
|
|
251
264
|
}),
|
|
252
|
-
subscribe: (assistant, chatId, after) =>
|
|
265
|
+
subscribe: (assistant, chatId, after, live) =>
|
|
253
266
|
Stream.unwrap(
|
|
254
267
|
Effect.gen(function* () {
|
|
255
268
|
const client = yield* clientOf(assistant)
|
|
256
269
|
|
|
257
|
-
return client.subscribe(chatId, after)
|
|
270
|
+
return client.subscribe(chatId, after, live)
|
|
258
271
|
})
|
|
259
272
|
),
|
|
260
273
|
delete: Effect.fn("AssistantEngine.delete")(function* (assistant: string, chatId: ChatId) {
|
|
@@ -340,7 +353,8 @@ export const layerCluster: Layer.Layer<AssistantEngine, never, ChatLog | Shardin
|
|
|
340
353
|
return ChatEntity.of({
|
|
341
354
|
// The turns run inside the request, so a crash leaves it unprocessed and the cluster redelivers it.
|
|
342
355
|
Submit: (request) => chat.submit(request.payload.input),
|
|
343
|
-
Subscribe: (request) =>
|
|
356
|
+
Subscribe: (request) =>
|
|
357
|
+
request.payload.live === true ? chat.live(request.payload.after) : chat.stream(request.payload.after),
|
|
344
358
|
Delete: () => chat.delete
|
|
345
359
|
})
|
|
346
360
|
})
|