@minpeter/pss-runtime 0.1.0-next.0 → 0.1.0-next.1

package/dist/agent.js

@@ -1,77 +1,121 @@
+import { agentNamespace, parentSessionNamespace, randomAgentNamespace } from "./agent-namespace.js";
+import { assertSubagents } from "./agent-validation.js";
+import { ChildSessionCleanups } from "./child-session-cleanups.js";
 import { createLlm } from "./llm.js";
-import { resolveAgentPlugins } from "./plugins/runner.js";
 import { AgentSession } from "./session/session.js";
 import { MemorySessionStore } from "./session/store/memory.js";
+import { createSubagentTools } from "./subagents.js";
 //#region src/agent.ts
 var Agent = class Agent {
-	#internalLlm;
+	#baseTools;
+	#hooks;
 	#llm;
-	#onPluginError;
-	#plugins;
+	#modelOptions;
+	#childSessionCleanups = new ChildSessionCleanups();
+	#sessionGenerations = /* @__PURE__ */ new Map();
 	#sessions = /* @__PURE__ */ new Map();
+	#sessionNamespace;
 	#store;
-	constructor(options, resolvedPlugins) {
+	#subagents;
+	description;
+	name;
+	constructor(options) {
 		assertAgentOptions(options);
-		this.#plugins = resolvedPlugins;
-		this.#onPluginError = options.onPluginError;
-		this.#store = resolvedPlugins.sessionStore?.store ?? new MemorySessionStore();
-		if (hasCustomLlm(options)) {
-			this.#internalLlm = options.llm;
-			this.#llm = options.llm;
-		} else {
-			this.#internalLlm = createLlm({
-				instructions: options.instructions,
-				model: options.model
-			});
-			this.#llm = createLlm({
+		this.description = options.description;
+		this.name = options.name;
+		this.#sessionNamespace = stableAgentNamespace(options);
+		this.#store = options.sessions?.store ?? new MemorySessionStore();
+		this.#hooks = options.hooks;
+		assertSubagents(options, Agent, hasCustomLlm(options));
+		this.#subagents = hasCustomLlm(options) ? [] : options.subagents ?? [];
+		if (hasCustomLlm(options)) this.#llm = options.llm;
+		else {
+			this.#baseTools = options.tools;
+			this.#modelOptions = {
 				instructions: options.instructions,
 				model: options.model,
-				toolChoice: options.toolChoice,
-				tools: resolvedPlugins.tools
-			});
+				toolChoice: options.toolChoice
+			};
 		}
 	}
-	static async create(options) {
-		assertAgentOptions(options);
-		return new Agent(options, await resolveAgentPlugins({
-			callerTools: hasCustomLlm(options) ? void 0 : options.tools,
-			plugins: options.plugins
-		}));
-	}
 	send(input) {
 		return this.session("default").send(input);
 	}
 	session(key) {
 		const existing = this.#sessions.get(key);
 		if (existing) return existing;
-		const session = new AgentSession(this.#llm, {
+		let session;
+		const getSession = () => {
+			if (!session) throw new Error("Agent session is not initialized.");
+			return session;
+		};
+		const parentAgentNamespace = parentSessionNamespace({
+			generation: this.#sessionGenerations.get(key) ?? 0,
+			sessionKey: key,
+			sessionNamespace: this.#sessionNamespace
+		});
+		session = new AgentSession(this.#llm ?? createLlm(this.#createLlmOptionsForSession(key, parentAgentNamespace, (input, placement) => getSession().enqueueRuntimeInput(input, placement), (event) => getSession().emitObserverEvent(event))), {
 			key,
 			store: this.#store
-		}, this.#plugins, this.#internalLlm, this.#onPluginError);
+		}, this.#hooks);
 		const handle = {
+			delete: async () => {
+				await session.delete();
+				this.#sessions.delete(key);
+				this.#sessionGenerations.set(key, (this.#sessionGenerations.get(key) ?? 0) + 1);
+				await this.#deleteChildSessions(key);
+			},
 			interrupt: () => session.interrupt(),
 			kill: () => {
 				session.kill();
+				this.#sessionGenerations.set(key, (this.#sessionGenerations.get(key) ?? 0) + 1);
+				this.#deleteChildSessions(key).catch(() => void 0);
 				this.#sessions.delete(key);
 			},
-			overlay: (input) => session.overlay(input),
 			send: (input) => session.send(input),
 			steer: (input) => session.steer(input)
 		};
 		this.#sessions.set(key, handle);
 		return handle;
 	}
+	#createLlmOptionsForSession(key, parentAgentNamespace, enqueueRuntimeInput, emitObserverEvent) {
+		const modelOptions = this.#modelOptions;
+		if (!modelOptions) throw new Error("Agent: missing model options.");
+		const tools = this.#subagents.length === 0 ? this.#baseTools : {
+			...this.#baseTools,
+			...createSubagentTools({
+				parentAgentNamespace,
+				parentSession: {
+					emitObserverEvent,
+					enqueueRuntimeInput
+				},
+				parentSessionKey: key,
+				registerChildSession: (sessionKey, cleanup) => this.#childSessionCleanups.register(sessionKey, cleanup),
+				subagents: this.#subagents
+			})
+		};
+		return {
+			instructions: modelOptions.instructions,
+			model: modelOptions.model,
+			toolChoice: modelOptions.toolChoice,
+			tools
+		};
+	}
+	async #deleteChildSessions(parentSessionKey) {
+		await this.#childSessionCleanups.delete(parentSessionKey);
+	}
 };
