@minpeter/pss-runtime 0.0.9 → 0.0.11

package/README.md

@@ -1,7 +1,11 @@
+<p align="center">
+  <img src="../../assets/runtime-banner.png" alt="@minpeter/pss-runtime banner" width="100%" />
+</p>
+
 # @minpeter/pss-runtime
 
-Minimal, platform-agnostic agent runtime with sessions keyed through `run.stream()` and
-opaque persistence contracts.
+Minimal, platform-agnostic agent runtime with keyed sessions, synchronized
+`run.events()`, and opaque persistence contracts.
 
 ## Core DX
 
@@ -15,14 +19,14 @@ const agent = await Agent.create({
 });
 
 const run = await agent.send("Hello");
-for await (const event of run.stream()) {
+for await (const event of run.events()) {
   console.log(event);
 }
 ```
 
-`run.stream()` is the run driver. The runtime stops at synchronized lifecycle
-boundaries until the stream consumer asks for the next event, so callers must
-consume the stream for the run to progress. This is what lets code react to
+`run.events()` is the run driver. The runtime stops at synchronized lifecycle
+boundaries until the events consumer asks for the next event, so callers must
+consume the events for the run to progress. This is what lets code react to
 `turn-start`, `step-start`, and `step-end` before the next model snapshot is
 created.
 
@@ -31,8 +35,8 @@ Per-key conversations use `session(key)`:
 ```ts
 const roomSession = agent.session("room:123:user:456");
 const run = await roomSession.send(["Context: user prefers short answers", "Hi"]);
-for await (const event of run.stream()) {
-  // stream events for this single turn
+for await (const event of run.events()) {
+  // events for this single turn
 }
 ```
 
@@ -73,7 +77,7 @@ state; it does not fetch remote media, decode files, or guarantee provider suppo
 for every media type.
 
 The public transcript protocol is `AgentEvent`: live runs emit runtime-defined
-events through `run.stream()`. Provider/model message history is internal
+events through `run.events()`. Provider/model message history is internal
 continuation state, not a public history API.
 
 ## Send and Steer
@@ -88,7 +92,7 @@ values. Active steering emits `runtime-input` events. A `runtime-input` is
 runtime/API-originated input mapped internally to the model's user role. It is
 distinct from human-origin `user-text` and `user-message` events.
 
-Runtime input windows are tied to synchronized stream events:
+Runtime input windows are tied to synchronized events:
 
 - `turn-start`: input is appended after the original turn input and before the first model snapshot.
 - `step-start`: input is appended before that same step's model snapshot.
@@ -102,7 +106,7 @@ const session = agent.session("room:123:user:456");
 const run = await session.send("Draft a short answer.");
 let addedSteer = false;
 
-for await (const event of run.stream()) {
+for await (const event of run.events()) {
   if (event.type === "assistant-text") {
     process.stdout.write(event.text);
   }
@@ -127,6 +131,12 @@ Stored session state is an opaque, versioned runtime snapshot for continuation.
 Do not inspect it as a replay log; exact replay should be modeled separately as
 an `AgentEvent` log if that capability is added later.
 
+Custom stores own version generation. `load(key)` returns the opaque `state` with
+the store-minted `version`; `commit(key, { state }, { expectedVersion })` receives
+state only and should reject stale versions by returning `{ ok: false, reason:
+"conflict" }`. On success, the store persists `{ state, version }` and returns the
+new version to the runtime.
+
 ```ts
 import type { SessionStore } from "@minpeter/pss-runtime";
 import { MemorySessionStore } from "@minpeter/pss-runtime/session-store/memory";

package/dist/agent.d.ts

@@ -1,8 +1,8 @@
 import { AgentToolChoice, Llm } from "./llm.js";
+import { AgentInput } from "./session/input.js";
+import { AgentHooks } from "./hooks.js";
 import { AgentRun } from "./session/run.js";
 import { SessionStore } from "./session/store/types.js";
-import { AgentInput } from "./session/session.js";
-import { AgentHooks } from "./hooks.js";
 import { LanguageModel, ToolSet } from "ai";
 
 //#region src/agent.d.ts

package/dist/hooks.d.ts

@@ -1,5 +1,5 @@
 import { RuntimeLlmContext } from "./llm.js";
-import { UserInput } from "./session/session.js";
+import { UserInput } from "./session/input.js";
 
 //#region src/hooks.d.ts
 type AgentTurnResult = "aborted" | "completed";

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import { AgentToolChoice, AgentToolExecute, AgentToolExecutionOptions, LlmOutputPart, RuntimeCreateLlmOptions, RuntimeLlm, RuntimeLlmContext, RuntimeLlmOutput, createLlm } from "./llm.js";
-import { AgentEvent, AgentEventListener, AssistantReasoning, AssistantText, RuntimeInput, ToolCall, ToolResult, UserMessage, UserMessageContent, UserMessageContentPart, UserMessageFileData, UserMessageFilePart, UserMessageImagePart, UserMessageTextPart, UserText, UserTextContent } from "./session/events.js";
-import { AgentRun } from "./session/run.js";
-import { CommitResult, ExpectedSessionVersion, SessionStore, StoredSession } from "./session/store/types.js";
-import { AgentInput, SessionInput, UserInput } from "./session/session.js";
+import { AgentInput, SessionInput, UserInput, UserMessage, UserMessageContent, UserMessageContentPart, UserMessageFileData, UserMessageFilePart, UserMessageImagePart, UserMessageTextPart, UserText, UserTextContent } from "./session/input.js";
 import { AgentAfterStepContext, AgentAfterTurnContext, AgentBeforeStepContext, AgentBeforeTurnContext, AgentHooks, AgentStepResult, AgentTurnResult } from "./hooks.js";
+import { AgentEvent, AgentEventListener, AssistantReasoning, AssistantText, RuntimeInput, ToolCall, ToolResult } from "./session/events.js";
+import { AgentRun } from "./session/run.js";
+import { CommitResult, ExpectedSessionVersion, SessionStore, SessionStoreCommit, StoredSession } from "./session/store/types.js";
 import { Agent, AgentOptions, AgentSessionOptions, SessionHandle } from "./agent.js";
-import { AgentLoopResult, runAgentLoop } from "./agent-loop.js";
-export { Agent, type AgentAfterStepContext, type AgentAfterTurnContext, type AgentBeforeStepContext, type AgentBeforeTurnContext, type AgentEvent, type AgentEventListener, type AgentHooks, type AgentInput, type AgentLoopResult, type AgentOptions, type AgentRun, type AgentSessionOptions, type AgentStepResult, type AgentToolChoice, type AgentToolExecute, type AgentToolExecutionOptions, type AgentTurnResult, type AssistantReasoning, type AssistantText, type CommitResult, type ExpectedSessionVersion, type LlmOutputPart, type RuntimeCreateLlmOptions, type RuntimeInput, type RuntimeLlm, type RuntimeLlmContext, type RuntimeLlmOutput, type SessionHandle, type SessionInput, type SessionStore, type StoredSession, type ToolCall, type ToolResult, type UserInput, type UserMessage, type UserMessageContent, type UserMessageContentPart, type UserMessageFileData, type UserMessageFilePart, type UserMessageImagePart, type UserMessageTextPart, type UserText, type UserTextContent, createLlm, runAgentLoop };
+export { Agent, type AgentAfterStepContext, type AgentAfterTurnContext, type AgentBeforeStepContext, type AgentBeforeTurnContext, type AgentEvent, type AgentEventListener, type AgentHooks, type AgentInput, type AgentOptions, type AgentRun, type AgentSessionOptions, type AgentStepResult, type AgentToolChoice, type AgentToolExecute, type AgentToolExecutionOptions, type AgentTurnResult, type AssistantReasoning, type AssistantText, type CommitResult, type ExpectedSessionVersion, type LlmOutputPart, type RuntimeCreateLlmOptions, type RuntimeInput, type RuntimeLlm, type RuntimeLlmContext, type RuntimeLlmOutput, type SessionHandle, type SessionInput, type SessionStore, type SessionStoreCommit, type StoredSession, type ToolCall, type ToolResult, type UserInput, type UserMessage, type UserMessageContent, type UserMessageContentPart, type UserMessageFileData, type UserMessageFilePart, type UserMessageImagePart, type UserMessageTextPart, type UserText, type UserTextContent, createLlm };

package/dist/index.js

@@ -1,4 +1,3 @@
 import { createLlm } from "./llm.js";
-import { runAgentLoop } from "./agent-loop.js";
 import { Agent } from "./agent.js";
-export { Agent, createLlm, runAgentLoop };
+export { Agent, createLlm };

package/dist/session/events.d.ts

@@ -1,45 +1,6 @@
-import { UserInput } from "./session.js";
+import { UserInput, UserMessage, UserMessageContent, UserMessageContentPart, UserMessageFileData, UserMessageFilePart, UserMessageImagePart, UserMessageTextPart, UserText, UserTextContent } from "./input.js";
 
 //#region src/session/events.d.ts
-type UserTextContent = string | readonly string[];
-interface UserText {
-  text: UserTextContent;
-  type: "user-text";
-}
-interface UserMessageTextPart {
-  text: string;
-  type: "text";
-}
-interface UserMessageImagePart {
-  image: string;
-  mediaType?: string;
-  type: "image";
-}
-type UserMessageFileData = string | {
-  data: string;
-  type: "data";
-} | {
-  reference: Record<string, string>;
-  type: "reference";
-} | {
-  text: string;
-  type: "text";
-} | {
-  type: "url";
-  url: string;
-};
-interface UserMessageFilePart {
-  data: UserMessageFileData;
-  filename?: string;
-  mediaType: string;
-  type: "file";
-}
-type UserMessageContentPart = UserMessageFilePart | UserMessageImagePart | UserMessageTextPart;
-type UserMessageContent = readonly UserMessageContentPart[];
-interface UserMessage {
-  content: UserMessageContent;
-  type: "user-message";
-}
 interface RuntimeInput {
   /**
    * Runtime/API-originated model input inserted into the current turn.
@@ -85,5 +46,5 @@ type AgentEvent = /** User input was accepted into the session queue. */UserText
 };
 type AgentEventListener = (event: AgentEvent) => void;
 //#endregion
-export { AgentEvent, AgentEventListener, AssistantReasoning, AssistantText, RuntimeInput, ToolCall, ToolResult, UserMessage, UserMessageContent, UserMessageContentPart, UserMessageFileData, UserMessageFilePart, UserMessageImagePart, UserMessageTextPart, UserText, UserTextContent };
+export { AgentEvent, AgentEventListener, AssistantReasoning, AssistantText, RuntimeInput, ToolCall, ToolResult };
 //# sourceMappingURL=events.d.ts.map

package/dist/session/history.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.js","names":["#modelHistory","#onChange","#triggerChange"],"sources":["../../src/session/history.ts"],"sourcesContent":["import type { ModelMessage } from \"ai\";\nimport { userInputToModelMessage } from \"./mapping\";\nimport type { UserInput } from \"./session\";\n\nexport class ModelMessageHistory {\n  readonly #modelHistory: ModelMessage[] = [];\n  readonly #onChange?: (snapshot: ModelMessage[]) => void;\n\n  constructor(\n    history?: ModelMessage[],\n    onChange?: (snapshot: ModelMessage[]) => void\n  ) {\n    if (history) {\n      this.#modelHistory = structuredClone(history);\n    }\n    this.#onChange = onChange;\n  }\n\n  modelSnapshot(): ModelMessage[] {\n    return structuredClone(this.#modelHistory);\n  }\n\n  appendUserInput(input: UserInput): void {\n    this.#modelHistory.push(userInputToModelMessage(input));\n    this.#triggerChange();\n  }\n\n  appendModelMessage(message: ModelMessage): void {\n    this.#modelHistory.push(structuredClone(message));\n    this.#triggerChange();\n  }\n\n  rollback(snapshot: ModelMessage[]): void {\n    this.#modelHistory.length = 0;\n    this.#modelHistory.push(...structuredClone(snapshot));\n    this.#triggerChange();\n  }\n\n  #triggerChange(): void {\n    this.#onChange?.(this.modelSnapshot());\n  }\n}\n"],"mappings":";;AAIA,IAAa,sBAAb,MAAiC;CAC/B,gBAAyC,CAAC;CAC1C;CAEA,YACE,SACA,UACA;EACA,IAAI,SACF,KAAKA,gBAAgB,gBAAgB,OAAO;EAE9C,KAAKC,YAAY;CACnB;CAEA,gBAAgC;EAC9B,OAAO,gBAAgB,KAAKD,aAAa;CAC3C;CAEA,gBAAgB,OAAwB;EACtC,KAAKA,cAAc,KAAK,wBAAwB,KAAK,CAAC;EACtD,KAAKE,eAAe;CACtB;CAEA,mBAAmB,SAA6B;EAC9C,KAAKF,cAAc,KAAK,gBAAgB,OAAO,CAAC;EAChD,KAAKE,eAAe;CACtB;CAEA,SAAS,UAAgC;EACvC,KAAKF,cAAc,SAAS;EAC5B,KAAKA,cAAc,KAAK,GAAG,gBAAgB,QAAQ,CAAC;EACpD,KAAKE,eAAe;CACtB;CAEA,iBAAuB;EACrB,KAAKD,YAAY,KAAK,cAAc,CAAC;CACvC;AACF"}
+{"version":3,"file":"history.js","names":["#modelHistory","#onChange","#triggerChange"],"sources":["../../src/session/history.ts"],"sourcesContent":["import type { ModelMessage } from \"ai\";\nimport type { UserInput } from \"./input\";\nimport { userInputToModelMessage } from \"./mapping\";\n\nexport class ModelMessageHistory {\n  readonly #modelHistory: ModelMessage[] = [];\n  readonly #onChange?: (snapshot: ModelMessage[]) => void;\n\n  constructor(\n    history?: ModelMessage[],\n    onChange?: (snapshot: ModelMessage[]) => void\n  ) {\n    if (history) {\n      this.#modelHistory = structuredClone(history);\n    }\n    this.#onChange = onChange;\n  }\n\n  modelSnapshot(): ModelMessage[] {\n    return structuredClone(this.#modelHistory);\n  }\n\n  appendUserInput(input: UserInput): void {\n    this.#modelHistory.push(userInputToModelMessage(input));\n    this.#triggerChange();\n  }\n\n  appendModelMessage(message: ModelMessage): void {\n    this.#modelHistory.push(structuredClone(message));\n    this.#triggerChange();\n  }\n\n  rollback(snapshot: ModelMessage[]): void {\n    this.#modelHistory.length = 0;\n    this.#modelHistory.push(...structuredClone(snapshot));\n    this.#triggerChange();\n  }\n\n  #triggerChange(): void {\n    this.#onChange?.(this.modelSnapshot());\n  }\n}\n"],"mappings":";;AAIA,IAAa,sBAAb,MAAiC;CAC/B,gBAAyC,CAAC;CAC1C;CAEA,YACE,SACA,UACA;EACA,IAAI,SACF,KAAKA,gBAAgB,gBAAgB,OAAO;EAE9C,KAAKC,YAAY;CACnB;CAEA,gBAAgC;EAC9B,OAAO,gBAAgB,KAAKD,aAAa;CAC3C;CAEA,gBAAgB,OAAwB;EACtC,KAAKA,cAAc,KAAK,wBAAwB,KAAK,CAAC;EACtD,KAAKE,eAAe;CACtB;CAEA,mBAAmB,SAA6B;EAC9C,KAAKF,cAAc,KAAK,gBAAgB,OAAO,CAAC;EAChD,KAAKE,eAAe;CACtB;CAEA,SAAS,UAAgC;EACvC,KAAKF,cAAc,SAAS;EAC5B,KAAKA,cAAc,KAAK,GAAG,gBAAgB,QAAQ,CAAC;EACpD,KAAKE,eAAe;CACtB;CAEA,iBAAuB;EACrB,KAAKD,YAAY,KAAK,cAAc,CAAC;CACvC;AACF"}

package/dist/session/input.d.ts

@@ -0,0 +1,46 @@
+//#region src/session/input.d.ts
+type UserTextContent = string | readonly string[];
+interface UserText {
+  text: UserTextContent;
+  type: "user-text";
+}
+interface UserMessageTextPart {
+  text: string;
+  type: "text";
+}
+interface UserMessageImagePart {
+  image: string;
+  mediaType?: string;
+  type: "image";
+}
+type UserMessageFileData = string | {
+  data: string;
+  type: "data";
+} | {
+  reference: Record<string, string>;
+  type: "reference";
+} | {
+  text: string;
+  type: "text";
+} | {
+  type: "url";
+  url: string;
+};
+interface UserMessageFilePart {
+  data: UserMessageFileData;
+  filename?: string;
+  mediaType: string;
+  type: "file";
+}
+type UserMessageContentPart = UserMessageFilePart | UserMessageImagePart | UserMessageTextPart;
+type UserMessageContent = readonly UserMessageContentPart[];
+interface UserMessage {
+  content: UserMessageContent;
+  type: "user-message";
+}
+type UserInput = UserMessage | UserText;
+type AgentInput = readonly string[] | readonly UserMessageContentPart[] | string | UserInput;
+type SessionInput = AgentInput;
+//#endregion
+export { AgentInput, SessionInput, UserInput, UserMessage, UserMessageContent, UserMessageContentPart, UserMessageFileData, UserMessageFilePart, UserMessageImagePart, UserMessageTextPart, UserText, UserTextContent };
+//# sourceMappingURL=input.d.ts.map

package/dist/session/mapping.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapping.js","names":[],"sources":["../../src/session/mapping.ts"],"sourcesContent":["import type {\n  AssistantContent,\n  AssistantModelMessage,\n  ModelMessage,\n  ToolModelMessage,\n  UserModelMessage,\n} from \"ai\";\nimport type {\n  AssistantReasoning,\n  AssistantText,\n  ToolCall,\n  ToolResult,\n  UserMessage,\n  UserMessageContent,\n  UserMessageContentPart,\n  UserMessageFileData,\n  UserText,\n  UserTextContent,\n} from \"./events\";\nimport type { UserInput } from \"./session\";\n\ntype AssistantContentPart = Exclude<AssistantContent, string>[number];\ntype ToolContentPart = ToolModelMessage[\"content\"][number];\ntype ModelEvent = AssistantReasoning | AssistantText | ToolCall | ToolResult;\n\n// UserInput -> AI SDK UserModelMessage\nexport function userInputToModelMessage(input: UserInput): UserModelMessage {\n  if (input.type === \"user-message\") {\n    return userMessageToModelMessage(input);\n  }\n\n  return userTextToModelMessage(input);\n}\n\nexport function userTextToModelMessage(input: UserText): UserModelMessage {\n  return { role: \"user\", content: userTextContentToUserContent(input.text) };\n}\n\nfunction userTextContentToUserContent(\n  text: UserTextContent\n): UserModelMessage[\"content\"] {\n  if (typeof text === \"string\") {\n    return text;\n  }\n\n  return text.map((part) => ({ type: \"text\", text: part }));\n}\n\nexport function userMessageToModelMessage(\n  input: UserMessage\n): UserModelMessage {\n  return {\n    role: \"user\",\n    content: userMessageContentToUserContent(input.content),\n  };\n}\n\nfunction userMessageContentToUserContent(\n  content: UserMessageContent\n): Exclude<UserModelMessage[\"content\"], string> {\n  return content.map(userMessageContentPartToUserContentPart);\n}\n\nfunction userMessageContentPartToUserContentPart(\n  part: UserMessageContentPart\n): Exclude<UserModelMessage[\"content\"], string>[number] {\n  if (part.type === \"text\") {\n    return { type: \"text\", text: part.text };\n  }\n\n  if (part.type === \"image\") {\n    return {\n      type: \"file\",\n      data: part.image,\n      mediaType: part.mediaType ?? \"image\",\n    };\n  }\n\n  return {\n    type: \"file\",\n    data: userMessageFileDataToFileData(part.data),\n    mediaType: part.mediaType,\n    ...(part.filename === undefined ? {} : { filename: part.filename }),\n  };\n}\n\nfunction userMessageFileDataToFileData(\n  data: UserMessageFileData\n): Extract<\n  Exclude<UserModelMessage[\"content\"], string>[number],\n  { type: \"file\" }\n>[\"data\"] {\n  if (typeof data === \"string\") {\n    return data;\n  }\n\n  if (data.type === \"url\") {\n    return data.url;\n  }\n\n  if (data.type === \"data\") {\n    return { type: \"data\", data: data.data };\n  }\n\n  if (data.type === \"reference\") {\n    return { type: \"reference\", reference: { ...data.reference } };\n  }\n\n  return { type: \"text\", text: data.text };\n}\n\n// AI SDK ModelMessage -> public agent events\nexport function modelMessageToAgentEvents(message: ModelMessage): ModelEvent[] {\n  if (message.role === \"assistant\") {\n    return assistantReasoningFirstParts(assistantContentParts(message)).flatMap(\n      assistantContentPartToEvents\n    );\n  }\n\n  if (message.role === \"tool\") {\n    return message.content.flatMap(toolContentPartToEvents);\n  }\n\n  return [];\n}\n\nfunction assistantContentParts(\n  message: AssistantModelMessage\n): AssistantContentPart[] {\n  return typeof message.content === \"string\"\n    ? [{ type: \"text\", text: message.content }]\n    : message.content;\n}\n\nfunction assistantReasoningFirstParts(\n  parts: AssistantContentPart[]\n): AssistantContentPart[] {\n  return [\n    ...parts.filter((part) => part.type === \"reasoning\"),\n    ...parts.filter((part) => part.type !== \"reasoning\"),\n  ];\n}\n\nfunction assistantContentPartToEvents(\n  part: AssistantContentPart\n): ModelEvent[] {\n  if (part.type === \"text\") {\n    return part.text ? [{ type: \"assistant-text\", text: part.text }] : [];\n  }\n\n  if (part.type === \"reasoning\") {\n    return part.text ? [{ type: \"assistant-reasoning\", text: part.text }] : [];\n  }\n\n  if (part.type === \"tool-call\") {\n    return [\n      {\n        type: \"tool-call\",\n        input: part.input,\n        toolCallId: part.toolCallId,\n        toolName: part.toolName,\n      },\n    ];\n  }\n\n  return [];\n}\n\nfunction toolContentPartToEvents(part: ToolContentPart): ModelEvent[] {\n  if (part.type === \"tool-result\") {\n    return toolResultPartToEvents(part);\n  }\n\n  return [];\n}\n\nfunction toolResultPartToEvents(part: {\n  output: unknown;\n  toolCallId: string;\n  toolName: string;\n  type: \"tool-result\";\n}): ModelEvent[] {\n  return [\n    {\n      type: \"tool-result\",\n      output: part.output,\n      toolCallId: part.toolCallId,\n      toolName: part.toolName,\n    },\n  ];\n}\n"],"mappings":";AA0BA,SAAgB,wBAAwB,OAAoC;CAC1E,IAAI,MAAM,SAAS,gBACjB,OAAO,0BAA0B,KAAK;CAGxC,OAAO,uBAAuB,KAAK;AACrC;AAEA,SAAgB,uBAAuB,OAAmC;CACxE,OAAO;EAAE,MAAM;EAAQ,SAAS,6BAA6B,MAAM,IAAI;CAAE;AAC3E;AAEA,SAAS,6BACP,MAC6B;CAC7B,IAAI,OAAO,SAAS,UAClB,OAAO;CAGT,OAAO,KAAK,KAAK,UAAU;EAAE,MAAM;EAAQ,MAAM;CAAK,EAAE;AAC1D;AAEA,SAAgB,0BACd,OACkB;CAClB,OAAO;EACL,MAAM;EACN,SAAS,gCAAgC,MAAM,OAAO;CACxD;AACF;AAEA,SAAS,gCACP,SAC8C;CAC9C,OAAO,QAAQ,IAAI,uCAAuC;AAC5D;AAEA,SAAS,wCACP,MACsD;CACtD,IAAI,KAAK,SAAS,QAChB,OAAO;EAAE,MAAM;EAAQ,MAAM,KAAK;CAAK;CAGzC,IAAI,KAAK,SAAS,SAChB,OAAO;EACL,MAAM;EACN,MAAM,KAAK;EACX,WAAW,KAAK,aAAa;CAC/B;CAGF,OAAO;EACL,MAAM;EACN,MAAM,8BAA8B,KAAK,IAAI;EAC7C,WAAW,KAAK;EAChB,GAAI,KAAK,aAAa,KAAA,IAAY,CAAC,IAAI,EAAE,UAAU,KAAK,SAAS;CACnE;AACF;AAEA,SAAS,8BACP,MAIQ;CACR,IAAI,OAAO,SAAS,UAClB,OAAO;CAGT,IAAI,KAAK,SAAS,OAChB,OAAO,KAAK;CAGd,IAAI,KAAK,SAAS,QAChB,OAAO;EAAE,MAAM;EAAQ,MAAM,KAAK;CAAK;CAGzC,IAAI,KAAK,SAAS,aAChB,OAAO;EAAE,MAAM;EAAa,WAAW,EAAE,GAAG,KAAK,UAAU;CAAE;CAG/D,OAAO;EAAE,MAAM;EAAQ,MAAM,KAAK;CAAK;AACzC;AAGA,SAAgB,0BAA0B,SAAqC;CAC7E,IAAI,QAAQ,SAAS,aACnB,OAAO,6BAA6B,sBAAsB,OAAO,CAAC,EAAE,QAClE,4BACF;CAGF,IAAI,QAAQ,SAAS,QACnB,OAAO,QAAQ,QAAQ,QAAQ,uBAAuB;CAGxD,OAAO,CAAC;AACV;AAEA,SAAS,sBACP,SACwB;CACxB,OAAO,OAAO,QAAQ,YAAY,WAC9B,CAAC;EAAE,MAAM;EAAQ,MAAM,QAAQ;CAAQ,CAAC,IACxC,QAAQ;AACd;AAEA,SAAS,6BACP,OACwB;CACxB,OAAO,CACL,GAAG,MAAM,QAAQ,SAAS,KAAK,SAAS,WAAW,GACnD,GAAG,MAAM,QAAQ,SAAS,KAAK,SAAS,WAAW,CACrD;AACF;AAEA,SAAS,6BACP,MACc;CACd,IAAI,KAAK,SAAS,QAChB,OAAO,KAAK,OAAO,CAAC;EAAE,MAAM;EAAkB,MAAM,KAAK;CAAK,CAAC,IAAI,CAAC;CAGtE,IAAI,KAAK,SAAS,aAChB,OAAO,KAAK,OAAO,CAAC;EAAE,MAAM;EAAuB,MAAM,KAAK;CAAK,CAAC,IAAI,CAAC;CAG3E,IAAI,KAAK,SAAS,aAChB,OAAO,CACL;EACE,MAAM;EACN,OAAO,KAAK;EACZ,YAAY,KAAK;EACjB,UAAU,KAAK;CACjB,CACF;CAGF,OAAO,CAAC;AACV;AAEA,SAAS,wBAAwB,MAAqC;CACpE,IAAI,KAAK,SAAS,eAChB,OAAO,uBAAuB,IAAI;CAGpC,OAAO,CAAC;AACV;AAEA,SAAS,uBAAuB,MAKf;CACf,OAAO,CACL;EACE,MAAM;EACN,QAAQ,KAAK;EACb,YAAY,KAAK;EACjB,UAAU,KAAK;CACjB,CACF;AACF"}
+{"version":3,"file":"mapping.js","names":[],"sources":["../../src/session/mapping.ts"],"sourcesContent":["import type {\n  AssistantContent,\n  AssistantModelMessage,\n  ModelMessage,\n  ToolModelMessage,\n  UserModelMessage,\n} from \"ai\";\nimport type {\n  AssistantReasoning,\n  AssistantText,\n  ToolCall,\n  ToolResult,\n  UserMessage,\n  UserMessageContent,\n  UserMessageContentPart,\n  UserMessageFileData,\n  UserText,\n  UserTextContent,\n} from \"./events\";\nimport type { UserInput } from \"./input\";\n\ntype AssistantContentPart = Exclude<AssistantContent, string>[number];\ntype ToolContentPart = ToolModelMessage[\"content\"][number];\ntype ModelEvent = AssistantReasoning | AssistantText | ToolCall | ToolResult;\n\n// UserInput -> AI SDK UserModelMessage\nexport function userInputToModelMessage(input: UserInput): UserModelMessage {\n  if (input.type === \"user-message\") {\n    return userMessageToModelMessage(input);\n  }\n\n  return userTextToModelMessage(input);\n}\n\nexport function userTextToModelMessage(input: UserText): UserModelMessage {\n  return { role: \"user\", content: userTextContentToUserContent(input.text) };\n}\n\nfunction userTextContentToUserContent(\n  text: UserTextContent\n): UserModelMessage[\"content\"] {\n  if (typeof text === \"string\") {\n    return text;\n  }\n\n  return text.map((part) => ({ type: \"text\", text: part }));\n}\n\nexport function userMessageToModelMessage(\n  input: UserMessage\n): UserModelMessage {\n  return {\n    role: \"user\",\n    content: userMessageContentToUserContent(input.content),\n  };\n}\n\nfunction userMessageContentToUserContent(\n  content: UserMessageContent\n): Exclude<UserModelMessage[\"content\"], string> {\n  return content.map(userMessageContentPartToUserContentPart);\n}\n\nfunction userMessageContentPartToUserContentPart(\n  part: UserMessageContentPart\n): Exclude<UserModelMessage[\"content\"], string>[number] {\n  if (part.type === \"text\") {\n    return { type: \"text\", text: part.text };\n  }\n\n  if (part.type === \"image\") {\n    return {\n      type: \"file\",\n      data: part.image,\n      mediaType: part.mediaType ?? \"image\",\n    };\n  }\n\n  return {\n    type: \"file\",\n    data: userMessageFileDataToFileData(part.data),\n    mediaType: part.mediaType,\n    ...(part.filename === undefined ? {} : { filename: part.filename }),\n  };\n}\n\nfunction userMessageFileDataToFileData(\n  data: UserMessageFileData\n): Extract<\n  Exclude<UserModelMessage[\"content\"], string>[number],\n  { type: \"file\" }\n>[\"data\"] {\n  if (typeof data === \"string\") {\n    return data;\n  }\n\n  if (data.type === \"url\") {\n    return data.url;\n  }\n\n  if (data.type === \"data\") {\n    return { type: \"data\", data: data.data };\n  }\n\n  if (data.type === \"reference\") {\n    return { type: \"reference\", reference: { ...data.reference } };\n  }\n\n  return { type: \"text\", text: data.text };\n}\n\n// AI SDK ModelMessage -> public agent events\nexport function modelMessageToAgentEvents(message: ModelMessage): ModelEvent[] {\n  if (message.role === \"assistant\") {\n    return assistantReasoningFirstParts(assistantContentParts(message)).flatMap(\n      assistantContentPartToEvents\n    );\n  }\n\n  if (message.role === \"tool\") {\n    return message.content.flatMap(toolContentPartToEvents);\n  }\n\n  return [];\n}\n\nfunction assistantContentParts(\n  message: AssistantModelMessage\n): AssistantContentPart[] {\n  return typeof message.content === \"string\"\n    ? [{ type: \"text\", text: message.content }]\n    : message.content;\n}\n\nfunction assistantReasoningFirstParts(\n  parts: AssistantContentPart[]\n): AssistantContentPart[] {\n  return [\n    ...parts.filter((part) => part.type === \"reasoning\"),\n    ...parts.filter((part) => part.type !== \"reasoning\"),\n  ];\n}\n\nfunction assistantContentPartToEvents(\n  part: AssistantContentPart\n): ModelEvent[] {\n  if (part.type === \"text\") {\n    return part.text ? [{ type: \"assistant-text\", text: part.text }] : [];\n  }\n\n  if (part.type === \"reasoning\") {\n    return part.text ? [{ type: \"assistant-reasoning\", text: part.text }] : [];\n  }\n\n  if (part.type === \"tool-call\") {\n    return [\n      {\n        type: \"tool-call\",\n        input: part.input,\n        toolCallId: part.toolCallId,\n        toolName: part.toolName,\n      },\n    ];\n  }\n\n  return [];\n}\n\nfunction toolContentPartToEvents(part: ToolContentPart): ModelEvent[] {\n  if (part.type === \"tool-result\") {\n    return toolResultPartToEvents(part);\n  }\n\n  return [];\n}\n\nfunction toolResultPartToEvents(part: {\n  output: unknown;\n  toolCallId: string;\n  toolName: string;\n  type: \"tool-result\";\n}): ModelEvent[] {\n  return [\n    {\n      type: \"tool-result\",\n      output: part.output,\n      toolCallId: part.toolCallId,\n      toolName: part.toolName,\n    },\n  ];\n}\n"],"mappings":";AA0BA,SAAgB,wBAAwB,OAAoC;CAC1E,IAAI,MAAM,SAAS,gBACjB,OAAO,0BAA0B,KAAK;CAGxC,OAAO,uBAAuB,KAAK;AACrC;AAEA,SAAgB,uBAAuB,OAAmC;CACxE,OAAO;EAAE,MAAM;EAAQ,SAAS,6BAA6B,MAAM,IAAI;CAAE;AAC3E;AAEA,SAAS,6BACP,MAC6B;CAC7B,IAAI,OAAO,SAAS,UAClB,OAAO;CAGT,OAAO,KAAK,KAAK,UAAU;EAAE,MAAM;EAAQ,MAAM;CAAK,EAAE;AAC1D;AAEA,SAAgB,0BACd,OACkB;CAClB,OAAO;EACL,MAAM;EACN,SAAS,gCAAgC,MAAM,OAAO;CACxD;AACF;AAEA,SAAS,gCACP,SAC8C;CAC9C,OAAO,QAAQ,IAAI,uCAAuC;AAC5D;AAEA,SAAS,wCACP,MACsD;CACtD,IAAI,KAAK,SAAS,QAChB,OAAO;EAAE,MAAM;EAAQ,MAAM,KAAK;CAAK;CAGzC,IAAI,KAAK,SAAS,SAChB,OAAO;EACL,MAAM;EACN,MAAM,KAAK;EACX,WAAW,KAAK,aAAa;CAC/B;CAGF,OAAO;EACL,MAAM;EACN,MAAM,8BAA8B,KAAK,IAAI;EAC7C,WAAW,KAAK;EAChB,GAAI,KAAK,aAAa,KAAA,IAAY,CAAC,IAAI,EAAE,UAAU,KAAK,SAAS;CACnE;AACF;AAEA,SAAS,8BACP,MAIQ;CACR,IAAI,OAAO,SAAS,UAClB,OAAO;CAGT,IAAI,KAAK,SAAS,OAChB,OAAO,KAAK;CAGd,IAAI,KAAK,SAAS,QAChB,OAAO;EAAE,MAAM;EAAQ,MAAM,KAAK;CAAK;CAGzC,IAAI,KAAK,SAAS,aAChB,OAAO;EAAE,MAAM;EAAa,WAAW,EAAE,GAAG,KAAK,UAAU;CAAE;CAG/D,OAAO;EAAE,MAAM;EAAQ,MAAM,KAAK;CAAK;AACzC;AAGA,SAAgB,0BAA0B,SAAqC;CAC7E,IAAI,QAAQ,SAAS,aACnB,OAAO,6BAA6B,sBAAsB,OAAO,CAAC,EAAE,QAClE,4BACF;CAGF,IAAI,QAAQ,SAAS,QACnB,OAAO,QAAQ,QAAQ,QAAQ,uBAAuB;CAGxD,OAAO,CAAC;AACV;AAEA,SAAS,sBACP,SACwB;CACxB,OAAO,OAAO,QAAQ,YAAY,WAC9B,CAAC;EAAE,MAAM;EAAQ,MAAM,QAAQ;CAAQ,CAAC,IACxC,QAAQ;AACd;AAEA,SAAS,6BACP,OACwB;CACxB,OAAO,CACL,GAAG,MAAM,QAAQ,SAAS,KAAK,SAAS,WAAW,GACnD,GAAG,MAAM,QAAQ,SAAS,KAAK,SAAS,WAAW,CACrD;AACF;AAEA,SAAS,6BACP,MACc;CACd,IAAI,KAAK,SAAS,QAChB,OAAO,KAAK,OAAO,CAAC;EAAE,MAAM;EAAkB,MAAM,KAAK;CAAK,CAAC,IAAI,CAAC;CAGtE,IAAI,KAAK,SAAS,aAChB,OAAO,KAAK,OAAO,CAAC;EAAE,MAAM;EAAuB,MAAM,KAAK;CAAK,CAAC,IAAI,CAAC;CAG3E,IAAI,KAAK,SAAS,aAChB,OAAO,CACL;EACE,MAAM;EACN,OAAO,KAAK;EACZ,YAAY,KAAK;EACjB,UAAU,KAAK;CACjB,CACF;CAGF,OAAO,CAAC;AACV;AAEA,SAAS,wBAAwB,MAAqC;CACpE,IAAI,KAAK,SAAS,eAChB,OAAO,uBAAuB,IAAI;CAGpC,OAAO,CAAC;AACV;AAEA,SAAS,uBAAuB,MAKf;CACf,OAAO,CACL;EACE,MAAM;EACN,QAAQ,KAAK;EACb,YAAY,KAAK;EACjB,UAAU,KAAK;CACjB,CACF;AACF"}