+function stableAgentNamespace(options) {
+	const namespace = options.sessions?.namespace ?? options.name;
+	return namespace ? agentNamespace(namespace) : randomAgentNamespace();
+}
 function assertAgentOptions(options) {
 	if (options === null || typeof options !== "object") throw new TypeError("Agent options are required. Provide either { model } or { llm }.");
-	if ("sessions" in options) throw new TypeError("Agent.create: options.sessions was removed. Use plugins: [sessions.custom(store)].");
-	if ("hooks" in options) throw new TypeError("Agent.create: options.hooks was removed. Use run.events() with session.steer() for app control or plugin lifecycle handlers for middleware.");
 	const hasLlm = hasCustomLlm(options);
-	const hasModel = "model" in options && options.model !== void 0 && options.model !== null;
-	if (hasLlm && hasModel) throw new TypeError("Agent.create: provide either options.llm or options.model, not both.");
-	if ("llm" in options && options.llm !== void 0 && !hasLlm) throw new TypeError("Agent.create: invalid options.llm.");
-	if ("onPluginError" in options && options.onPluginError !== void 0 && typeof options.onPluginError !== "function") throw new TypeError("Agent.create: invalid options.onPluginError.");
-	if (!(hasLlm || hasModel)) throw new TypeError("Agent.create: missing options.model.");
+	const hasModel = "model" in options && options.model != null;
+	if (hasLlm && hasModel) throw new TypeError("Agent: provide either options.llm or options.model.");
+	if ("llm" in options && options.llm !== void 0 && !hasLlm) throw new TypeError("Agent: invalid options.llm.");
+	if (!(hasLlm || hasModel)) throw new TypeError("Agent: missing options.model.");
 }
 function hasCustomLlm(options) {
 	return "llm" in options && typeof options.llm === "function";

package/dist/agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent.js","names":["#internalLlm","#llm","#onPluginError","#plugins","#sessions","#store"],"sources":["../src/agent.ts"],"sourcesContent":["import type { LanguageModel, ToolSet } from \"ai\";\nimport { type AgentToolChoice, createLlm, type Llm } from \"./llm\";\nimport type { AgentPlugin } from \"./plugins\";\nimport {\n  type ResolvedAgentPlugins,\n  resolveAgentPlugins,\n} from \"./plugins/runner\";\nimport type { AgentPluginErrorHandler } from \"./session/lifecycle\";\nimport type { AgentRun } from \"./session/run\";\nimport { type AgentInput, AgentSession } from \"./session/session\";\nimport { MemorySessionStore } from \"./session/store/memory\";\nimport type { SessionStore } from \"./session/store/types\";\n\ninterface AgentLanguageModelOptions {\n  instructions?: string;\n  llm?: never;\n  model: LanguageModel;\n  onPluginError?: AgentPluginErrorHandler;\n  plugins?: readonly AgentPlugin[];\n  toolChoice?: AgentToolChoice;\n  tools?: ToolSet;\n}\n\ninterface AgentLlmOptions {\n  instructions?: never;\n  llm: Llm;\n  model?: never;\n  onPluginError?: AgentPluginErrorHandler;\n  plugins?: readonly AgentPlugin[];\n  toolChoice?: never;\n  tools?: never;\n}\n\nexport interface SessionHandle {\n  interrupt(): void;\n  kill(): void;\n  overlay(input: AgentInput): Promise<AgentRun>;\n  send(input: AgentInput): Promise<AgentRun>;\n  steer(input: AgentInput): Promise<AgentRun>;\n}\n\nexport type AgentOptions = AgentLanguageModelOptions | AgentLlmOptions;\n\nexport class Agent {\n  readonly #internalLlm: Llm;\n  readonly #llm: Llm;\n  readonly #onPluginError?: AgentPluginErrorHandler;\n  readonly #plugins: ResolvedAgentPlugins;\n  readonly #sessions = new Map<string, SessionHandle>();\n  readonly #store: SessionStore;\n\n  private constructor(\n    options: AgentOptions,\n    resolvedPlugins: ResolvedAgentPlugins\n  ) {\n    assertAgentOptions(options);\n\n    this.#plugins = resolvedPlugins;\n    this.#onPluginError = options.onPluginError;\n    this.#store =\n      resolvedPlugins.sessionStore?.store ?? new MemorySessionStore();\n    if (hasCustomLlm(options)) {\n      this.#internalLlm = options.llm;\n      this.#llm = options.llm;\n    } else {\n      this.#internalLlm = createLlm({\n        instructions: options.instructions,\n        model: options.model,\n      });\n      this.#llm = createLlm({\n        instructions: options.instructions,\n        model: options.model,\n        toolChoice: options.toolChoice,\n        tools: resolvedPlugins.tools,\n      });\n    }\n  }\n\n  static async create(options: AgentOptions): Promise<Agent> {\n    assertAgentOptions(options);\n    const resolvedPlugins = await resolveAgentPlugins({\n      callerTools: hasCustomLlm(options) ? undefined : options.tools,\n      plugins: options.plugins,\n    });\n    return new Agent(options, resolvedPlugins);\n  }\n\n  send(input: AgentInput): Promise<AgentRun> {\n    return this.session(\"default\").send(input);\n  }\n\n  session(key: string): SessionHandle {\n    const existing = this.#sessions.get(key);\n    if (existing) {\n      return existing;\n    }\n\n    const session = new AgentSession(\n      this.#llm,\n      { key, store: this.#store },\n      this.#plugins,\n      this.#internalLlm,\n      this.#onPluginError\n    );\n    const handle: SessionHandle = {\n      interrupt: () => session.interrupt(),\n      kill: () => {\n        session.kill();\n        this.#sessions.delete(key);\n      },\n      overlay: (input) => session.overlay(input),\n      send: (input) => session.send(input),\n      steer: (input) => session.steer(input),\n    };\n    this.#sessions.set(key, handle);\n    return handle;\n  }\n}\n\nfunction assertAgentOptions(options: unknown): asserts options is AgentOptions {\n  if (options === null || typeof options !== \"object\") {\n    throw new TypeError(\n      \"Agent options are required. Provide either { model } or { llm }.\"\n    );\n  }\n\n  if (\"sessions\" in options) {\n    throw new TypeError(\n      \"Agent.create: options.sessions was removed. Use plugins: [sessions.custom(store)].\"\n    );\n  }\n\n  if (\"hooks\" in options) {\n    throw new TypeError(\n      \"Agent.create: options.hooks was removed. Use run.events() with session.steer() for app control or plugin lifecycle handlers for middleware.\"\n    );\n  }\n\n  const hasLlm = hasCustomLlm(options);\n  const hasModel =\n    \"model\" in options && options.model !== undefined && options.model !== null;\n\n  if (hasLlm && hasModel) {\n    throw new TypeError(\n      \"Agent.create: provide either options.llm or options.model, not both.\"\n    );\n  }\n\n  if (\"llm\" in options && options.llm !== undefined && !hasLlm) {\n    throw new TypeError(\"Agent.create: invalid options.llm.\");\n  }\n\n  if (\n    \"onPluginError\" in options &&\n    options.onPluginError !== undefined &&\n    typeof options.onPluginError !== \"function\"\n  ) {\n    throw new TypeError(\"Agent.create: invalid options.onPluginError.\");\n  }\n\n  if (!(hasLlm || hasModel)) {\n    throw new TypeError(\"Agent.create: missing options.model.\");\n  }\n}\n\nfunction hasCustomLlm(options: object): options is AgentLlmOptions {\n  return \"llm\" in options && typeof options.llm === \"function\";\n}\n"],"mappings":";;;;;AA2CA,IAAa,QAAb,MAAa,MAAM;CACjB;CACA;CACA;CACA;CACA,4BAAqB,IAAI,IAA2B;CACpD;CAEA,YACE,SACA,iBACA;EACA,mBAAmB,OAAO;EAE1B,KAAKG,WAAW;EAChB,KAAKD,iBAAiB,QAAQ;EAC9B,KAAKG,SACH,gBAAgB,cAAc,SAAS,IAAI,mBAAmB;EAChE,IAAI,aAAa,OAAO,GAAG;GACzB,KAAKL,eAAe,QAAQ;GAC5B,KAAKC,OAAO,QAAQ;EACtB,OAAO;GACL,KAAKD,eAAe,UAAU;IAC5B,cAAc,QAAQ;IACtB,OAAO,QAAQ;GACjB,CAAC;GACD,KAAKC,OAAO,UAAU;IACpB,cAAc,QAAQ;IACtB,OAAO,QAAQ;IACf,YAAY,QAAQ;IACpB,OAAO,gBAAgB;GACzB,CAAC;EACH;CACF;CAEA,aAAa,OAAO,SAAuC;EACzD,mBAAmB,OAAO;EAK1B,OAAO,IAAI,MAAM,SAAS,MAJI,oBAAoB;GAChD,aAAa,aAAa,OAAO,IAAI,KAAA,IAAY,QAAQ;GACzD,SAAS,QAAQ;EACnB,CAAC,CACwC;CAC3C;CAEA,KAAK,OAAsC;EACzC,OAAO,KAAK,QAAQ,SAAS,EAAE,KAAK,KAAK;CAC3C;CAEA,QAAQ,KAA4B;EAClC,MAAM,WAAW,KAAKG,UAAU,IAAI,GAAG;EACvC,IAAI,UACF,OAAO;EAGT,MAAM,UAAU,IAAI,aAClB,KAAKH,MACL;GAAE;GAAK,OAAO,KAAKI;EAAO,GAC1B,KAAKF,UACL,KAAKH,cACL,KAAKE,cACP;EACA,MAAM,SAAwB;GAC5B,iBAAiB,QAAQ,UAAU;GACnC,YAAY;IACV,QAAQ,KAAK;IACb,KAAKE,UAAU,OAAO,GAAG;GAC3B;GACA,UAAU,UAAU,QAAQ,QAAQ,KAAK;GACzC,OAAO,UAAU,QAAQ,KAAK,KAAK;GACnC,QAAQ,UAAU,QAAQ,MAAM,KAAK;EACvC;EACA,KAAKA,UAAU,IAAI,KAAK,MAAM;EAC9B,OAAO;CACT;AACF;AAEA,SAAS,mBAAmB,SAAmD;CAC7E,IAAI,YAAY,QAAQ,OAAO,YAAY,UACzC,MAAM,IAAI,UACR,kEACF;CAGF,IAAI,cAAc,SAChB,MAAM,IAAI,UACR,oFACF;CAGF,IAAI,WAAW,SACb,MAAM,IAAI,UACR,6IACF;CAGF,MAAM,SAAS,aAAa,OAAO;CACnC,MAAM,WACJ,WAAW,WAAW,QAAQ,UAAU,KAAA,KAAa,QAAQ,UAAU;CAEzE,IAAI,UAAU,UACZ,MAAM,IAAI,UACR,sEACF;CAGF,IAAI,SAAS,WAAW,QAAQ,QAAQ,KAAA,KAAa,CAAC,QACpD,MAAM,IAAI,UAAU,oCAAoC;CAG1D,IACE,mBAAmB,WACnB,QAAQ,kBAAkB,KAAA,KAC1B,OAAO,QAAQ,kBAAkB,YAEjC,MAAM,IAAI,UAAU,8CAA8C;CAGpE,IAAI,EAAE,UAAU,WACd,MAAM,IAAI,UAAU,sCAAsC;AAE9D;AAEA,SAAS,aAAa,SAA6C;CACjE,OAAO,SAAS,WAAW,OAAO,QAAQ,QAAQ;AACpD"}
+{"version":3,"file":"agent.js","names":["#baseTools","#hooks","#llm","#modelOptions","#childSessionCleanups","#sessionGenerations","#sessions","#sessionNamespace","#store","#subagents","#createLlmOptionsForSession","#deleteChildSessions"],"sources":["../src/agent.ts"],"sourcesContent":["import type { LanguageModel, ToolSet } from \"ai\";\nimport {\n  agentNamespace,\n  parentSessionNamespace,\n  randomAgentNamespace,\n} from \"./agent-namespace\";\nimport { assertSubagents } from \"./agent-validation\";\nimport { ChildSessionCleanups } from \"./child-session-cleanups\";\nimport type { AgentHooks } from \"./hooks\";\nimport { type AgentToolChoice, createLlm, type Llm } from \"./llm\";\nimport type { UserInput } from \"./session/events\";\nimport type { AgentRun } from \"./session/run\";\nimport { type AgentInput, AgentSession } from \"./session/session\";\nimport { MemorySessionStore } from \"./session/store/memory\";\nimport type { SessionStore } from \"./session/store/types\";\nimport { createSubagentTools } from \"./subagents\";\n\ninterface AgentLanguageModelOptions {\n  description?: string;\n  hooks?: AgentHooks;\n  instructions?: string;\n  llm?: never;\n  model: LanguageModel;\n  name?: string;\n  sessions?: AgentSessionOptions;\n  subagents?: readonly Agent[];\n  toolChoice?: AgentToolChoice;\n  tools?: ToolSet;\n}\n\ninterface AgentLlmOptions {\n  description?: string;\n  hooks?: AgentHooks;\n  instructions?: never;\n  llm: Llm;\n  model?: never;\n  name?: string;\n  sessions?: AgentSessionOptions;\n  subagents?: never;\n  toolChoice?: never;\n  tools?: never;\n}\n\nexport interface AgentSessionOptions {\n  namespace?: string;\n  store?: SessionStore;\n}\n\nexport interface SessionHandle {\n  delete(): Promise<void>;\n  interrupt(): void;\n  kill(): void;\n  send(input: AgentInput): Promise<AgentRun>;\n  steer(input: AgentInput): Promise<AgentRun>;\n}\n\nexport type AgentOptions = AgentLanguageModelOptions | AgentLlmOptions;\ntype AgentModelOptions = Pick<\n  AgentLanguageModelOptions,\n  \"instructions\" | \"model\" | \"toolChoice\"\n>;\n\nexport class Agent {\n  readonly #baseTools?: ToolSet;\n  readonly #hooks?: AgentHooks;\n  readonly #llm?: Llm;\n  readonly #modelOptions?: AgentModelOptions;\n  readonly #childSessionCleanups = new ChildSessionCleanups();\n  readonly #sessionGenerations = new Map<string, number>();\n  readonly #sessions = new Map<string, SessionHandle>();\n  readonly #sessionNamespace: string;\n  readonly #store: SessionStore;\n  readonly #subagents: readonly Agent[];\n  readonly description?: string;\n  readonly name?: string;\n\n  constructor(options: AgentOptions) {\n    assertAgentOptions(options);\n\n    this.description = options.description;\n    this.name = options.name;\n    this.#sessionNamespace = stableAgentNamespace(options);\n    this.#store = options.sessions?.store ?? new MemorySessionStore();\n    this.#hooks = options.hooks;\n    assertSubagents(options, Agent, hasCustomLlm(options));\n    this.#subagents = hasCustomLlm(options) ? [] : (options.subagents ?? []);\n    if (hasCustomLlm(options)) {\n      this.#llm = options.llm;\n    } else {\n      this.#baseTools = options.tools;\n      this.#modelOptions = {\n        instructions: options.instructions,\n        model: options.model,\n        toolChoice: options.toolChoice,\n      };\n    }\n  }\n\n  send(input: AgentInput): Promise<AgentRun> {\n    return this.session(\"default\").send(input);\n  }\n\n  session(key: string): SessionHandle {\n    const existing = this.#sessions.get(key);\n    if (existing) {\n      return existing;\n    }\n\n    let session: AgentSession | undefined;\n    const getSession = () => {\n      if (!session) {\n        throw new Error(\"Agent session is not initialized.\");\n      }\n      return session;\n    };\n    const parentAgentNamespace = parentSessionNamespace({\n      generation: this.#sessionGenerations.get(key) ?? 0,\n      sessionKey: key,\n      sessionNamespace: this.#sessionNamespace,\n    });\n    const llm =\n      this.#llm ??\n      createLlm(\n        this.#createLlmOptionsForSession(\n          key,\n          parentAgentNamespace,\n          (input: UserInput, placement?: \"turn-start\") =>\n            getSession().enqueueRuntimeInput(input, placement),\n          (event) => getSession().emitObserverEvent(event)\n        )\n      );\n    session = new AgentSession(llm, { key, store: this.#store }, this.#hooks);\n    const handle: SessionHandle = {\n      delete: async () => {\n        await session.delete();\n        this.#sessions.delete(key);\n        this.#sessionGenerations.set(\n          key,\n          (this.#sessionGenerations.get(key) ?? 0) + 1\n        );\n        await this.#deleteChildSessions(key);\n      },\n      interrupt: () => session.interrupt(),\n      kill: () => {\n        session.kill();\n        this.#sessionGenerations.set(\n          key,\n          (this.#sessionGenerations.get(key) ?? 0) + 1\n        );\n        this.#deleteChildSessions(key).catch(() => undefined);\n        this.#sessions.delete(key);\n      },\n      send: (input) => session.send(input),\n      steer: (input) => session.steer(input),\n    };\n    this.#sessions.set(key, handle);\n    return handle;\n  }\n\n  #createLlmOptionsForSession(\n    key: string,\n    parentAgentNamespace: string,\n    enqueueRuntimeInput: AgentSession[\"enqueueRuntimeInput\"],\n    emitObserverEvent: AgentSession[\"emitObserverEvent\"]\n  ): Parameters<typeof createLlm>[0] {\n    const modelOptions = this.#modelOptions;\n    if (!modelOptions) {\n      throw new Error(\"Agent: missing model options.\");\n    }\n    const tools =\n      this.#subagents.length === 0\n        ? this.#baseTools\n        : {\n            ...this.#baseTools,\n            ...createSubagentTools({\n              parentAgentNamespace,\n              parentSession: { emitObserverEvent, enqueueRuntimeInput },\n              parentSessionKey: key,\n              registerChildSession: (sessionKey, cleanup) =>\n                this.#childSessionCleanups.register(sessionKey, cleanup),\n              subagents: this.#subagents,\n            }),\n          };\n\n    return {\n      instructions: modelOptions.instructions,\n      model: modelOptions.model,\n      toolChoice: modelOptions.toolChoice,\n      tools,\n    };\n  }\n\n  async #deleteChildSessions(parentSessionKey: string): Promise<void> {\n    await this.#childSessionCleanups.delete(parentSessionKey);\n  }\n}\n\nfunction stableAgentNamespace(options: AgentOptions): string {\n  const namespace = options.sessions?.namespace ?? options.name;\n  return namespace ? agentNamespace(namespace) : randomAgentNamespace();\n}\n\nfunction assertAgentOptions(options: unknown): asserts options is AgentOptions {\n  if (options === null || typeof options !== \"object\") {\n    throw new TypeError(\n      \"Agent options are required. Provide either { model } or { llm }.\"\n    );\n  }\n\n  const hasLlm = hasCustomLlm(options);\n  const hasModel = \"model\" in options && options.model != null;\n\n  if (hasLlm && hasModel) {\n    throw new TypeError(\"Agent: provide either options.llm or options.model.\");\n  }\n\n  if (\"llm\" in options && options.llm !== undefined && !hasLlm) {\n    throw new TypeError(\"Agent: invalid options.llm.\");\n  }\n\n  if (!(hasLlm || hasModel)) {\n    throw new TypeError(\"Agent: missing options.model.\");\n  }\n}\n\nfunction hasCustomLlm(options: object): options is AgentLlmOptions {\n  return \"llm\" in options && typeof options.llm === \"function\";\n}\n"],"mappings":"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"}

package/dist/child-session-cleanups.js

@@ -0,0 +1,61 @@
+//#region src/child-session-cleanups.ts
+var ChildSessionCleanups = class {
+	#byParentSession = /* @__PURE__ */ new Map();
+	async delete(parentSessionKey) {
+		const cleanups = this.#byParentSession.get(parentSessionKey);
+		if (!cleanups) return;
+		this.#byParentSession.delete(parentSessionKey);
+		const results = await Promise.all([...cleanups].map(runCleanup));
+		const failedCleanups = [];
+		let firstError;
+		for (const result of results) {
+			if (result.ok) continue;
+			firstError ??= result.error;
+			failedCleanups.push(result.cleanup);
+		}
+		if (failedCleanups.length === 0) return;
+		this.#restore(parentSessionKey, failedCleanups);
+		throw firstError instanceof Error ? firstError : new Error(String(firstError));
+	}
+	register(parentSessionKey, cleanup) {
+		const existing = this.#byParentSession.get(parentSessionKey);
+		if (existing) {
+			existing.add(cleanup);
+			return () => this.#unregister(parentSessionKey, existing, cleanup);
+		}
+		const cleanups = new Set([cleanup]);
+		this.#byParentSession.set(parentSessionKey, cleanups);
+		return () => this.#unregister(parentSessionKey, cleanups, cleanup);
+	}
+	#unregister(parentSessionKey, cleanups, cleanup) {
+		cleanups.delete(cleanup);
+		if (cleanups.size === 0 && this.#byParentSession.get(parentSessionKey) === cleanups) this.#byParentSession.delete(parentSessionKey);
+	}
+	#restore(parentSessionKey, failedCleanups) {
+		const current = this.#byParentSession.get(parentSessionKey);
+		if (current) {
+			for (const cleanup of failedCleanups) current.add(cleanup);
+			return;
+		}
+		this.#byParentSession.set(parentSessionKey, new Set(failedCleanups));
+	}
+};
+async function runCleanup(cleanup) {
+	try {
+		await cleanup();
+		return {
+			cleanup,
+			ok: true
+		};
+	} catch (error) {
+		return {
+			cleanup,
+			error,
+			ok: false
+		};
+	}
+}
+//#endregion
+export { ChildSessionCleanups };
+
+//# sourceMappingURL=child-session-cleanups.js.map

package/dist/child-session-cleanups.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"child-session-cleanups.js","names":["#byParentSession","#restore","#unregister"],"sources":["../src/child-session-cleanups.ts"],"sourcesContent":["type ChildSessionCleanup = () => Promise<void>;\n\ntype CleanupResult =\n  | { readonly cleanup: ChildSessionCleanup; readonly ok: true }\n  | {\n      readonly cleanup: ChildSessionCleanup;\n      readonly error: unknown;\n      readonly ok: false;\n    };\n\nexport class ChildSessionCleanups {\n  readonly #byParentSession = new Map<string, Set<ChildSessionCleanup>>();\n\n  async delete(parentSessionKey: string): Promise<void> {\n    const cleanups = this.#byParentSession.get(parentSessionKey);\n    if (!cleanups) {\n      return;\n    }\n\n    this.#byParentSession.delete(parentSessionKey);\n    const results = await Promise.all([...cleanups].map(runCleanup));\n    const failedCleanups: ChildSessionCleanup[] = [];\n    let firstError: unknown;\n    for (const result of results) {\n      if (result.ok) {\n        continue;\n      }\n\n      firstError ??= result.error;\n      failedCleanups.push(result.cleanup);\n    }\n\n    if (failedCleanups.length === 0) {\n      return;\n    }\n\n    this.#restore(parentSessionKey, failedCleanups);\n    throw firstError instanceof Error\n      ? firstError\n      : new Error(String(firstError));\n  }\n\n  register(parentSessionKey: string, cleanup: ChildSessionCleanup): () => void {\n    const existing = this.#byParentSession.get(parentSessionKey);\n    if (existing) {\n      existing.add(cleanup);\n      return () => this.#unregister(parentSessionKey, existing, cleanup);\n    }\n\n    const cleanups = new Set([cleanup]);\n    this.#byParentSession.set(parentSessionKey, cleanups);\n    return () => this.#unregister(parentSessionKey, cleanups, cleanup);\n  }\n\n  #unregister(\n    parentSessionKey: string,\n    cleanups: Set<ChildSessionCleanup>,\n    cleanup: ChildSessionCleanup\n  ): void {\n    cleanups.delete(cleanup);\n    if (\n      cleanups.size === 0 &&\n      this.#byParentSession.get(parentSessionKey) === cleanups\n    ) {\n      this.#byParentSession.delete(parentSessionKey);\n    }\n  }\n\n  #restore(\n    parentSessionKey: string,\n    failedCleanups: readonly ChildSessionCleanup[]\n  ): void {\n    const current = this.#byParentSession.get(parentSessionKey);\n    if (current) {\n      for (const cleanup of failedCleanups) {\n        current.add(cleanup);\n      }\n      return;\n    }\n\n    this.#byParentSession.set(parentSessionKey, new Set(failedCleanups));\n  }\n}\n\nasync function runCleanup(\n  cleanup: ChildSessionCleanup\n): Promise<CleanupResult> {\n  try {\n    await cleanup();\n    return { cleanup, ok: true };\n  } catch (error) {\n    return { cleanup, error, ok: false };\n  }\n}\n"],"mappings":";AAUA,IAAa,uBAAb,MAAkC;CAChC,mCAA4B,IAAI,IAAsC;CAEtE,MAAM,OAAO,kBAAyC;EACpD,MAAM,WAAW,KAAKA,iBAAiB,IAAI,gBAAgB;EAC3D,IAAI,CAAC,UACH;EAGF,KAAKA,iBAAiB,OAAO,gBAAgB;EAC7C,MAAM,UAAU,MAAM,QAAQ,IAAI,CAAC,GAAG,QAAQ,EAAE,IAAI,UAAU,CAAC;EAC/D,MAAM,iBAAwC,CAAC;EAC/C,IAAI;EACJ,KAAK,MAAM,UAAU,SAAS;GAC5B,IAAI,OAAO,IACT;GAGF,eAAe,OAAO;GACtB,eAAe,KAAK,OAAO,OAAO;EACpC;EAEA,IAAI,eAAe,WAAW,GAC5B;EAGF,KAAKC,SAAS,kBAAkB,cAAc;EAC9C,MAAM,sBAAsB,QACxB,aACA,IAAI,MAAM,OAAO,UAAU,CAAC;CAClC;CAEA,SAAS,kBAA0B,SAA0C;EAC3E,MAAM,WAAW,KAAKD,iBAAiB,IAAI,gBAAgB;EAC3D,IAAI,UAAU;GACZ,SAAS,IAAI,OAAO;GACpB,aAAa,KAAKE,YAAY,kBAAkB,UAAU,OAAO;EACnE;EAEA,MAAM,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC;EAClC,KAAKF,iBAAiB,IAAI,kBAAkB,QAAQ;EACpD,aAAa,KAAKE,YAAY,kBAAkB,UAAU,OAAO;CACnE;CAEA,YACE,kBACA,UACA,SACM;EACN,SAAS,OAAO,OAAO;EACvB,IACE,SAAS,SAAS,KAClB,KAAKF,iBAAiB,IAAI,gBAAgB,MAAM,UAEhD,KAAKA,iBAAiB,OAAO,gBAAgB;CAEjD;CAEA,SACE,kBACA,gBACM;EACN,MAAM,UAAU,KAAKA,iBAAiB,IAAI,gBAAgB;EAC1D,IAAI,SAAS;GACX,KAAK,MAAM,WAAW,gBACpB,QAAQ,IAAI,OAAO;GAErB;EACF;EAEA,KAAKA,iBAAiB,IAAI,kBAAkB,IAAI,IAAI,cAAc,CAAC;CACrE;AACF;AAEA,eAAe,WACb,SACwB;CACxB,IAAI;EACF,MAAM,QAAQ;EACd,OAAO;GAAE;GAAS,IAAI;EAAK;CAC7B,SAAS,OAAO;EACd,OAAO;GAAE;GAAS;GAAO,IAAI;EAAM;CACrC;AACF"}