package/dist/session/run.d.ts

@@ -2,7 +2,7 @@ import { AgentEvent } from "./events.js";
 
 //#region src/session/run.d.ts
 interface AgentRun {
-  stream(): AsyncIterable<AgentEvent>;
+  events(): AsyncIterable<AgentEvent>;
 }
 //#endregion
 export { AgentRun };

package/dist/session/run.js

@@ -5,7 +5,7 @@ var BufferedAgentRun = class {
 	#error;
 	#pendingAck;
 	#resultPending = false;
-	#streamStarted = false;
+	#eventsStarted = false;
 	#waiter;
 	emit(event) {
 		if (this.#closed) return;
@@ -25,6 +25,7 @@ var BufferedAgentRun = class {
 		this.#closed = true;
 		this.#error = error;
 		this.#settlePendingAck();
+		this.#settleQueuedAcks();
 		if (!this.#waiter) return;
 		const waiter = this.#waiter;
 		this.#waiter = void 0;
@@ -37,9 +38,9 @@ var BufferedAgentRun = class {
 			value: void 0
 		});
 	}
-	stream() {
-		if (this.#streamStarted) throw new Error("AgentRun.stream() can only be consumed once");
-		this.#streamStarted = true;
+	events() {
+		if (this.#eventsStarted) throw new Error("AgentRun.events() can only be consumed once");
+		this.#eventsStarted = true;
 		const iterator = {
 			next: () => this.#next(),
 			return: () => {
@@ -56,7 +57,7 @@ var BufferedAgentRun = class {
 	#cancel() {
 		this.#settleQueuedAcks();
 		this.#events.length = 0;
-		this.close(void 0, "stream return");
+		this.close(void 0, "events return");
 	}
 	#enqueue(event) {
 		const waiter = this.#waiter;
@@ -68,7 +69,7 @@ var BufferedAgentRun = class {
 		this.#events.push(event);
 	}
 	#next() {
-		if (this.#resultPending || this.#waiter) return Promise.reject(/* @__PURE__ */ new Error("AgentRun.stream() does not allow concurrent next() calls"));
+		if (this.#resultPending || this.#waiter) return Promise.reject(/* @__PURE__ */ new Error("AgentRun.events() does not allow concurrent next() calls"));
 		this.#settlePendingAck();
 		const event = this.#events.shift();
 		if (event) return new Promise((resolve) => this.#deliver(resolve, event));

package/dist/session/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","names":["#events","#closed","#enqueue","#error","#settlePendingAck","#waiter","#streamStarted","#next","#cancel","#settleQueuedAcks","#deliver","#resultPending","#pendingAck"],"sources":["../../src/session/run.ts"],"sourcesContent":["import type { AgentEvent } from \"./events\";\n\nexport interface AgentRun {\n  stream(): AsyncIterable<AgentEvent>;\n}\n\ninterface QueuedEvent {\n  readonly ack?: () => void;\n  readonly event: AgentEvent;\n}\n\ninterface NextWaiter {\n  readonly reject: (error: unknown) => void;\n  readonly resolve: (value: IteratorResult<AgentEvent>) => void;\n}\n\nexport class BufferedAgentRun implements AgentRun {\n  readonly #events: QueuedEvent[] = [];\n  #closed = false;\n  #error: unknown;\n  #pendingAck: (() => void) | undefined;\n  #resultPending = false;\n  #streamStarted = false;\n  #waiter: NextWaiter | undefined;\n\n  emit(event: AgentEvent): void {\n    if (this.#closed) {\n      return;\n    }\n\n    this.#enqueue({ event: structuredClone(event) });\n  }\n\n  emitBoundary(event: AgentEvent): Promise<void> {\n    if (this.#closed) {\n      return Promise.resolve();\n    }\n\n    return new Promise((resolve) => {\n      this.#enqueue({ ack: resolve, event: structuredClone(event) });\n    });\n  }\n\n  close(error?: unknown, _reason = \"the run is closed\"): void {\n    if (this.#closed) {\n      return;\n    }\n\n    this.#closed = true;\n    this.#error = error;\n    this.#settlePendingAck();\n\n    if (!this.#waiter) {\n      return;\n    }\n\n    const waiter = this.#waiter;\n    this.#waiter = undefined;\n    if (error) {\n      waiter.reject(error);\n      return;\n    }\n    waiter.resolve({ done: true, value: undefined });\n  }\n\n  stream(): AsyncIterable<AgentEvent> {\n    if (this.#streamStarted) {\n      throw new Error(\"AgentRun.stream() can only be consumed once\");\n    }\n    this.#streamStarted = true;\n\n    const iterator: AsyncIterableIterator<AgentEvent> = {\n      next: () => this.#next(),\n      return: () => {\n        this.#cancel();\n        return Promise.resolve({ done: true, value: undefined });\n      },\n      [Symbol.asyncIterator]: () => iterator,\n    };\n    return iterator;\n  }\n\n  #cancel(): void {\n    this.#settleQueuedAcks();\n    this.#events.length = 0;\n    this.close(undefined, \"stream return\");\n  }\n\n  #enqueue(event: QueuedEvent): void {\n    const waiter = this.#waiter;\n    if (waiter) {\n      this.#waiter = undefined;\n      this.#deliver(waiter.resolve, event);\n      return;\n    }\n\n    this.#events.push(event);\n  }\n\n  #next(): Promise<IteratorResult<AgentEvent>> {\n    if (this.#resultPending || this.#waiter) {\n      return Promise.reject(\n        new Error(\"AgentRun.stream() does not allow concurrent next() calls\")\n      );\n    }\n\n    this.#settlePendingAck();\n\n    const event = this.#events.shift();\n    if (event) {\n      return new Promise((resolve) => this.#deliver(resolve, event));\n    }\n\n    if (this.#closed) {\n      if (this.#error) {\n        return Promise.reject(this.#error);\n      }\n      return Promise.resolve({ done: true, value: undefined });\n    }\n\n    return new Promise((resolve, reject) => {\n      this.#waiter = { reject, resolve };\n    });\n  }\n\n  #deliver(\n    resolve: (value: IteratorResult<AgentEvent>) => void,\n    { ack, event }: QueuedEvent\n  ): void {\n    this.#resultPending = true;\n    queueMicrotask(() => {\n      this.#resultPending = false;\n    });\n    this.#pendingAck = ack;\n    resolve({ done: false, value: event });\n  }\n\n  #settlePendingAck(): void {\n    const ack = this.#pendingAck;\n    this.#pendingAck = undefined;\n    ack?.();\n  }\n\n  #settleQueuedAcks(): void {\n    for (const event of this.#events) {\n      event.ack?.();\n    }\n  }\n}\n"],"mappings":";AAgBA,IAAa,mBAAb,MAAkD;CAChD,UAAkC,CAAC;CACnC,UAAU;CACV;CACA;CACA,iBAAiB;CACjB,iBAAiB;CACjB;CAEA,KAAK,OAAyB;EAC5B,IAAI,KAAKC,SACP;EAGF,KAAKC,SAAS,EAAE,OAAO,gBAAgB,KAAK,EAAE,CAAC;CACjD;CAEA,aAAa,OAAkC;EAC7C,IAAI,KAAKD,SACP,OAAO,QAAQ,QAAQ;EAGzB,OAAO,IAAI,SAAS,YAAY;GAC9B,KAAKC,SAAS;IAAE,KAAK;IAAS,OAAO,gBAAgB,KAAK;GAAE,CAAC;EAC/D,CAAC;CACH;CAEA,MAAM,OAAiB,UAAU,qBAA2B;EAC1D,IAAI,KAAKD,SACP;EAGF,KAAKA,UAAU;EACf,KAAKE,SAAS;EACd,KAAKC,kBAAkB;EAEvB,IAAI,CAAC,KAAKC,SACR;EAGF,MAAM,SAAS,KAAKA;EACpB,KAAKA,UAAU,KAAA;EACf,IAAI,OAAO;GACT,OAAO,OAAO,KAAK;GACnB;EACF;EACA,OAAO,QAAQ;GAAE,MAAM;GAAM,OAAO,KAAA;EAAU,CAAC;CACjD;CAEA,SAAoC;EAClC,IAAI,KAAKC,gBACP,MAAM,IAAI,MAAM,6CAA6C;EAE/D,KAAKA,iBAAiB;EAEtB,MAAM,WAA8C;GAClD,YAAY,KAAKC,MAAM;GACvB,cAAc;IACZ,KAAKC,QAAQ;IACb,OAAO,QAAQ,QAAQ;KAAE,MAAM;KAAM,OAAO,KAAA;IAAU,CAAC;GACzD;IACC,OAAO,sBAAsB;EAChC;EACA,OAAO;CACT;CAEA,UAAgB;EACd,KAAKC,kBAAkB;EACvB,KAAKT,QAAQ,SAAS;EACtB,KAAK,MAAM,KAAA,GAAW,eAAe;CACvC;CAEA,SAAS,OAA0B;EACjC,MAAM,SAAS,KAAKK;EACpB,IAAI,QAAQ;GACV,KAAKA,UAAU,KAAA;GACf,KAAKK,SAAS,OAAO,SAAS,KAAK;GACnC;EACF;EAEA,KAAKV,QAAQ,KAAK,KAAK;CACzB;CAEA,QAA6C;EAC3C,IAAI,KAAKW,kBAAkB,KAAKN,SAC9B,OAAO,QAAQ,uBACb,IAAI,MAAM,0DAA0D,CACtE;EAGF,KAAKD,kBAAkB;EAEvB,MAAM,QAAQ,KAAKJ,QAAQ,MAAM;EACjC,IAAI,OACF,OAAO,IAAI,SAAS,YAAY,KAAKU,SAAS,SAAS,KAAK,CAAC;EAG/D,IAAI,KAAKT,SAAS;GAChB,IAAI,KAAKE,QACP,OAAO,QAAQ,OAAO,KAAKA,MAAM;GAEnC,OAAO,QAAQ,QAAQ;IAAE,MAAM;IAAM,OAAO,KAAA;GAAU,CAAC;EACzD;EAEA,OAAO,IAAI,SAAS,SAAS,WAAW;GACtC,KAAKE,UAAU;IAAE;IAAQ;GAAQ;EACnC,CAAC;CACH;CAEA,SACE,SACA,EAAE,KAAK,SACD;EACN,KAAKM,iBAAiB;EACtB,qBAAqB;GACnB,KAAKA,iBAAiB;EACxB,CAAC;EACD,KAAKC,cAAc;EACnB,QAAQ;GAAE,MAAM;GAAO,OAAO;EAAM,CAAC;CACvC;CAEA,oBAA0B;EACxB,MAAM,MAAM,KAAKA;EACjB,KAAKA,cAAc,KAAA;EACnB,MAAM;CACR;CAEA,oBAA0B;EACxB,KAAK,MAAM,SAAS,KAAKZ,SACvB,MAAM,MAAM;CAEhB;AACF"}
+{"version":3,"file":"run.js","names":["#events","#closed","#enqueue","#error","#settlePendingAck","#settleQueuedAcks","#waiter","#eventsStarted","#next","#cancel","#deliver","#resultPending","#pendingAck"],"sources":["../../src/session/run.ts"],"sourcesContent":["import type { AgentEvent } from \"./events\";\n\nexport interface AgentRun {\n  events(): AsyncIterable<AgentEvent>;\n}\n\ninterface QueuedEvent {\n  readonly ack?: () => void;\n  readonly event: AgentEvent;\n}\n\ninterface NextWaiter {\n  readonly reject: (error: unknown) => void;\n  readonly resolve: (value: IteratorResult<AgentEvent>) => void;\n}\n\nexport class BufferedAgentRun implements AgentRun {\n  readonly #events: QueuedEvent[] = [];\n  #closed = false;\n  #error: unknown;\n  #pendingAck: (() => void) | undefined;\n  #resultPending = false;\n  #eventsStarted = false;\n  #waiter: NextWaiter | undefined;\n\n  emit(event: AgentEvent): void {\n    if (this.#closed) {\n      return;\n    }\n\n    this.#enqueue({ event: structuredClone(event) });\n  }\n\n  emitBoundary(event: AgentEvent): Promise<void> {\n    if (this.#closed) {\n      return Promise.resolve();\n    }\n\n    return new Promise((resolve) => {\n      this.#enqueue({ ack: resolve, event: structuredClone(event) });\n    });\n  }\n\n  close(error?: unknown, _reason = \"the run is closed\"): void {\n    if (this.#closed) {\n      return;\n    }\n\n    this.#closed = true;\n    this.#error = error;\n    this.#settlePendingAck();\n    this.#settleQueuedAcks();\n\n    if (!this.#waiter) {\n      return;\n    }\n\n    const waiter = this.#waiter;\n    this.#waiter = undefined;\n    if (error) {\n      waiter.reject(error);\n      return;\n    }\n    waiter.resolve({ done: true, value: undefined });\n  }\n\n  events(): AsyncIterable<AgentEvent> {\n    if (this.#eventsStarted) {\n      throw new Error(\"AgentRun.events() can only be consumed once\");\n    }\n    this.#eventsStarted = true;\n\n    const iterator: AsyncIterableIterator<AgentEvent> = {\n      next: () => this.#next(),\n      return: () => {\n        this.#cancel();\n        return Promise.resolve({ done: true, value: undefined });\n      },\n      [Symbol.asyncIterator]: () => iterator,\n    };\n    return iterator;\n  }\n\n  #cancel(): void {\n    this.#settleQueuedAcks();\n    this.#events.length = 0;\n    this.close(undefined, \"events return\");\n  }\n\n  #enqueue(event: QueuedEvent): void {\n    const waiter = this.#waiter;\n    if (waiter) {\n      this.#waiter = undefined;\n      this.#deliver(waiter.resolve, event);\n      return;\n    }\n\n    this.#events.push(event);\n  }\n\n  #next(): Promise<IteratorResult<AgentEvent>> {\n    if (this.#resultPending || this.#waiter) {\n      return Promise.reject(\n        new Error(\"AgentRun.events() does not allow concurrent next() calls\")\n      );\n    }\n\n    this.#settlePendingAck();\n\n    const event = this.#events.shift();\n    if (event) {\n      return new Promise((resolve) => this.#deliver(resolve, event));\n    }\n\n    if (this.#closed) {\n      if (this.#error) {\n        return Promise.reject(this.#error);\n      }\n      return Promise.resolve({ done: true, value: undefined });\n    }\n\n    return new Promise((resolve, reject) => {\n      this.#waiter = { reject, resolve };\n    });\n  }\n\n  #deliver(\n    resolve: (value: IteratorResult<AgentEvent>) => void,\n    { ack, event }: QueuedEvent\n  ): void {\n    this.#resultPending = true;\n    queueMicrotask(() => {\n      this.#resultPending = false;\n    });\n    this.#pendingAck = ack;\n    resolve({ done: false, value: event });\n  }\n\n  #settlePendingAck(): void {\n    const ack = this.#pendingAck;\n    this.#pendingAck = undefined;\n    ack?.();\n  }\n\n  #settleQueuedAcks(): void {\n    for (const event of this.#events) {\n      event.ack?.();\n    }\n  }\n}\n"],"mappings":";AAgBA,IAAa,mBAAb,MAAkD;CAChD,UAAkC,CAAC;CACnC,UAAU;CACV;CACA;CACA,iBAAiB;CACjB,iBAAiB;CACjB;CAEA,KAAK,OAAyB;EAC5B,IAAI,KAAKC,SACP;EAGF,KAAKC,SAAS,EAAE,OAAO,gBAAgB,KAAK,EAAE,CAAC;CACjD;CAEA,aAAa,OAAkC;EAC7C,IAAI,KAAKD,SACP,OAAO,QAAQ,QAAQ;EAGzB,OAAO,IAAI,SAAS,YAAY;GAC9B,KAAKC,SAAS;IAAE,KAAK;IAAS,OAAO,gBAAgB,KAAK;GAAE,CAAC;EAC/D,CAAC;CACH;CAEA,MAAM,OAAiB,UAAU,qBAA2B;EAC1D,IAAI,KAAKD,SACP;EAGF,KAAKA,UAAU;EACf,KAAKE,SAAS;EACd,KAAKC,kBAAkB;EACvB,KAAKC,kBAAkB;EAEvB,IAAI,CAAC,KAAKC,SACR;EAGF,MAAM,SAAS,KAAKA;EACpB,KAAKA,UAAU,KAAA;EACf,IAAI,OAAO;GACT,OAAO,OAAO,KAAK;GACnB;EACF;EACA,OAAO,QAAQ;GAAE,MAAM;GAAM,OAAO,KAAA;EAAU,CAAC;CACjD;CAEA,SAAoC;EAClC,IAAI,KAAKC,gBACP,MAAM,IAAI,MAAM,6CAA6C;EAE/D,KAAKA,iBAAiB;EAEtB,MAAM,WAA8C;GAClD,YAAY,KAAKC,MAAM;GACvB,cAAc;IACZ,KAAKC,QAAQ;IACb,OAAO,QAAQ,QAAQ;KAAE,MAAM;KAAM,OAAO,KAAA;IAAU,CAAC;GACzD;IACC,OAAO,sBAAsB;EAChC;EACA,OAAO;CACT;CAEA,UAAgB;EACd,KAAKJ,kBAAkB;EACvB,KAAKL,QAAQ,SAAS;EACtB,KAAK,MAAM,KAAA,GAAW,eAAe;CACvC;CAEA,SAAS,OAA0B;EACjC,MAAM,SAAS,KAAKM;EACpB,IAAI,QAAQ;GACV,KAAKA,UAAU,KAAA;GACf,KAAKI,SAAS,OAAO,SAAS,KAAK;GACnC;EACF;EAEA,KAAKV,QAAQ,KAAK,KAAK;CACzB;CAEA,QAA6C;EAC3C,IAAI,KAAKW,kBAAkB,KAAKL,SAC9B,OAAO,QAAQ,uBACb,IAAI,MAAM,0DAA0D,CACtE;EAGF,KAAKF,kBAAkB;EAEvB,MAAM,QAAQ,KAAKJ,QAAQ,MAAM;EACjC,IAAI,OACF,OAAO,IAAI,SAAS,YAAY,KAAKU,SAAS,SAAS,KAAK,CAAC;EAG/D,IAAI,KAAKT,SAAS;GAChB,IAAI,KAAKE,QACP,OAAO,QAAQ,OAAO,KAAKA,MAAM;GAEnC,OAAO,QAAQ,QAAQ;IAAE,MAAM;IAAM,OAAO,KAAA;GAAU,CAAC;EACzD;EAEA,OAAO,IAAI,SAAS,SAAS,WAAW;GACtC,KAAKG,UAAU;IAAE;IAAQ;GAAQ;EACnC,CAAC;CACH;CAEA,SACE,SACA,EAAE,KAAK,SACD;EACN,KAAKK,iBAAiB;EACtB,qBAAqB;GACnB,KAAKA,iBAAiB;EACxB,CAAC;EACD,KAAKC,cAAc;EACnB,QAAQ;GAAE,MAAM;GAAO,OAAO;EAAM,CAAC;CACvC;CAEA,oBAA0B;EACxB,MAAM,MAAM,KAAKA;EACjB,KAAKA,cAAc,KAAA;EACnB,MAAM;CACR;CAEA,oBAA0B;EACxB,KAAK,MAAM,SAAS,KAAKZ,SACvB,MAAM,MAAM;CAEhB;AACF"}

package/dist/session/session.d.ts

@@ -1,9 +1,2 @@
-import { UserMessage, UserMessageContentPart, UserText } from "./events.js";
-import { AgentRun } from "./run.js";
-//#region src/session/session.d.ts
-type UserInput = UserMessage | UserText;
-type AgentInput = readonly string[] | readonly UserMessageContentPart[] | string | UserInput;
-type SessionInput = AgentInput;
-//#endregion
-export { AgentInput, SessionInput, UserInput };
-//# sourceMappingURL=session.d.ts.map
+import { AgentInput, SessionInput, UserInput } from "./input.js";
+import { AgentRun } from "./run.js";

package/dist/session/session.js

@@ -3,7 +3,6 @@ import { ModelMessageHistory } from "./history.js";
 import { BufferedAgentRun } from "./run.js";
 import { decodeStoredSessionSnapshot, encodeSessionSnapshot } from "./snapshot.js";
 //#region src/session/session.ts
-const noBoundaryDecision = void 0;
 var AgentSession = class {
 	#hooks;
 	#inputQueue = [];
@@ -17,6 +16,7 @@ var AgentSession = class {
 	#loadPromise;
 	#loaded = false;
 	#running = false;
+	#runToCloseOnKill;
 	#storeVersion;
 	constructor(llm, persistence, hooks) {
 		this.#hooks = hooks;
@@ -62,16 +62,23 @@ var AgentSession = class {
 	kill() {
 		if (this.#killed) return;
 		this.#killed = true;
+		const killedError = sessionKilledError();
 		this.#activeAbort?.abort();
-		this.#closeRuntimeInput(this.#activeRuntimeInput, sessionKilledError().message);
+		this.#closeRuntimeInput(this.#activeRuntimeInput, killedError.message);
+		const runToClose = this.#runToCloseOnKill ?? this.#activeRun;
+		runToClose?.emit({
+			type: "turn-error",
+			message: killedError.message
+		});
+		runToClose?.close(void 0, killedError.message);
 		while (this.#inputQueue.length > 0) {
 			const item = this.#inputQueue.shift();
-			this.#closeRuntimeInput(item?.runtimeInput, sessionKilledError().message);
+			this.#closeRuntimeInput(item?.runtimeInput, killedError.message);
 			item?.run.emit({
 				type: "turn-error",
-				message: sessionKilledError().message
+				message: killedError.message
 			});
-			item?.run.close(void 0, sessionKilledError().message);
+			item?.run.close(void 0, killedError.message);
 		}
 	}
 	async #ensureLoaded() {
@@ -111,6 +118,7 @@ var AgentSession = class {
 		this.#activeAbort = activeAbort;
 		this.#activeRun = run;
 		this.#activeRuntimeInput = runtimeInput;
+		this.#runToCloseOnKill = run;
 		const historySnapshot = this.#history.modelSnapshot();
 		try {
 			await this.#withSteeringPlacement(runtimeInput, "turn-start", async () => {
@@ -134,7 +142,7 @@ var AgentSession = class {
 						});
 						const runtimeInputAdded = await this.#drainRuntimeInput(run, runtimeInput, event.type);
 						if (event.type === "step-end") return { runtimeInputAdded };
-						return noBoundaryDecision;
+						return;
 					}
 					run.emit(event);
 				},
@@ -187,6 +195,7 @@ var AgentSession = class {
 			this.#activeAbort = void 0;
 			this.#activeRun = void 0;
 			this.#activeRuntimeInput = void 0;
+			this.#runToCloseOnKill = void 0;
 			run.close(void 0, runtimeInput.closedReason);
 		}
 	}
@@ -208,10 +217,7 @@ var AgentSession = class {
 		}
 	}
 	async #commitHistory() {
-		const result = await this.#persistence.store.commit(this.#persistence.key, {
-			state: encodeSessionSnapshot(this.#history.modelSnapshot()),
-			version: this.#storeVersion
-		}, { expectedVersion: this.#storeVersion ?? null });
+		const result = await this.#persistence.store.commit(this.#persistence.key, { state: encodeSessionSnapshot(this.#history.modelSnapshot()) }, { expectedVersion: this.#storeVersion ?? null });
 		if (!result.ok) {
 			await this.#replaceWithStoredSession();
 			throw new SessionCommitConflictError(this.#persistence.key);

package/dist/session/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":["#hooks","#inputQueue","#llm","#persistence","#killed","#ensureLoaded","#drainInputQueue","#activeRuntimeInput","#activeRun","#addSteeringInput","#activeAbort","#closeRuntimeInput","#loaded","#loadPromise","#loadSessionState","#replaceWithStoredSession","#storeVersion","#history","#running","#processQueuedInput","#withSteeringPlacement","#withRuntimeInputWindow","#commitHistory","#drainRuntimeInput","#hooksForRuntimeInput"],"sources":["../../src/session/session.ts"],"sourcesContent":["import { runAgentLoop } from \"../agent-loop\";\nimport type { AgentHooks } from \"../hooks\";\nimport type { Llm } from \"../llm\";\nimport type {\n  RuntimeInput,\n  UserMessage,\n  UserMessageContentPart,\n  UserText,\n} from \"./events\";\nimport { ModelMessageHistory } from \"./history\";\nimport type { AgentRun } from \"./run\";\nimport { BufferedAgentRun } from \"./run\";\nimport { decodeStoredSessionSnapshot, encodeSessionSnapshot } from \"./snapshot\";\nimport type { SessionStore } from \"./store/types\";\n\nexport type UserInput = UserMessage | UserText;\nexport type AgentInput =\n  | readonly string[]\n  | readonly UserMessageContentPart[]\n  | string\n  | UserInput;\nexport type SessionInput = AgentInput;\nexport type { AgentRun } from \"./run\";\n\ninterface SessionPersistenceOptions {\n  readonly key: string;\n  readonly store: SessionStore;\n}\n\ninterface QueuedInput {\n  readonly input: UserInput;\n  readonly run: BufferedAgentRun;\n  readonly runtimeInput: RuntimeInputState;\n}\n\ntype RuntimeInputPlacement = RuntimeInput[\"placement\"];\nconst noBoundaryDecision = undefined;\n\ninterface QueuedRuntimeInput {\n  readonly input: UserInput;\n  readonly placement: RuntimeInputPlacement;\n}\n\ninterface RuntimeInputState {\n  closedReason?: string;\n  pending: Promise<void>;\n  placement?: RuntimeInputPlacement;\n  readonly queue: QueuedRuntimeInput[];\n  steerPlacement?: RuntimeInputPlacement;\n}\n\nexport class AgentSession {\n  readonly #hooks?: AgentHooks;\n  readonly #inputQueue: QueuedInput[] = [];\n  readonly #llm: Llm;\n  readonly #persistence: SessionPersistenceOptions;\n  #activeAbort?: AbortController;\n  #activeRun?: BufferedAgentRun;\n  #activeRuntimeInput?: RuntimeInputState;\n  #history = new ModelMessageHistory();\n  #killed = false;\n  #loadPromise?: Promise<void>;\n  #loaded = false;\n  #running = false;\n  #storeVersion: string | undefined;\n\n  constructor(\n    llm: Llm,\n    persistence: SessionPersistenceOptions,\n    hooks?: AgentHooks\n  ) {\n    this.#hooks = hooks;\n    this.#llm = llm;\n    this.#persistence = persistence;\n  }\n\n  async send(input: AgentInput): Promise<AgentRun> {\n    if (this.#killed) {\n      throw sessionKilledError();\n    }\n\n    await this.#ensureLoaded();\n\n    if (this.#killed) {\n      throw sessionKilledError();\n    }\n\n    const runtimeInput: RuntimeInputState = {\n      pending: Promise.resolve(),\n      queue: [],\n    };\n    const acceptedInput = normalizeAgentInput(input);\n    const run = new BufferedAgentRun();\n    run.emit(acceptedInput);\n    this.#inputQueue.push({\n      input: structuredClone(acceptedInput),\n      run,\n      runtimeInput,\n    });\n    this.#drainInputQueue().catch((error: unknown) => {\n      run.emit({ type: \"turn-error\", message: errorMessage(error) });\n      run.close();\n    });\n    return run;\n  }\n\n  async steer(input: AgentInput): Promise<AgentRun> {\n    if (this.#killed) {\n      throw sessionKilledError();\n    }\n\n    const runtimeInput = this.#activeRuntimeInput;\n    const run = this.#activeRun;\n    if (!(runtimeInput && run)) {\n      return this.send(input);\n    }\n\n    await this.#addSteeringInput(runtimeInput, input);\n    return run;\n  }\n\n  interrupt(): void {\n    this.#activeAbort?.abort();\n  }\n\n  kill(): void {\n    if (this.#killed) {\n      return;\n    }\n\n    this.#killed = true;\n    this.#activeAbort?.abort();\n    this.#closeRuntimeInput(\n      this.#activeRuntimeInput,\n      sessionKilledError().message\n    );\n\n    while (this.#inputQueue.length > 0) {\n      const item = this.#inputQueue.shift();\n      this.#closeRuntimeInput(item?.runtimeInput, sessionKilledError().message);\n      item?.run.emit({\n        type: \"turn-error\",\n        message: sessionKilledError().message,\n      });\n      item?.run.close(undefined, sessionKilledError().message);\n    }\n  }\n\n  async #ensureLoaded(): Promise<void> {\n    if (this.#loaded) {\n      return;\n    }\n\n    this.#loadPromise ??= this.#loadSessionState();\n    try {\n      await this.#loadPromise;\n    } catch (error) {\n      this.#loadPromise = undefined;\n      throw error;\n    }\n  }\n\n  async #loadSessionState(): Promise<void> {\n    if (this.#loaded) {\n      return;\n    }\n\n    await this.#replaceWithStoredSession();\n    this.#loaded = true;\n  }\n\n  async #replaceWithStoredSession(): Promise<void> {\n    const stored = await this.#persistence.store.load(this.#persistence.key);\n    this.#storeVersion = stored?.version;\n    this.#history = new ModelMessageHistory(\n      decodeStoredSessionSnapshot(stored)\n    );\n  }\n\n  async #drainInputQueue(): Promise<void> {\n    if (this.#running) {\n      return;\n    }\n\n    this.#running = true;\n    try {\n      while (!this.#killed && this.#inputQueue.length > 0) {\n        const item = this.#inputQueue.shift();\n        if (item) {\n          await this.#processQueuedInput(item);\n        }\n      }\n    } finally {\n      this.#running = false;\n    }\n  }\n\n  async #processQueuedInput({\n    input,\n    run,\n    runtimeInput,\n  }: QueuedInput): Promise<void> {\n    const activeAbort = new AbortController();\n    this.#activeAbort = activeAbort;\n    this.#activeRun = run;\n    this.#activeRuntimeInput = runtimeInput;\n    const historySnapshot = this.#history.modelSnapshot();\n\n    try {\n      await this.#withSteeringPlacement(\n        runtimeInput,\n        \"turn-start\",\n        async () => {\n          await this.#hooks?.beforeTurn?.({\n            history: this.#history.modelSnapshot(),\n            input,\n            signal: activeAbort.signal,\n          });\n        }\n      );\n      await this.#withRuntimeInputWindow(\n        runtimeInput,\n        \"turn-start\",\n        async () => {\n          await run.emitBoundary({ type: \"turn-start\" });\n        }\n      );\n      this.#history.appendUserInput(input);\n      await this.#commitHistory();\n      await this.#drainRuntimeInput(run, runtimeInput, \"turn-start\");\n\n      const result = await runAgentLoop({\n        emit: async (event) => {\n          if (event.type === \"step-start\" || event.type === \"step-end\") {\n            await this.#withRuntimeInputWindow(\n              runtimeInput,\n              event.type,\n              async () => {\n                await run.emitBoundary(event);\n              }\n            );\n            const runtimeInputAdded = await this.#drainRuntimeInput(\n              run,\n              runtimeInput,\n              event.type\n            );\n\n            if (event.type === \"step-end\") {\n              return { runtimeInputAdded };\n            }\n            return noBoundaryDecision;\n          }\n\n          run.emit(event);\n        },\n        history: this.#history,\n        hooks: this.#hooksForRuntimeInput(runtimeInput),\n        llm: this.#llm,\n        signal: activeAbort.signal,\n      });\n\n      await this.#commitHistory();\n      const terminalEvent = result === \"aborted\" ? \"turn-abort\" : \"turn-end\";\n      this.#closeRuntimeInput(runtimeInput, terminalEvent);\n      this.#activeRuntimeInput = undefined;\n      this.#activeRun = undefined;\n      await runAfterTurnHook(this.#hooks, {\n        history: this.#history.modelSnapshot(),\n        input,\n        result,\n        signal: activeAbort.signal,\n      });\n      run.emit({ type: terminalEvent });\n    } catch (error) {\n      if (error instanceof SessionCommitConflictError) {\n        run.emit({ type: \"turn-error\", message: error.message });\n        this.#closeRuntimeInput(runtimeInput, \"a session commit conflict\");\n        this.#activeAbort = undefined;\n        return;\n      }\n\n      this.#history.rollback(historySnapshot);\n      try {\n        await this.#commitHistory();\n      } catch (rollbackError) {\n        run.emit({\n          type: \"turn-error\",\n          message: `${errorMessage(error)}; history rollback persistence failed: ${errorMessage(\n            rollbackError\n          )}`,\n        });\n        this.#closeRuntimeInput(runtimeInput, \"turn-error\");\n        this.#activeAbort = undefined;\n        return;\n      }\n      run.emit({ type: \"turn-error\", message: errorMessage(error) });\n      this.#closeRuntimeInput(runtimeInput, \"turn-error\");\n    } finally {\n      this.#closeRuntimeInput(runtimeInput);\n      this.#activeAbort = undefined;\n      this.#activeRun = undefined;\n      this.#activeRuntimeInput = undefined;\n      run.close(undefined, runtimeInput.closedReason);\n    }\n  }\n\n  #addSteeringInput(\n    runtimeInput: RuntimeInputState,\n    input: AgentInput\n  ): Promise<void> {\n    const next = runtimeInput.pending.then(() => {\n      if (runtimeInput.closedReason) {\n        throw runtimeInputClosedError(runtimeInput.closedReason);\n      }\n\n      runtimeInput.queue.push({\n        input: normalizeAgentInput(input),\n        placement:\n          runtimeInput.steerPlacement ?? runtimeInput.placement ?? \"step-end\",\n      });\n    });\n    runtimeInput.pending = next.catch(() => undefined);\n    return next;\n  }\n\n  #closeRuntimeInput(\n    runtimeInput: RuntimeInputState | undefined,\n    reason = \"the run reached a terminal state\"\n  ): void {\n    if (!runtimeInput?.closedReason && runtimeInput) {\n      runtimeInput.closedReason = reason;\n      runtimeInput.placement = undefined;\n    }\n  }\n\n  async #commitHistory(): Promise<void> {\n    const result = await this.#persistence.store.commit(\n      this.#persistence.key,\n      {\n        state: encodeSessionSnapshot(this.#history.modelSnapshot()),\n        version: this.#storeVersion,\n      },\n      { expectedVersion: this.#storeVersion ?? null }\n    );\n\n    if (!result.ok) {\n      await this.#replaceWithStoredSession();\n      throw new SessionCommitConflictError(this.#persistence.key);\n    }\n\n    this.#storeVersion = result.version;\n  }\n\n  async #withRuntimeInputWindow<T>(\n    runtimeInput: RuntimeInputState,\n    placement: RuntimeInputPlacement,\n    callback: () => Promise<T>\n  ): Promise<T> {\n    const previousSteerPlacement = runtimeInput.steerPlacement;\n    runtimeInput.placement = placement;\n    runtimeInput.steerPlacement = placement;\n    try {\n      return await callback();\n    } finally {\n      runtimeInput.placement = undefined;\n      runtimeInput.steerPlacement = previousSteerPlacement;\n    }\n  }\n\n  async #withSteeringPlacement<T>(\n    runtimeInput: RuntimeInputState,\n    placement: RuntimeInputPlacement,\n    callback: () => Promise<T>\n  ): Promise<T> {\n    const previousSteerPlacement = runtimeInput.steerPlacement;\n    runtimeInput.steerPlacement = placement;\n    try {\n      return await callback();\n    } finally {\n      runtimeInput.steerPlacement = previousSteerPlacement;\n    }\n  }\n\n  #hooksForRuntimeInput(\n    runtimeInput: RuntimeInputState\n  ): AgentHooks | undefined {\n    const hooks = this.#hooks;\n    if (!hooks) {\n      return;\n    }\n\n    return {\n      ...hooks,\n      afterStep: (context) =>\n        this.#withSteeringPlacement(runtimeInput, \"step-end\", async () => {\n          await hooks.afterStep?.(context);\n        }),\n      beforeStep: (context) =>\n        this.#withSteeringPlacement(runtimeInput, \"step-start\", async () => {\n          await hooks.beforeStep?.(context);\n        }),\n    };\n  }\n\n  async #drainRuntimeInput(\n    run: BufferedAgentRun,\n    runtimeInput: RuntimeInputState,\n    placement: RuntimeInputPlacement\n  ): Promise<boolean> {\n    let added = false;\n    let next = shiftRuntimeInput(runtimeInput, placement);\n    while (next) {\n      added = true;\n      run.emit({ type: \"runtime-input\", input: next.input, placement });\n      this.#history.appendUserInput(next.input);\n      await this.#commitHistory();\n      next = shiftRuntimeInput(runtimeInput, placement);\n    }\n\n    return added;\n  }\n}\n\nfunction shiftRuntimeInput(\n  runtimeInput: RuntimeInputState,\n  placement: RuntimeInputPlacement\n): QueuedRuntimeInput | undefined {\n  const index = runtimeInput.queue.findIndex(\n    (input) => input.placement === placement\n  );\n  if (index === -1) {\n    return;\n  }\n\n  return runtimeInput.queue.splice(index, 1)[0];\n}\n\nasync function runAfterTurnHook(\n  hooks: AgentHooks | undefined,\n  context: Parameters<NonNullable<AgentHooks[\"afterTurn\"]>>[0]\n): Promise<void> {\n  const hook = hooks?.afterTurn;\n  if (!hook) {\n    return;\n  }\n\n  await Promise.allSettled([Promise.resolve().then(() => hook(context))]);\n}\n\nexport function normalizeAgentInput(input: AgentInput): UserInput {\n  if (typeof input === \"string\") {\n    return {\n      type: \"user-text\",\n      text: input,\n    };\n  }\n\n  if (isStringArrayInput(input)) {\n    return {\n      type: \"user-text\",\n      text: structuredClone(input) as readonly string[],\n    };\n  }\n\n  if (isArrayInput(input)) {\n    assertUserMessageContent(input);\n    return {\n      type: \"user-message\",\n      content: structuredClone(input) as readonly UserMessageContentPart[],\n    };\n  }\n\n  if (isUserMessage(input)) {\n    assertUserMessageContent(input.content);\n  }\n\n  return structuredClone(input);\n}\n\nfunction isStringArrayInput(input: AgentInput): input is readonly string[] {\n  return isArrayInput(input) && input.every((part) => typeof part === \"string\");\n}\n\nfunction isArrayInput(\n  input: AgentInput\n): input is readonly string[] | readonly UserMessageContentPart[] {\n  return Array.isArray(input);\n}\n\nfunction isUserMessage(input: UserInput): input is UserMessage {\n  return input.type === \"user-message\";\n}\n\nfunction assertUserMessageContent(\n  input: readonly unknown[]\n): asserts input is readonly UserMessageContentPart[] {\n  for (const part of input) {\n    if (!isUserMessageContentPart(part)) {\n      throw new TypeError(\n        'Agent input content parts must be { type: \"text\", text }, { type: \"image\", image }, or { type: \"file\", data, mediaType }.'\n      );\n    }\n  }\n}\n\nfunction isUserMessageContentPart(\n  part: unknown\n): part is UserMessageContentPart {\n  if (part === null || typeof part !== \"object\" || !(\"type\" in part)) {\n    return false;\n  }\n\n  if (part.type === \"text\") {\n    return \"text\" in part && typeof part.text === \"string\";\n  }\n\n  if (part.type === \"image\") {\n    return (\n      \"image\" in part &&\n      typeof part.image === \"string\" &&\n      (!(\"mediaType\" in part) || typeof part.mediaType === \"string\")\n    );\n  }\n\n  if (part.type === \"file\") {\n    return (\n      \"data\" in part &&\n      isUserMessageFileData(part.data) &&\n      \"mediaType\" in part &&\n      typeof part.mediaType === \"string\" &&\n      (!(\"filename\" in part) || typeof part.filename === \"string\")\n    );\n  }\n\n  return false;\n}\n\nfunction isUserMessageFileData(data: unknown): boolean {\n  if (typeof data === \"string\") {\n    return true;\n  }\n\n  if (data === null || typeof data !== \"object\" || !(\"type\" in data)) {\n    return false;\n  }\n\n  if (data.type === \"data\") {\n    return \"data\" in data && typeof data.data === \"string\";\n  }\n\n  if (data.type === \"reference\") {\n    return (\n      \"reference\" in data &&\n      data.reference !== null &&\n      typeof data.reference === \"object\" &&\n      Object.values(data.reference).every((value) => typeof value === \"string\")\n    );\n  }\n\n  if (data.type === \"text\") {\n    return \"text\" in data && typeof data.text === \"string\";\n  }\n\n  if (data.type === \"url\") {\n    return \"url\" in data && typeof data.url === \"string\";\n  }\n\n  return false;\n}\n\nfunction errorMessage(error: unknown): string {\n  if (error instanceof Error) {\n    return error.message;\n  }\n\n  return String(error);\n}\n\nfunction sessionKilledError(): Error {\n  return new Error(\"Session killed\");\n}\n\nfunction runtimeInputClosedError(reason: string): Error {\n  return new Error(`session.steer() cannot be used after ${reason}`);\n}\n\nclass SessionCommitConflictError extends Error {\n  constructor(key: string) {\n    super(`Session ${JSON.stringify(key)} commit conflict`);\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.js","names":["#hooks","#inputQueue","#llm","#persistence","#killed","#ensureLoaded","#drainInputQueue","#activeRuntimeInput","#activeRun","#addSteeringInput","#activeAbort","#closeRuntimeInput","#runToCloseOnKill","#loaded","#loadPromise","#loadSessionState","#replaceWithStoredSession","#storeVersion","#history","#running","#processQueuedInput","#withSteeringPlacement","#withRuntimeInputWindow","#commitHistory","#drainRuntimeInput","#hooksForRuntimeInput"],"sources":["../../src/session/session.ts"],"sourcesContent":["import { runAgentLoop } from \"../agent-loop\";\nimport type { AgentHooks } from \"../hooks\";\nimport type { Llm } from \"../llm\";\nimport type {\n  RuntimeInput,\n  UserMessage,\n  UserMessageContentPart,\n} from \"./events\";\nimport { ModelMessageHistory } from \"./history\";\nimport type { AgentInput, UserInput } from \"./input\";\nimport type { AgentRun } from \"./run\";\nimport { BufferedAgentRun } from \"./run\";\nimport { decodeStoredSessionSnapshot, encodeSessionSnapshot } from \"./snapshot\";\nimport type { SessionStore } from \"./store/types\";\n\nexport type { AgentInput, SessionInput, UserInput } from \"./input\";\nexport type { AgentRun } from \"./run\";\n\ninterface SessionPersistenceOptions {\n  readonly key: string;\n  readonly store: SessionStore;\n}\n\ninterface QueuedInput {\n  readonly input: UserInput;\n  readonly run: BufferedAgentRun;\n  readonly runtimeInput: RuntimeInputState;\n}\n\ntype RuntimeInputPlacement = RuntimeInput[\"placement\"];\nconst noBoundaryDecision = undefined;\n\ninterface QueuedRuntimeInput {\n  readonly input: UserInput;\n  readonly placement: RuntimeInputPlacement;\n}\n\ninterface RuntimeInputState {\n  closedReason?: string;\n  pending: Promise<void>;\n  placement?: RuntimeInputPlacement;\n  readonly queue: QueuedRuntimeInput[];\n  steerPlacement?: RuntimeInputPlacement;\n}\n\nexport class AgentSession {\n  readonly #hooks?: AgentHooks;\n  readonly #inputQueue: QueuedInput[] = [];\n  readonly #llm: Llm;\n  readonly #persistence: SessionPersistenceOptions;\n  #activeAbort?: AbortController;\n  #activeRun?: BufferedAgentRun;\n  #activeRuntimeInput?: RuntimeInputState;\n  #history = new ModelMessageHistory();\n  #killed = false;\n  #loadPromise?: Promise<void>;\n  #loaded = false;\n  #running = false;\n  #runToCloseOnKill?: BufferedAgentRun;\n  #storeVersion: string | undefined;\n\n  constructor(\n    llm: Llm,\n    persistence: SessionPersistenceOptions,\n    hooks?: AgentHooks\n  ) {\n    this.#hooks = hooks;\n    this.#llm = llm;\n    this.#persistence = persistence;\n  }\n\n  async send(input: AgentInput): Promise<AgentRun> {\n    if (this.#killed) {\n      throw sessionKilledError();\n    }\n\n    await this.#ensureLoaded();\n\n    if (this.#killed) {\n      throw sessionKilledError();\n    }\n\n    const runtimeInput: RuntimeInputState = {\n      pending: Promise.resolve(),\n      queue: [],\n    };\n    const acceptedInput = normalizeAgentInput(input);\n    const run = new BufferedAgentRun();\n    run.emit(acceptedInput);\n    this.#inputQueue.push({\n      input: structuredClone(acceptedInput),\n      run,\n      runtimeInput,\n    });\n    this.#drainInputQueue().catch((error: unknown) => {\n      run.emit({ type: \"turn-error\", message: errorMessage(error) });\n      run.close();\n    });\n    return run;\n  }\n\n  async steer(input: AgentInput): Promise<AgentRun> {\n    if (this.#killed) {\n      throw sessionKilledError();\n    }\n\n    const runtimeInput = this.#activeRuntimeInput;\n    const run = this.#activeRun;\n    if (!(runtimeInput && run)) {\n      return this.send(input);\n    }\n\n    await this.#addSteeringInput(runtimeInput, input);\n    return run;\n  }\n\n  interrupt(): void {\n    this.#activeAbort?.abort();\n  }\n\n  kill(): void {\n    if (this.#killed) {\n      return;\n    }\n\n    this.#killed = true;\n    const killedError = sessionKilledError();\n    this.#activeAbort?.abort();\n    this.#closeRuntimeInput(this.#activeRuntimeInput, killedError.message);\n    const runToClose = this.#runToCloseOnKill ?? this.#activeRun;\n    runToClose?.emit({\n      type: \"turn-error\",\n      message: killedError.message,\n    });\n    runToClose?.close(undefined, killedError.message);\n\n    while (this.#inputQueue.length > 0) {\n      const item = this.#inputQueue.shift();\n      this.#closeRuntimeInput(item?.runtimeInput, killedError.message);\n      item?.run.emit({\n        type: \"turn-error\",\n        message: killedError.message,\n      });\n      item?.run.close(undefined, killedError.message);\n    }\n  }\n\n  async #ensureLoaded(): Promise<void> {\n    if (this.#loaded) {\n      return;\n    }\n\n    this.#loadPromise ??= this.#loadSessionState();\n    try {\n      await this.#loadPromise;\n    } catch (error) {\n      this.#loadPromise = undefined;\n      throw error;\n    }\n  }\n\n  async #loadSessionState(): Promise<void> {\n    if (this.#loaded) {\n      return;\n    }\n\n    await this.#replaceWithStoredSession();\n    this.#loaded = true;\n  }\n\n  async #replaceWithStoredSession(): Promise<void> {\n    const stored = await this.#persistence.store.load(this.#persistence.key);\n    this.#storeVersion = stored?.version;\n    this.#history = new ModelMessageHistory(\n      decodeStoredSessionSnapshot(stored)\n    );\n  }\n\n  async #drainInputQueue(): Promise<void> {\n    if (this.#running) {\n      return;\n    }\n\n    this.#running = true;\n    try {\n      while (!this.#killed && this.#inputQueue.length > 0) {\n        const item = this.#inputQueue.shift();\n        if (item) {\n          await this.#processQueuedInput(item);\n        }\n      }\n    } finally {\n      this.#running = false;\n    }\n  }\n\n  async #processQueuedInput({\n    input,\n    run,\n    runtimeInput,\n  }: QueuedInput): Promise<void> {\n    const activeAbort = new AbortController();\n    this.#activeAbort = activeAbort;\n    this.#activeRun = run;\n    this.#activeRuntimeInput = runtimeInput;\n    this.#runToCloseOnKill = run;\n    const historySnapshot = this.#history.modelSnapshot();\n\n    try {\n      await this.#withSteeringPlacement(\n        runtimeInput,\n        \"turn-start\",\n        async () => {\n          await this.#hooks?.beforeTurn?.({\n            history: this.#history.modelSnapshot(),\n            input,\n            signal: activeAbort.signal,\n          });\n        }\n      );\n      await this.#withRuntimeInputWindow(\n        runtimeInput,\n        \"turn-start\",\n        async () => {\n          await run.emitBoundary({ type: \"turn-start\" });\n        }\n      );\n      this.#history.appendUserInput(input);\n      await this.#commitHistory();\n      await this.#drainRuntimeInput(run, runtimeInput, \"turn-start\");\n\n      const result = await runAgentLoop({\n        emit: async (event) => {\n          if (event.type === \"step-start\" || event.type === \"step-end\") {\n            await this.#withRuntimeInputWindow(\n              runtimeInput,\n              event.type,\n              async () => {\n                await run.emitBoundary(event);\n              }\n            );\n            const runtimeInputAdded = await this.#drainRuntimeInput(\n              run,\n              runtimeInput,\n              event.type\n            );\n\n            if (event.type === \"step-end\") {\n              return { runtimeInputAdded };\n            }\n            return noBoundaryDecision;\n          }\n\n          run.emit(event);\n        },\n        history: this.#history,\n        hooks: this.#hooksForRuntimeInput(runtimeInput),\n        llm: this.#llm,\n        signal: activeAbort.signal,\n      });\n\n      await this.#commitHistory();\n      const terminalEvent = result === \"aborted\" ? \"turn-abort\" : \"turn-end\";\n      this.#closeRuntimeInput(runtimeInput, terminalEvent);\n      this.#activeRuntimeInput = undefined;\n      this.#activeRun = undefined;\n      await runAfterTurnHook(this.#hooks, {\n        history: this.#history.modelSnapshot(),\n        input,\n        result,\n        signal: activeAbort.signal,\n      });\n      run.emit({ type: terminalEvent });\n    } catch (error) {\n      if (error instanceof SessionCommitConflictError) {\n        run.emit({ type: \"turn-error\", message: error.message });\n        this.#closeRuntimeInput(runtimeInput, \"a session commit conflict\");\n        this.#activeAbort = undefined;\n        return;\n      }\n\n      this.#history.rollback(historySnapshot);\n      try {\n        await this.#commitHistory();\n      } catch (rollbackError) {\n        run.emit({\n          type: \"turn-error\",\n          message: `${errorMessage(error)}; history rollback persistence failed: ${errorMessage(\n            rollbackError\n          )}`,\n        });\n        this.#closeRuntimeInput(runtimeInput, \"turn-error\");\n        this.#activeAbort = undefined;\n        return;\n      }\n      run.emit({ type: \"turn-error\", message: errorMessage(error) });\n      this.#closeRuntimeInput(runtimeInput, \"turn-error\");\n    } finally {\n      this.#closeRuntimeInput(runtimeInput);\n      this.#activeAbort = undefined;\n      this.#activeRun = undefined;\n      this.#activeRuntimeInput = undefined;\n      this.#runToCloseOnKill = undefined;\n      run.close(undefined, runtimeInput.closedReason);\n    }\n  }\n\n  #addSteeringInput(\n    runtimeInput: RuntimeInputState,\n    input: AgentInput\n  ): Promise<void> {\n    const next = runtimeInput.pending.then(() => {\n      if (runtimeInput.closedReason) {\n        throw runtimeInputClosedError(runtimeInput.closedReason);\n      }\n\n      runtimeInput.queue.push({\n        input: normalizeAgentInput(input),\n        placement:\n          runtimeInput.steerPlacement ?? runtimeInput.placement ?? \"step-end\",\n      });\n    });\n    runtimeInput.pending = next.catch(() => undefined);\n    return next;\n  }\n\n  #closeRuntimeInput(\n    runtimeInput: RuntimeInputState | undefined,\n    reason = \"the run reached a terminal state\"\n  ): void {\n    if (!runtimeInput?.closedReason && runtimeInput) {\n      runtimeInput.closedReason = reason;\n      runtimeInput.placement = undefined;\n    }\n  }\n\n  async #commitHistory(): Promise<void> {\n    const result = await this.#persistence.store.commit(\n      this.#persistence.key,\n      {\n        state: encodeSessionSnapshot(this.#history.modelSnapshot()),\n      },\n      { expectedVersion: this.#storeVersion ?? null }\n    );\n\n    if (!result.ok) {\n      await this.#replaceWithStoredSession();\n      throw new SessionCommitConflictError(this.#persistence.key);\n    }\n\n    this.#storeVersion = result.version;\n  }\n\n  async #withRuntimeInputWindow<T>(\n    runtimeInput: RuntimeInputState,\n    placement: RuntimeInputPlacement,\n    callback: () => Promise<T>\n  ): Promise<T> {\n    const previousSteerPlacement = runtimeInput.steerPlacement;\n    runtimeInput.placement = placement;\n    runtimeInput.steerPlacement = placement;\n    try {\n      return await callback();\n    } finally {\n      runtimeInput.placement = undefined;\n      runtimeInput.steerPlacement = previousSteerPlacement;\n    }\n  }\n\n  async #withSteeringPlacement<T>(\n    runtimeInput: RuntimeInputState,\n    placement: RuntimeInputPlacement,\n    callback: () => Promise<T>\n  ): Promise<T> {\n    const previousSteerPlacement = runtimeInput.steerPlacement;\n    runtimeInput.steerPlacement = placement;\n    try {\n      return await callback();\n    } finally {\n      runtimeInput.steerPlacement = previousSteerPlacement;\n    }\n  }\n\n  #hooksForRuntimeInput(\n    runtimeInput: RuntimeInputState\n  ): AgentHooks | undefined {\n    const hooks = this.#hooks;\n    if (!hooks) {\n      return;\n    }\n\n    return {\n      ...hooks,\n      afterStep: (context) =>\n        this.#withSteeringPlacement(runtimeInput, \"step-end\", async () => {\n          await hooks.afterStep?.(context);\n        }),\n      beforeStep: (context) =>\n        this.#withSteeringPlacement(runtimeInput, \"step-start\", async () => {\n          await hooks.beforeStep?.(context);\n        }),\n    };\n  }\n\n  async #drainRuntimeInput(\n    run: BufferedAgentRun,\n    runtimeInput: RuntimeInputState,\n    placement: RuntimeInputPlacement\n  ): Promise<boolean> {\n    let added = false;\n    let next = shiftRuntimeInput(runtimeInput, placement);\n    while (next) {\n      added = true;\n      run.emit({ type: \"runtime-input\", input: next.input, placement });\n      this.#history.appendUserInput(next.input);\n      await this.#commitHistory();\n      next = shiftRuntimeInput(runtimeInput, placement);\n    }\n\n    return added;\n  }\n}\n\nfunction shiftRuntimeInput(\n  runtimeInput: RuntimeInputState,\n  placement: RuntimeInputPlacement\n): QueuedRuntimeInput | undefined {\n  const index = runtimeInput.queue.findIndex(\n    (input) => input.placement === placement\n  );\n  if (index === -1) {\n    return;\n  }\n\n  return runtimeInput.queue.splice(index, 1)[0];\n}\n\nasync function runAfterTurnHook(\n  hooks: AgentHooks | undefined,\n  context: Parameters<NonNullable<AgentHooks[\"afterTurn\"]>>[0]\n): Promise<void> {\n  const hook = hooks?.afterTurn;\n  if (!hook) {\n    return;\n  }\n\n  await Promise.allSettled([Promise.resolve().then(() => hook(context))]);\n}\n\nexport function normalizeAgentInput(input: AgentInput): UserInput {\n  if (typeof input === \"string\") {\n    return {\n      type: \"user-text\",\n      text: input,\n    };\n  }\n\n  if (isStringArrayInput(input)) {\n    return {\n      type: \"user-text\",\n      text: structuredClone(input) as readonly string[],\n    };\n  }\n\n  if (isArrayInput(input)) {\n    assertUserMessageContent(input);\n    return {\n      type: \"user-message\",\n      content: structuredClone(input) as readonly UserMessageContentPart[],\n    };\n  }\n\n  if (isUserMessage(input)) {\n    assertUserMessageContent(input.content);\n  }\n\n  return structuredClone(input);\n}\n\nfunction isStringArrayInput(input: AgentInput): input is readonly string[] {\n  return isArrayInput(input) && input.every((part) => typeof part === \"string\");\n}\n\nfunction isArrayInput(\n  input: AgentInput\n): input is readonly string[] | readonly UserMessageContentPart[] {\n  return Array.isArray(input);\n}\n\nfunction isUserMessage(input: UserInput): input is UserMessage {\n  return input.type === \"user-message\";\n}\n\nfunction assertUserMessageContent(\n  input: readonly unknown[]\n): asserts input is readonly UserMessageContentPart[] {\n  for (const part of input) {\n    if (!isUserMessageContentPart(part)) {\n      throw new TypeError(\n        'Agent input content parts must be { type: \"text\", text }, { type: \"image\", image }, or { type: \"file\", data, mediaType }.'\n      );\n    }\n  }\n}\n\nfunction isUserMessageContentPart(\n  part: unknown\n): part is UserMessageContentPart {\n  if (part === null || typeof part !== \"object\" || !(\"type\" in part)) {\n    return false;\n  }\n\n  if (part.type === \"text\") {\n    return \"text\" in part && typeof part.text === \"string\";\n  }\n\n  if (part.type === \"image\") {\n    return (\n      \"image\" in part &&\n      typeof part.image === \"string\" &&\n      (!(\"mediaType\" in part) || typeof part.mediaType === \"string\")\n    );\n  }\n\n  if (part.type === \"file\") {\n    return (\n      \"data\" in part &&\n      isUserMessageFileData(part.data) &&\n      \"mediaType\" in part &&\n      typeof part.mediaType === \"string\" &&\n      (!(\"filename\" in part) || typeof part.filename === \"string\")\n    );\n  }\n\n  return false;\n}\n\nfunction isUserMessageFileData(data: unknown): boolean {\n  if (typeof data === \"string\") {\n    return true;\n  }\n\n  if (data === null || typeof data !== \"object\" || !(\"type\" in data)) {\n    return false;\n  }\n\n  if (data.type === \"data\") {\n    return \"data\" in data && typeof data.data === \"string\";\n  }\n\n  if (data.type === \"reference\") {\n    return (\n      \"reference\" in data &&\n      data.reference !== null &&\n      typeof data.reference === \"object\" &&\n      Object.values(data.reference).every((value) => typeof value === \"string\")\n    );\n  }\n\n  if (data.type === \"text\") {\n    return \"text\" in data && typeof data.text === \"string\";\n  }\n\n  if (data.type === \"url\") {\n    return \"url\" in data && typeof data.url === \"string\";\n  }\n\n  return false;\n}\n\nfunction errorMessage(error: unknown): string {\n  if (error instanceof Error) {\n    return error.message;\n  }\n\n  return String(error);\n}\n\nfunction sessionKilledError(): Error {\n  return new Error(\"Session killed\");\n}\n\nfunction runtimeInputClosedError(reason: string): Error {\n  return new Error(`session.steer() cannot be used after ${reason}`);\n}\n\nclass SessionCommitConflictError extends Error {\n  constructor(key: string) {\n    super(`Session ${JSON.stringify(key)} commit conflict`);\n  }\n}\n"],"mappings":"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"}

package/dist/session/store/file.d.ts

@@ -1,12 +1,12 @@
-import { CommitResult, SessionStore, StoredSession } from "./types.js";
+import { CommitResult, SessionStore, SessionStoreCommit, StoredSession } from "./types.js";
 
 //#region src/session/store/file.d.ts
 declare class FileSessionStore implements SessionStore {
   #private;
   constructor(directory: string);
   load(key: string): Promise<StoredSession | null>;
-  commit(key: string, next: StoredSession, options?: {
-    expectedVersion?: string | null;
+  commit(key: string, next: SessionStoreCommit, options: {
+    expectedVersion: string | null;
   }): Promise<CommitResult>;
 }
 //#endregion

package/dist/session/store/file.js

@@ -29,7 +29,7 @@ var FileSessionStore = class {
 		try {
 			const current = await this.load(key);
 			const currentVersion = current?.version ?? null;
-			if (options?.expectedVersion !== void 0 && options.expectedVersion !== currentVersion) return {
+			if (options.expectedVersion !== currentVersion) return {
 				ok: false,
 				reason: "conflict"
 			};

package/dist/session/store/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","names":["#directory","#fileForKey"],"sources":["../../../src/session/store/file.ts"],"sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport { mkdir, readFile, rename, rm, stat, writeFile } from \"node:fs/promises\";\nimport { dirname, join } from \"node:path\";\nimport { setTimeout } from \"node:timers/promises\";\nimport type { CommitResult, SessionStore, StoredSession } from \"./types\";\n\nconst LOCK_POLL_INTERVAL_MS = 10;\nconst LOCK_STALE_AFTER_MS = 30_000;\nconst LOCK_TIMEOUT_MS = 5000;\n\nexport class FileSessionStore implements SessionStore {\n  readonly #directory: string;\n\n  constructor(directory: string) {\n    this.#directory = directory;\n  }\n\n  async load(key: string): Promise<StoredSession | null> {\n    const file = this.#fileForKey(key);\n\n    try {\n      const parsed = JSON.parse(await readFile(file, \"utf8\")) as unknown;\n      return parseStoredFileSession(parsed, file);\n    } catch (error) {\n      if (isNodeError(error) && error.code === \"ENOENT\") {\n        return null;\n      }\n      if (error instanceof SyntaxError) {\n        throw new Error(\n          `Invalid FileSessionStore file ${JSON.stringify(\n            file\n          )}: invalid JSON (${error.message})`\n        );\n      }\n      throw error;\n    }\n  }\n\n  async commit(\n    key: string,\n    next: StoredSession,\n    options?: { expectedVersion?: string | null }\n  ): Promise<CommitResult> {\n    const file = this.#fileForKey(key);\n    const lockDirectory = `${file}.lock`;\n    await mkdir(dirname(file), { recursive: true });\n    await acquireFileLock(lockDirectory);\n    try {\n      const current = await this.load(key);\n      const currentVersion = current?.version ?? null;\n\n      if (\n        options?.expectedVersion !== undefined &&\n        options.expectedVersion !== currentVersion\n      ) {\n        return { ok: false, reason: \"conflict\" };\n      }\n\n      const version = String((Number(current?.version ?? \"0\") || 0) + 1);\n      const payload: StoredSession = structuredClone({\n        state: next.state,\n        version,\n      });\n      const tempFile = `${file}.${process.pid}.${randomUUID()}.tmp`;\n\n      try {\n        await writeFile(\n          tempFile,\n          `${JSON.stringify(payload, null, 2)}\\n`,\n          \"utf8\"\n        );\n        await rename(tempFile, file);\n      } catch (error) {\n        await rm(tempFile, { force: true }).catch(() => undefined);\n        throw error;\n      }\n\n      return { ok: true, version };\n    } finally {\n      await rm(lockDirectory, { force: true, recursive: true });\n    }\n  }\n\n  #fileForKey(key: string): string {\n    return join(\n      this.#directory,\n      `${Buffer.from(key).toString(\"base64url\")}.json`\n    );\n  }\n}\n\nfunction parseStoredFileSession(value: unknown, file: string): StoredSession {\n  if (value === null || typeof value !== \"object\") {\n    throw new Error(\n      `Invalid FileSessionStore file ${JSON.stringify(\n        file\n      )}: expected an object`\n    );\n  }\n\n  const candidate = value as Partial<StoredSession>;\n  if (typeof candidate.version !== \"string\" || !(\"state\" in candidate)) {\n    throw new Error(\n      `Invalid FileSessionStore file ${JSON.stringify(\n        file\n      )}: expected state and string version`\n    );\n  }\n\n  return structuredClone({\n    state: candidate.state,\n    version: candidate.version,\n  });\n}\n\nfunction isNodeError(error: unknown): error is NodeJS.ErrnoException {\n  return error instanceof Error && \"code\" in error;\n}\n\nasync function acquireFileLock(lockDirectory: string): Promise<void> {\n  const startedAt = Date.now();\n  while (Date.now() - startedAt < LOCK_TIMEOUT_MS) {\n    try {\n      await mkdir(lockDirectory);\n      return;\n    } catch (error) {\n      if (!(isNodeError(error) && error.code === \"EEXIST\")) {\n        throw error;\n      }\n      await removeStaleLock(lockDirectory);\n    }\n\n    await setTimeout(LOCK_POLL_INTERVAL_MS);\n  }\n\n  throw new Error(\n    `Timed out waiting for FileSessionStore lock ${JSON.stringify(\n      lockDirectory\n    )}`\n  );\n}\n\nasync function removeStaleLock(lockDirectory: string): Promise<void> {\n  try {\n    const stats = await stat(lockDirectory);\n    if (Date.now() - stats.mtimeMs < LOCK_STALE_AFTER_MS) {\n      return;\n    }\n    await rm(lockDirectory, { force: true, recursive: true });\n  } catch (error) {\n    if (isNodeError(error) && error.code === \"ENOENT\") {\n      return;\n    }\n    throw error;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"file.js","names":["#directory","#fileForKey"],"sources":["../../../src/session/store/file.ts"],"sourcesContent":["import { randomUUID } from \"node:crypto\";\nimport { mkdir, readFile, rename, rm, stat, writeFile } from \"node:fs/promises\";\nimport { dirname, join } from \"node:path\";\nimport { setTimeout } from \"node:timers/promises\";\nimport type {\n  CommitResult,\n  SessionStore,\n  SessionStoreCommit,\n  StoredSession,\n} from \"./types\";\n\nconst LOCK_POLL_INTERVAL_MS = 10;\nconst LOCK_STALE_AFTER_MS = 30_000;\nconst LOCK_TIMEOUT_MS = 5000;\n\nexport class FileSessionStore implements SessionStore {\n  readonly #directory: string;\n\n  constructor(directory: string) {\n    this.#directory = directory;\n  }\n\n  async load(key: string): Promise<StoredSession | null> {\n    const file = this.#fileForKey(key);\n\n    try {\n      const parsed = JSON.parse(await readFile(file, \"utf8\")) as unknown;\n      return parseStoredFileSession(parsed, file);\n    } catch (error) {\n      if (isNodeError(error) && error.code === \"ENOENT\") {\n        return null;\n      }\n      if (error instanceof SyntaxError) {\n        throw new Error(\n          `Invalid FileSessionStore file ${JSON.stringify(\n            file\n          )}: invalid JSON (${error.message})`\n        );\n      }\n      throw error;\n    }\n  }\n\n  async commit(\n    key: string,\n    next: SessionStoreCommit,\n    options: { expectedVersion: string | null }\n  ): Promise<CommitResult> {\n    const file = this.#fileForKey(key);\n    const lockDirectory = `${file}.lock`;\n    await mkdir(dirname(file), { recursive: true });\n    await acquireFileLock(lockDirectory);\n    try {\n      const current = await this.load(key);\n      const currentVersion = current?.version ?? null;\n\n      if (options.expectedVersion !== currentVersion) {\n        return { ok: false, reason: \"conflict\" };\n      }\n\n      const version = String((Number(current?.version ?? \"0\") || 0) + 1);\n      const payload: StoredSession = structuredClone({\n        state: next.state,\n        version,\n      });\n      const tempFile = `${file}.${process.pid}.${randomUUID()}.tmp`;\n\n      try {\n        await writeFile(\n          tempFile,\n          `${JSON.stringify(payload, null, 2)}\\n`,\n          \"utf8\"\n        );\n        await rename(tempFile, file);\n      } catch (error) {\n        await rm(tempFile, { force: true }).catch(() => undefined);\n        throw error;\n      }\n\n      return { ok: true, version };\n    } finally {\n      await rm(lockDirectory, { force: true, recursive: true });\n    }\n  }\n\n  #fileForKey(key: string): string {\n    return join(\n      this.#directory,\n      `${Buffer.from(key).toString(\"base64url\")}.json`\n    );\n  }\n}\n\nfunction parseStoredFileSession(value: unknown, file: string): StoredSession {\n  if (value === null || typeof value !== \"object\") {\n    throw new Error(\n      `Invalid FileSessionStore file ${JSON.stringify(\n        file\n      )}: expected an object`\n    );\n  }\n\n  const candidate = value as Partial<StoredSession>;\n  if (typeof candidate.version !== \"string\" || !(\"state\" in candidate)) {\n    throw new Error(\n      `Invalid FileSessionStore file ${JSON.stringify(\n        file\n      )}: expected state and string version`\n    );\n  }\n\n  return structuredClone({\n    state: candidate.state,\n    version: candidate.version,\n  });\n}\n\nfunction isNodeError(error: unknown): error is NodeJS.ErrnoException {\n  return error instanceof Error && \"code\" in error;\n}\n\nasync function acquireFileLock(lockDirectory: string): Promise<void> {\n  const startedAt = Date.now();\n  while (Date.now() - startedAt < LOCK_TIMEOUT_MS) {\n    try {\n      await mkdir(lockDirectory);\n      return;\n    } catch (error) {\n      if (!(isNodeError(error) && error.code === \"EEXIST\")) {\n        throw error;\n      }\n      await removeStaleLock(lockDirectory);\n    }\n\n    await setTimeout(LOCK_POLL_INTERVAL_MS);\n  }\n\n  throw new Error(\n    `Timed out waiting for FileSessionStore lock ${JSON.stringify(\n      lockDirectory\n    )}`\n  );\n}\n\nasync function removeStaleLock(lockDirectory: string): Promise<void> {\n  try {\n    const stats = await stat(lockDirectory);\n    if (Date.now() - stats.mtimeMs < LOCK_STALE_AFTER_MS) {\n      return;\n    }\n    await rm(lockDirectory, { force: true, recursive: true });\n  } catch (error) {\n    if (isNodeError(error) && error.code === \"ENOENT\") {\n      return;\n    }\n    throw error;\n  }\n}\n"],"mappings":"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"}

package/dist/session/store/memory.d.ts

@@ -1,11 +1,11 @@
-import { CommitResult, SessionStore, StoredSession } from "./types.js";
+import { CommitResult, SessionStore, SessionStoreCommit, StoredSession } from "./types.js";
 
 //#region src/session/store/memory.d.ts
 declare class MemorySessionStore implements SessionStore {
   #private;
   load(key: string): Promise<StoredSession | null>;
-  commit(key: string, next: StoredSession, options?: {
-    expectedVersion?: string | null;
+  commit(key: string, next: SessionStoreCommit, options: {
+    expectedVersion: string | null;
   }): Promise<CommitResult>;
 }
 //#endregion

package/dist/session/store/memory.js

@@ -8,7 +8,7 @@ var MemorySessionStore = class {
 	}
 	commit(key, next, options) {
 		const currentVersion = this.#sessions.get(key)?.version ?? null;
-		if (options?.expectedVersion !== void 0 && options.expectedVersion !== currentVersion) return Promise.resolve({
+		if (options.expectedVersion !== currentVersion) return Promise.resolve({
 			ok: false,
 			reason: "conflict"
 		});
@@ -16,7 +16,7 @@ var MemorySessionStore = class {
 		const version = String(versionNumber);
 		this.#versions.set(key, versionNumber);
 		this.#sessions.set(key, structuredClone({
-			...next,
+			state: next.state,
 			version
 		}));
 		return Promise.resolve({

package/dist/session/store/memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory.js","names":["#sessions","#versions"],"sources":["../../../src/session/store/memory.ts"],"sourcesContent":["import type { CommitResult, SessionStore, StoredSession } from \"./types\";\n\nexport class MemorySessionStore implements SessionStore {\n  readonly #sessions = new Map<string, StoredSession>();\n  readonly #versions = new Map<string, number>();\n\n  load(key: string): Promise<StoredSession | null> {\n    const stored = this.#sessions.get(key);\n    return Promise.resolve(stored ? structuredClone(stored) : null);\n  }\n\n  commit(\n    key: string,\n    next: StoredSession,\n    options?: { expectedVersion?: string | null }\n  ): Promise<CommitResult> {\n    const current = this.#sessions.get(key);\n    const currentVersion = current?.version ?? null;\n\n    if (\n      options?.expectedVersion !== undefined &&\n      options.expectedVersion !== currentVersion\n    ) {\n      return Promise.resolve({ ok: false, reason: \"conflict\" });\n    }\n\n    const versionNumber = (this.#versions.get(key) ?? 0) + 1;\n    const version = String(versionNumber);\n    this.#versions.set(key, versionNumber);\n    this.#sessions.set(key, structuredClone({ ...next, version }));\n    return Promise.resolve({ ok: true, version });\n  }\n}\n"],"mappings":";AAEA,IAAa,qBAAb,MAAwD;CACtD,4BAAqB,IAAI,IAA2B;CACpD,4BAAqB,IAAI,IAAoB;CAE7C,KAAK,KAA4C;EAC/C,MAAM,SAAS,KAAKA,UAAU,IAAI,GAAG;EACrC,OAAO,QAAQ,QAAQ,SAAS,gBAAgB,MAAM,IAAI,IAAI;CAChE;CAEA,OACE,KACA,MACA,SACuB;EAEvB,MAAM,iBADU,KAAKA,UAAU,IAAI,GACN,GAAG,WAAW;EAE3C,IACE,SAAS,oBAAoB,KAAA,KAC7B,QAAQ,oBAAoB,gBAE5B,OAAO,QAAQ,QAAQ;GAAE,IAAI;GAAO,QAAQ;EAAW,CAAC;EAG1D,MAAM,iBAAiB,KAAKC,UAAU,IAAI,GAAG,KAAK,KAAK;EACvD,MAAM,UAAU,OAAO,aAAa;EACpC,KAAKA,UAAU,IAAI,KAAK,aAAa;EACrC,KAAKD,UAAU,IAAI,KAAK,gBAAgB;GAAE,GAAG;GAAM;EAAQ,CAAC,CAAC;EAC7D,OAAO,QAAQ,QAAQ;GAAE,IAAI;GAAM;EAAQ,CAAC;CAC9C;AACF"}
+{"version":3,"file":"memory.js","names":["#sessions","#versions"],"sources":["../../../src/session/store/memory.ts"],"sourcesContent":["import type {\n  CommitResult,\n  SessionStore,\n  SessionStoreCommit,\n  StoredSession,\n} from \"./types\";\n\nexport class MemorySessionStore implements SessionStore {\n  readonly #sessions = new Map<string, StoredSession>();\n  readonly #versions = new Map<string, number>();\n\n  load(key: string): Promise<StoredSession | null> {\n    const stored = this.#sessions.get(key);\n    return Promise.resolve(stored ? structuredClone(stored) : null);\n  }\n\n  commit(\n    key: string,\n    next: SessionStoreCommit,\n    options: { expectedVersion: string | null }\n  ): Promise<CommitResult> {\n    const current = this.#sessions.get(key);\n    const currentVersion = current?.version ?? null;\n\n    if (options.expectedVersion !== currentVersion) {\n      return Promise.resolve({ ok: false, reason: \"conflict\" });\n    }\n\n    const versionNumber = (this.#versions.get(key) ?? 0) + 1;\n    const version = String(versionNumber);\n    this.#versions.set(key, versionNumber);\n    this.#sessions.set(key, structuredClone({ state: next.state, version }));\n    return Promise.resolve({ ok: true, version });\n  }\n}\n"],"mappings":";AAOA,IAAa,qBAAb,MAAwD;CACtD,4BAAqB,IAAI,IAA2B;CACpD,4BAAqB,IAAI,IAAoB;CAE7C,KAAK,KAA4C;EAC/C,MAAM,SAAS,KAAKA,UAAU,IAAI,GAAG;EACrC,OAAO,QAAQ,QAAQ,SAAS,gBAAgB,MAAM,IAAI,IAAI;CAChE;CAEA,OACE,KACA,MACA,SACuB;EAEvB,MAAM,iBADU,KAAKA,UAAU,IAAI,GACN,GAAG,WAAW;EAE3C,IAAI,QAAQ,oBAAoB,gBAC9B,OAAO,QAAQ,QAAQ;GAAE,IAAI;GAAO,QAAQ;EAAW,CAAC;EAG1D,MAAM,iBAAiB,KAAKC,UAAU,IAAI,GAAG,KAAK,KAAK;EACvD,MAAM,UAAU,OAAO,aAAa;EACpC,KAAKA,UAAU,IAAI,KAAK,aAAa;EACrC,KAAKD,UAAU,IAAI,KAAK,gBAAgB;GAAE,OAAO,KAAK;GAAO;EAAQ,CAAC,CAAC;EACvE,OAAO,QAAQ,QAAQ;GAAE,IAAI;GAAM;EAAQ,CAAC;CAC9C;AACF"}

package/dist/session/store/types.d.ts

@@ -1,7 +1,10 @@
 //#region src/session/store/types.d.ts
 interface StoredSession {
-  state: unknown;
-  version?: string;
+  readonly state: unknown;
+  readonly version: string;
+}
+interface SessionStoreCommit {
+  readonly state: unknown;
 }
 type CommitResult = {
   ok: true;
@@ -12,11 +15,11 @@ type CommitResult = {
 };
 type ExpectedSessionVersion = string | null;
 interface SessionStore {
-  commit(key: string, next: StoredSession, options?: {
-    expectedVersion?: ExpectedSessionVersion;
+  commit(key: string, next: SessionStoreCommit, options: {
+    expectedVersion: ExpectedSessionVersion;
   }): Promise<CommitResult>;
   load(key: string): Promise<StoredSession | null>;
 }
 //#endregion
-export { CommitResult, ExpectedSessionVersion, SessionStore, StoredSession };
+export { CommitResult, ExpectedSessionVersion, SessionStore, SessionStoreCommit, StoredSession };
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@minpeter/pss-runtime",
-  "version": "0.0.9",
-  "description": "Generic agent runtime for sessions, model loops, and event streams.",
+  "version": "0.0.11",
+  "description": "Generic agent runtime for sessions, model loops, and synchronized run events.",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
-    "vitest": "^4.1.6"
+    "vitest": "^4.1.7"
   },
   "scripts": {
     "build": "tsdown",

package/dist/agent-loop.d.ts

@@ -1,32 +0,0 @@
-import { Llm } from "./llm.js";
-import { AgentEvent } from "./session/events.js";
-import { AgentHooks } from "./hooks.js";
-import { ModelMessage } from "ai";
-
-//#region src/agent-loop.d.ts
-interface ModelHistory {
-  appendModelMessage(message: ModelMessage): void;
-  modelSnapshot(): ModelMessage[];
-}
-interface RunAgentLoopOptions {
-  emit: AgentLoopEventListener;
-  history: ModelHistory;
-  hooks?: AgentHooks;
-  llm: Llm;
-  signal?: AbortSignal;
-}
-type AgentLoopResult = "completed" | "aborted";
-interface AgentLoopBoundaryDecision {
-  readonly runtimeInputAdded?: boolean;
-}
-type AgentLoopEventListener = (event: AgentEvent) => AgentLoopBoundaryDecision | Promise<AgentLoopBoundaryDecision | undefined> | undefined;
-declare function runAgentLoop({
-  emit,
-  history,
-  hooks,
-  llm,
-  signal
-}: RunAgentLoopOptions): Promise<AgentLoopResult>;
-//#endregion
-export { AgentLoopResult, runAgentLoop };
-//# sourceMappingURL=agent-loop.d.ts.map