package/dist/hooks.d.ts

@@ -0,0 +1,32 @@
+import { RuntimeLlmContext } from "./llm.js";
+import { UserInput } from "./session/input.js";
+
+//#region src/hooks.d.ts
+type AgentTurnResult = "aborted" | "completed";
+type AgentStepResult = "completed" | "continue";
+type MaybePromise<T> = PromiseLike<T> | T;
+interface AgentBeforeTurnContext {
+  readonly history: RuntimeLlmContext["history"];
+  readonly input: UserInput;
+  readonly signal: AbortSignal;
+}
+interface AgentAfterTurnContext extends AgentBeforeTurnContext {
+  readonly result: AgentTurnResult;
+}
+interface AgentBeforeStepContext {
+  readonly history: RuntimeLlmContext["history"];
+  readonly signal: AbortSignal;
+  readonly stepIndex: number;
+}
+interface AgentAfterStepContext extends AgentBeforeStepContext {
+  readonly result: AgentStepResult;
+}
+interface AgentHooks {
+  afterStep?(context: AgentAfterStepContext): MaybePromise<void>;
+  afterTurn?(context: AgentAfterTurnContext): MaybePromise<void>;
+  beforeStep?(context: AgentBeforeStepContext): MaybePromise<void>;
+  beforeTurn?(context: AgentBeforeTurnContext): MaybePromise<void>;
+}
+//#endregion
+export { AgentAfterStepContext, AgentAfterTurnContext, AgentBeforeStepContext, AgentBeforeTurnContext, AgentHooks, AgentStepResult, AgentTurnResult };
+//# sourceMappingURL=hooks.d.ts.map

package/dist/index.d.ts

@@ -1,12 +1,8 @@
 import { AgentToolChoice, AgentToolExecute, AgentToolExecutionOptions, LlmOutputPart, RuntimeCreateLlmOptions, RuntimeLlm, RuntimeLlmContext, RuntimeLlmOutput, createLlm } from "./llm.js";
 import { AgentInput, SessionInput, UserInput, UserMessage, UserMessageContent, UserMessageContentPart, UserMessageFileData, UserMessageFilePart, UserMessageImagePart, UserMessageTextPart, UserText, UserTextContent } from "./session/input.js";
-import { AgentEvent, AgentEventListener, AssistantReasoning, AssistantText, OverlayAccepted, OverlayExpired, OverlayInputSummary, OverlayPlacement, RuntimeInput, ToolCall, ToolResult } from "./session/events.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 { AgentContextTransform, AgentPlugin, AgentPluginEvent, AgentPluginEventFor, AgentPluginEventName, AgentPluginHandler, AgentPluginHandlerResult, AgentPluginHandlerReturn, AgentPluginHost, AgentPluginMaybePromise, AgentPluginStepAfterEvent, AgentPluginStepBeforeEvent, AgentPluginStepResult, AgentPluginToolCallEvent, AgentPluginToolCallResult, AgentPluginToolResultEvent, AgentPluginToolResultResult, AgentPluginToolResultStatus, AgentPluginToolSyntheticResult, AgentPluginTurnAfterEvent, AgentPluginTurnBeforeEvent, AgentPluginTurnResult, definePlugin } from "./plugins/types.js";
-import { CompactionOptions, compaction } from "./plugins/compaction.js";
-import { memory } from "./plugins/memory.js";
-import { sessions } from "./plugins/sessions.js";
-import { AgentPluginErrorHandler, AgentPluginHandlerError } from "./session/lifecycle.js";
-import { Agent, AgentOptions, SessionHandle } from "./agent.js";
-export { Agent, type AgentContextTransform, type AgentEvent, type AgentEventListener, type AgentInput, type AgentOptions, type AgentPlugin, type AgentPluginErrorHandler, type AgentPluginEvent, type AgentPluginEventFor, type AgentPluginEventName, type AgentPluginHandler, type AgentPluginHandlerError, type AgentPluginHandlerResult, type AgentPluginHandlerReturn, type AgentPluginHost, type AgentPluginMaybePromise, type AgentPluginStepAfterEvent, type AgentPluginStepBeforeEvent, type AgentPluginStepResult, type AgentPluginToolCallEvent, type AgentPluginToolCallResult, type AgentPluginToolResultEvent, type AgentPluginToolResultResult, type AgentPluginToolResultStatus, type AgentPluginToolSyntheticResult, type AgentPluginTurnAfterEvent, type AgentPluginTurnBeforeEvent, type AgentPluginTurnResult, type AgentRun, type AgentToolChoice, type AgentToolExecute, type AgentToolExecutionOptions, type AssistantReasoning, type AssistantText, type CommitResult, type CompactionOptions, type ExpectedSessionVersion, type LlmOutputPart, type OverlayAccepted, type OverlayExpired, type OverlayInputSummary, type OverlayPlacement, 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, compaction, createLlm, definePlugin, memory, sessions };
+import { Agent, AgentOptions, AgentSessionOptions, SessionHandle } from "./agent.js";
+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,8 +1,3 @@
 import { createLlm } from "./llm.js";
-import { definePlugin } from "./plugins/types.js";
 import { Agent } from "./agent.js";
-import { compaction } from "./plugins/compaction.js";
-import { memory } from "./plugins/memory.js";
-import { sessions } from "./plugins/sessions.js";
-import "./plugins/index.js";
-export { Agent, compaction, createLlm, definePlugin, memory, sessions };
+export { Agent, createLlm };

package/dist/llm.js

@@ -1,20 +1,14 @@
-import { wrapToolsWithPluginHooks } from "./plugins/tool-hooks.js";
 import { generateText } from "ai";
 //#region src/llm.ts
 function createLlm({ model, instructions, toolChoice, tools }) {
 	return async ({ history, signal }) => {
-		const scopedTools = wrapToolsWithPluginHooks({
-			history,
-			signal,
-			tools
-		});
 		const { responseMessages } = await generateText({
 			abortSignal: signal,
 			instructions,
 			messages: [...history],
 			model,
 			toolChoice,
-			tools: scopedTools
+			tools
 		});
 		return responseMessages;
 	};

package/dist/llm.js.map

@@ -1 +1 @@
-{"version":3,"file":"llm.js","names":[],"sources":["../src/llm.ts"],"sourcesContent":["import type {\n  LanguageModel,\n  ModelMessage,\n  Tool,\n  ToolExecutionOptions,\n  ToolSet,\n} from \"ai\";\nimport { generateText } from \"ai\";\nimport { wrapToolsWithPluginHooks } from \"./plugins/tool-hooks\";\n\nexport type AgentToolExecutionOptions = ToolExecutionOptions<unknown>;\nexport type AgentToolExecute = NonNullable<Tool[\"execute\"]>;\nexport type AgentToolChoice = \"auto\" | \"required\";\nexport type LlmOutput = Awaited<\n  ReturnType<typeof generateText>\n>[\"responseMessages\"];\nexport type LlmOutputPart = LlmOutput[number];\n\nexport interface LlmContext {\n  history: readonly ModelMessage[];\n  signal: AbortSignal;\n}\n\nexport type Llm = (context: LlmContext) => Promise<LlmOutput>;\n\nexport interface CreateLlmOptions {\n  instructions?: string;\n  model: LanguageModel;\n  toolChoice?: AgentToolChoice;\n  tools?: ToolSet;\n}\n\nexport type RuntimeCreateLlmOptions = CreateLlmOptions;\nexport type RuntimeLlm = Llm;\nexport type RuntimeLlmContext = LlmContext;\nexport type RuntimeLlmOutput = LlmOutput;\n\nexport function createLlm({\n  model,\n  instructions,\n  toolChoice,\n  tools,\n}: CreateLlmOptions): Llm {\n  return async ({ history, signal }) => {\n    const scopedTools = wrapToolsWithPluginHooks({\n      history,\n      signal,\n      tools,\n    });\n    const { responseMessages } = await generateText({\n      abortSignal: signal,\n      instructions,\n      messages: [...history],\n      model,\n      toolChoice,\n      tools: scopedTools,\n    });\n\n    return responseMessages;\n  };\n}\n"],"mappings":";;;AAqCA,SAAgB,UAAU,EACxB,OACA,cACA,YACA,SACwB;CACxB,OAAO,OAAO,EAAE,SAAS,aAAa;EACpC,MAAM,cAAc,yBAAyB;GAC3C;GACA;GACA;EACF,CAAC;EACD,MAAM,EAAE,qBAAqB,MAAM,aAAa;GAC9C,aAAa;GACb;GACA,UAAU,CAAC,GAAG,OAAO;GACrB;GACA;GACA,OAAO;EACT,CAAC;EAED,OAAO;CACT;AACF"}
+{"version":3,"file":"llm.js","names":[],"sources":["../src/llm.ts"],"sourcesContent":["import type {\n  LanguageModel,\n  ModelMessage,\n  Tool,\n  ToolExecutionOptions,\n  ToolSet,\n} from \"ai\";\nimport { generateText } from \"ai\";\n\nexport type AgentToolExecutionOptions = ToolExecutionOptions<unknown>;\nexport type AgentToolExecute = NonNullable<Tool[\"execute\"]>;\nexport type AgentToolChoice = \"auto\" | \"required\";\nexport type LlmOutput = Awaited<\n  ReturnType<typeof generateText>\n>[\"responseMessages\"];\nexport type LlmOutputPart = LlmOutput[number];\n\nexport interface LlmContext {\n  history: readonly ModelMessage[];\n  signal: AbortSignal;\n}\n\nexport type Llm = (context: LlmContext) => Promise<LlmOutput>;\n\nexport interface CreateLlmOptions {\n  instructions?: string;\n  model: LanguageModel;\n  toolChoice?: AgentToolChoice;\n  tools?: ToolSet;\n}\n\nexport type RuntimeCreateLlmOptions = CreateLlmOptions;\nexport type RuntimeLlm = Llm;\nexport type RuntimeLlmContext = LlmContext;\nexport type RuntimeLlmOutput = LlmOutput;\n\nexport function createLlm({\n  model,\n  instructions,\n  toolChoice,\n  tools,\n}: CreateLlmOptions): Llm {\n  return async ({ history, signal }) => {\n    const { responseMessages } = await generateText({\n      abortSignal: signal,\n      instructions,\n      messages: [...history],\n      model,\n      toolChoice,\n      tools,\n    });\n\n    return responseMessages;\n  };\n}\n"],"mappings":";;AAoCA,SAAgB,UAAU,EACxB,OACA,cACA,YACA,SACwB;CACxB,OAAO,OAAO,EAAE,SAAS,aAAa;EACpC,MAAM,EAAE,qBAAqB,MAAM,aAAa;GAC9C,aAAa;GACb;GACA,UAAU,CAAC,GAAG,OAAO;GACrB;GACA;GACA;EACF,CAAC;EAED,OAAO;CACT;AACF"}

package/dist/session/events.d.ts

@@ -10,23 +10,6 @@ interface RuntimeInput {
   placement: "turn-start" | "step-start" | "step-end";
   type: "runtime-input";
 }
-type OverlayPlacement = "idle" | "step-end" | "step-start" | "turn-start";
-interface OverlayInputSummary {
-  partCount?: number;
-  preview: string;
-  textLength?: number;
-  type: UserInput["type"];
-}
-interface OverlayAccepted {
-  input: OverlayInputSummary;
-  placement: OverlayPlacement;
-  type: "overlay-accepted";
-}
-interface OverlayExpired {
-  count: number;
-  reason: "kill" | "turn-abort" | "turn-end" | "turn-error";
-  type: "overlay-expired";
-}
 interface AssistantText {
   text: string;
   type: "assistant-text";
@@ -47,7 +30,8 @@ interface ToolResult {
   toolName: string;
   type: "tool-result";
 }
-type AgentEvent = /** User input was accepted into the session queue. */UserText /** User multipart input was accepted into the session queue. */ | UserMessage /** Runtime/API-originated input inserted into the current turn, not human input. */ | RuntimeInput | OverlayAccepted | OverlayExpired /** A queued user input started running as a turn. */ | {
+type SubagentJobStatus = "aborted" | "cancelled" | "completed" | "error" | "pending" | "running";
+type AgentEvent = /** User input was accepted into the session queue. */UserText /** User multipart input was accepted into the session queue. */ | UserMessage /** Runtime/API-originated input inserted into the current turn, not human input. */ | RuntimeInput /** A queued user input started running as a turn. */ | {
   type: "turn-start";
 } /** The active turn was interrupted before normal completion. */ | {
   type: "turn-abort";
@@ -58,10 +42,29 @@ type AgentEvent = /** User input was accepted into the session queue. */UserText
   type: "turn-end";
 } /** One model/tool-loop iteration started within the active turn. */ | {
   type: "step-start";
-} /** The model produced reasoning content. */ | AssistantReasoning /** The model produced visible assistant text. */ | AssistantText /** The model requested a tool call. */ | ToolCall /** A tool call returned a result. */ | ToolResult /** One model/tool-loop iteration finished within the active turn. */ | {
+} /** The model produced reasoning content. */ | AssistantReasoning /** The model produced visible assistant text. */ | AssistantText /** The model requested a tool call. */ | ToolCall /** A tool call returned a result. */ | ToolResult | {
+  description?: string;
+  run_in_background: boolean;
+  subagent: string;
+  task_id?: string;
+  type: "subagent-job-start";
+} | {
+  eventType?: AgentEvent["type"];
+  status: SubagentJobStatus;
+  subagent: string;
+  task_id: string;
+  type: "subagent-job-update";
+} | {
+  error?: string;
+  eventCount: number;
+  status: Exclude<SubagentJobStatus, "pending" | "running">;
+  subagent: string;
+  task_id?: string;
+  type: "subagent-job-end";
+} /** One model/tool-loop iteration finished within the active turn. */ | {
   type: "step-end";
 };
 type AgentEventListener = (event: AgentEvent) => void;
 //#endregion
-export { AgentEvent, AgentEventListener, AssistantReasoning, AssistantText, OverlayAccepted, OverlayExpired, OverlayInputSummary, OverlayPlacement, RuntimeInput, ToolCall, ToolResult };
+export { AgentEvent, AgentEventListener, AssistantReasoning, AssistantText, RuntimeInput, ToolCall, ToolResult };
 //# sourceMappingURL=events.d.ts.map

package/dist/session/input-normalization.js

@@ -0,0 +1,66 @@
+//#region src/session/input-normalization.ts
+function normalizeAgentInput(input) {
+	if (typeof input === "string") return {
+		type: "user-text",
+		text: input
+	};
+	if (isStringArrayInput(input)) return {
+		type: "user-text",
+		text: structuredClone(input)
+	};
+	if (isArrayInput(input)) {
+		assertUserMessageContent(input);
+		return {
+			type: "user-message",
+			content: structuredClone(input)
+		};
+	}
+	if (isUserMessage(input)) {
+		assertUserMessageContent(input.content);
+		return structuredClone(input);
+	}
+	if (isUserText(input)) return structuredClone(input);
+	throw new TypeError("Agent input must be text, text parts, content parts, user-text, or user-message.");
+}
+function isStringArrayInput(input) {
+	return Array.isArray(input) && hasDenseItems(input, isString);
+}
+function isArrayInput(input) {
+	return Array.isArray(input);
+}
+function isUserMessage(input) {
+	return input !== null && typeof input === "object" && !isArrayInput(input) && input.type === "user-message" && "content" in input && Array.isArray(input.content);
+}
+function isUserText(input) {
+	return input !== null && typeof input === "object" && !isArrayInput(input) && input.type === "user-text" && (typeof input.text === "string" || isStringArrayInput(input.text));
+}
+function assertUserMessageContent(input) {
+	for (const part of input) if (!isUserMessageContentPart(part)) throw new TypeError("Agent input content parts must be { type: \"text\", text }, { type: \"image\", image }, or { type: \"file\", data, mediaType }.");
+}
+function isUserMessageContentPart(part) {
+	if (part === null || typeof part !== "object" || !("type" in part)) return false;
+	if (part.type === "text") return "text" in part && typeof part.text === "string";
+	if (part.type === "image") return "image" in part && typeof part.image === "string" && (!("mediaType" in part) || typeof part.mediaType === "string");
+	if (part.type === "file") return "data" in part && isUserMessageFileData(part.data) && "mediaType" in part && typeof part.mediaType === "string" && (!("filename" in part) || typeof part.filename === "string");
+	return false;
+}
+function isUserMessageFileData(data) {
+	if (typeof data === "string") return true;
+	if (data === null || typeof data !== "object" || !("type" in data)) return false;
+	if (data.type === "data") return "data" in data && typeof data.data === "string";
+	if (data.type === "reference") return "reference" in data && data.reference !== null && typeof data.reference === "object" && Object.values(data.reference).every((value) => typeof value === "string");
+	if (data.type === "text") return "text" in data && typeof data.text === "string";
+	if (data.type === "url") return "url" in data && typeof data.url === "string";
+	return false;
+}
+function hasDenseItems(input, predicate) {
+	for (let index = 0; index < input.length; index += 1) if (!(index in input && predicate(input[index]))) return false;
+	return true;
+}
+function isString(value) {
+	return typeof value === "string";
+}
+//#endregion
+export { normalizeAgentInput };
+
+//# sourceMappingURL=input-normalization.js.map

package/dist/session/input-normalization.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"input-normalization.js","names":[],"sources":["../../src/session/input-normalization.ts"],"sourcesContent":["import type {\n  AgentInput,\n  UserInput,\n  UserMessage,\n  UserMessageContentPart,\n  UserText,\n} from \"./input\";\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),\n    };\n  }\n\n  if (isArrayInput(input)) {\n    assertUserMessageContent(input);\n    return {\n      type: \"user-message\",\n      content: structuredClone(input),\n    };\n  }\n\n  if (isUserMessage(input)) {\n    assertUserMessageContent(input.content);\n    return structuredClone(input);\n  }\n\n  if (isUserText(input)) {\n    return structuredClone(input);\n  }\n\n  throw new TypeError(\n    \"Agent input must be text, text parts, content parts, user-text, or user-message.\"\n  );\n}\n\nfunction isStringArrayInput(input: unknown): input is readonly string[] {\n  return Array.isArray(input) && hasDenseItems(input, isString);\n}\n\nfunction isArrayInput(\n  input: AgentInput\n): input is readonly string[] | readonly UserMessageContentPart[] {\n  return Array.isArray(input);\n}\n\nfunction isUserMessage(input: AgentInput): input is UserMessage {\n  return (\n    input !== null &&\n    typeof input === \"object\" &&\n    !isArrayInput(input) &&\n    input.type === \"user-message\" &&\n    \"content\" in input &&\n    Array.isArray(input.content)\n  );\n}\n\nfunction isUserText(input: AgentInput): input is UserText {\n  return (\n    input !== null &&\n    typeof input === \"object\" &&\n    !isArrayInput(input) &&\n    input.type === \"user-text\" &&\n    (typeof input.text === \"string\" || isStringArrayInput(input.text))\n  );\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 hasDenseItems<T>(\n  input: readonly unknown[],\n  predicate: (value: unknown) => value is T\n): input is readonly T[] {\n  for (let index = 0; index < input.length; index += 1) {\n    if (!(index in input && predicate(input[index]))) {\n      return false;\n    }\n  }\n\n  return true;\n}\n\nfunction isString(value: unknown): value is string {\n  return typeof value === \"string\";\n}\n"],"mappings":";AAQA,SAAgB,oBAAoB,OAA8B;CAChE,IAAI,OAAO,UAAU,UACnB,OAAO;EACL,MAAM;EACN,MAAM;CACR;CAGF,IAAI,mBAAmB,KAAK,GAC1B,OAAO;EACL,MAAM;EACN,MAAM,gBAAgB,KAAK;CAC7B;CAGF,IAAI,aAAa,KAAK,GAAG;EACvB,yBAAyB,KAAK;EAC9B,OAAO;GACL,MAAM;GACN,SAAS,gBAAgB,KAAK;EAChC;CACF;CAEA,IAAI,cAAc,KAAK,GAAG;EACxB,yBAAyB,MAAM,OAAO;EACtC,OAAO,gBAAgB,KAAK;CAC9B;CAEA,IAAI,WAAW,KAAK,GAClB,OAAO,gBAAgB,KAAK;CAG9B,MAAM,IAAI,UACR,kFACF;AACF;AAEA,SAAS,mBAAmB,OAA4C;CACtE,OAAO,MAAM,QAAQ,KAAK,KAAK,cAAc,OAAO,QAAQ;AAC9D;AAEA,SAAS,aACP,OACgE;CAChE,OAAO,MAAM,QAAQ,KAAK;AAC5B;AAEA,SAAS,cAAc,OAAyC;CAC9D,OACE,UAAU,QACV,OAAO,UAAU,YACjB,CAAC,aAAa,KAAK,KACnB,MAAM,SAAS,kBACf,aAAa,SACb,MAAM,QAAQ,MAAM,OAAO;AAE/B;AAEA,SAAS,WAAW,OAAsC;CACxD,OACE,UAAU,QACV,OAAO,UAAU,YACjB,CAAC,aAAa,KAAK,KACnB,MAAM,SAAS,gBACd,OAAO,MAAM,SAAS,YAAY,mBAAmB,MAAM,IAAI;AAEpE;AAEA,SAAS,yBACP,OACoD;CACpD,KAAK,MAAM,QAAQ,OACjB,IAAI,CAAC,yBAAyB,IAAI,GAChC,MAAM,IAAI,UACR,iIACF;AAGN;AAEA,SAAS,yBACP,MACgC;CAChC,IAAI,SAAS,QAAQ,OAAO,SAAS,YAAY,EAAE,UAAU,OAC3D,OAAO;CAGT,IAAI,KAAK,SAAS,QAChB,OAAO,UAAU,QAAQ,OAAO,KAAK,SAAS;CAGhD,IAAI,KAAK,SAAS,SAChB,OACE,WAAW,QACX,OAAO,KAAK,UAAU,aACrB,EAAE,eAAe,SAAS,OAAO,KAAK,cAAc;CAIzD,IAAI,KAAK,SAAS,QAChB,OACE,UAAU,QACV,sBAAsB,KAAK,IAAI,KAC/B,eAAe,QACf,OAAO,KAAK,cAAc,aACzB,EAAE,cAAc,SAAS,OAAO,KAAK,aAAa;CAIvD,OAAO;AACT;AAEA,SAAS,sBAAsB,MAAwB;CACrD,IAAI,OAAO,SAAS,UAClB,OAAO;CAGT,IAAI,SAAS,QAAQ,OAAO,SAAS,YAAY,EAAE,UAAU,OAC3D,OAAO;CAGT,IAAI,KAAK,SAAS,QAChB,OAAO,UAAU,QAAQ,OAAO,KAAK,SAAS;CAGhD,IAAI,KAAK,SAAS,aAChB,OACE,eAAe,QACf,KAAK,cAAc,QACnB,OAAO,KAAK,cAAc,YAC1B,OAAO,OAAO,KAAK,SAAS,EAAE,OAAO,UAAU,OAAO,UAAU,QAAQ;CAI5E,IAAI,KAAK,SAAS,QAChB,OAAO,UAAU,QAAQ,OAAO,KAAK,SAAS;CAGhD,IAAI,KAAK,SAAS,OAChB,OAAO,SAAS,QAAQ,OAAO,KAAK,QAAQ;CAG9C,OAAO;AACT;AAEA,SAAS,cACP,OACA,WACuB;CACvB,KAAK,IAAI,QAAQ,GAAG,QAAQ,MAAM,QAAQ,SAAS,GACjD,IAAI,EAAE,SAAS,SAAS,UAAU,MAAM,MAAM,IAC5C,OAAO;CAIX,OAAO;AACT;AAEA,SAAS,SAAS,OAAiC;CACjD,OAAO,OAAO,UAAU;AAC1B"}

package/dist/session/input.d.ts

@@ -1,5 +1,3 @@
-import { UserModelMessage } from "ai";
-
 //#region src/session/input.d.ts
 type UserTextContent = string | readonly string[];
 interface UserText {
@@ -36,10 +34,8 @@ interface UserMessageFilePart {
 }
 type UserMessageContentPart = UserMessageFilePart | UserMessageImagePart | UserMessageTextPart;
 type UserMessageContent = readonly UserMessageContentPart[];
-type UserMessageMetadata = UserModelMessage["providerOptions"];
 interface UserMessage {
   content: UserMessageContent;
-  metadata?: UserMessageMetadata;
   type: "user-message";
 }
 type UserInput = UserMessage | UserText;

package/dist/session/mapping.js

@@ -19,8 +19,7 @@ function userTextContentToUserContent(text) {
 function userMessageToModelMessage(input) {
 	return {
 		role: "user",
-		content: userMessageContentToUserContent(input.content),
-		...input.metadata === void 0 ? {} : { providerOptions: structuredClone(input.metadata) }
+		content: userMessageContentToUserContent(input.content)
 	};
 }
 function userMessageContentToUserContent(content) {

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 \"./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    ...(input.metadata === undefined\n      ? {}\n      : { providerOptions: structuredClone(input.metadata) }),\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":"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"}
+{"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.js

@@ -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;