@minpeter/pss-runtime 0.1.0-next.2 → 0.1.0-next.4

package/README.md

@@ -50,19 +50,18 @@ consume the events for the run to progress. This is what lets code react to
 created.
 
 `model` is the single public constructor key for model execution. Pass an AI SDK
-`LanguageModel` for the managed runtime path with `instructions`, `tools`, and
-`subagents`, or pass a custom `RuntimeLlm` function when you want to own the model
-adapter yourself:
+`LanguageModel` object and configure runtime-owned prompting through
+`instructions`, `tools`, and `toolChoice`:
 
 ```ts
-import { Agent, type RuntimeLlm } from "@minpeter/pss-runtime";
+import { openai } from "@ai-sdk/openai";
+import { Agent } from "@minpeter/pss-runtime";
 
-const runtimeModel: RuntimeLlm = async ({ history }) => [
-  { role: "assistant", content: `Seen ${history.length} messages.` },
-];
+const model = openai("gpt-4.1-mini");
 
 const agent = new Agent({
-  model: runtimeModel,
+  instructions: "Answer with concise operational notes.",
+  model,
 });
 ```
 
@@ -116,69 +115,154 @@ The public transcript protocol is `AgentEvent`: live runs emit runtime-defined
 events through `run.events()`. Provider/model message history is internal
 continuation state, not a public history API.
 
-## Subagents
+## Delegation
 
-Compose specialist agents by constructing them first and passing them as an
-array. Top-level agents may omit metadata, but agents used as subagents need a
-stable `name` and `description` so the runtime can expose clear model-facing
-delegate tools.
+Delegation is app-owned. Build ordinary tools that call another `Agent`,
+`session.send(...)`, `session.notify(...)`, or host-owned background work, then
+return the compact result shape your product wants the model to see.
 
 ```ts
-const researcher = new Agent({
-  name: "researcher",
-  description: "Researches facts and returns concise evidence.",
+const reader = new Agent({
+  instructions: "Read knowledge-base files and cite paths.",
   model,
-  instructions: "Research facts and return concise evidence.",
+  namespace: "reader",
 });
 
 const coordinator = new Agent({
+  instructions: "Coordinate work and delegate knowledge-base reads.",
   model,
-  instructions: "Coordinate work and delegate when useful.",
-  subagents: [researcher],
+  namespace: "coordinator",
+  tools: {
+    delegate_to_reader: tool({
+      description: "Ask the reader agent to inspect the knowledge base.",
+      execute: async ({ prompt }) => {
+        const run = await reader.session("kb").send(prompt);
+        const text: string[] = [];
+        for await (const event of run.events()) {
+          if (event.type === "assistant-text") {
+            text.push(event.text);
+          }
+        }
+        return { result: text.join("\n") };
+      },
+      inputSchema,
+    }),
+  },
 });
 ```
 
-For each subagent, the parent model receives a generated
-`delegate_to_<name>` tool. The tool accepts `prompt`, optional `description`,
-optional `sessionKey` suffix, and `run_in_background`. A provided `sessionKey`
-is always scoped under the parent session and subagent name; the model cannot
-select an arbitrary child session key. Omitting `run_in_background` defaults to
-blocking behavior and returns compact child text, not the full child event
-stream.
+For background delegation, let your host own task ids, scheduling, output
+storage, and notification resume. The runtime provides generic execution stores,
+notifications, `Agent.resume(...)`, and `run.events()`; it does not generate
+delegation tools or own child-agent lifecycle semantics. See
+the sync and background example packages for app-owned blocking and background
+delegation patterns.
+
+## Plugins
+
+Pass `plugins: [...]` on `Agent` to observe or intercept runtime events. Each
+plugin exposes one handler:
 
 ```ts
-delegate_to_researcher({
-  prompt: "Find the current release notes and summarize the evidence.",
+import type { AgentPlugin } from "@minpeter/pss-runtime";
+import { Agent } from "@minpeter/pss-runtime";
+
+const tracePlugin: AgentPlugin = {
+  name: "trace",
+  on: ({ event }) => {
+    if (event.type === "turn-end") {
+      console.log("turn finished");
+    }
+  },
+};
+
+const agent = new Agent({
+  model,
+  plugins: [tracePlugin],
 });
 ```
 
-When the model sets `run_in_background: true`, the parent run can finish while
-the child keeps working. The launch result includes a `bg_...` `task_id` and
-tells the model to wait for a `<system-reminder>` before retrieving output.
-When background work finishes, the session is notified with compact runtime
-input. Hosts that support durable background work should resume the parent session
-through the notification inbox and drain the returned `AgentRun`.
+### Observe vs intercept
+
+For most events, `on` is observe-only: return nothing (or `{ action: "continue" }`)
+and the runtime emits the event unchanged.
+
+Three input event types support intercept returns:
+
+- `user-text`
+- `user-message`
+- `runtime-input`
+
+Return one of:
+
+- `{ action: "continue" }` — emit the current event (default when omitted)
+- `{ action: "transform", event }` — emit a replacement input event
+- `{ action: "handled" }` — skip emit; for `session.send`, close the run without
+  starting a turn
+
+Plugins run in registration order. Each `transform` updates the event seen by
+later plugins, so transforms chain sequentially.
+
+### Input `meta.source`
+
+The runtime attaches `meta` on input events at API boundaries. Plugins can route
+on `event.meta?.source`:
+
+| `source` | Boundary |
+|----------|----------|
+| `send` | `session.send()` / `agent.send()` |
+| `steer` | `session.steer()` and drained steering queue |
+| `notify` | `session.notify()` runtime input |
+| `delegate` | parent `delegate_to_*` child `session.send()` |
+
+`meta` appears on `run.events()` for input events but is stripped before session
+history persistence and model mapping. It never reaches the LLM prompt.
+
+### Delegate prompt wrapping
+
+Child agents receive delegated prompts with `meta.source === "delegate"`. Wrap or
+rewrite them with a plugin instead of agent-level prompt shims:
 
 ```ts
-delegate_to_researcher({
-  prompt: "Compare the API designs.",
-  run_in_background: true,
-});
+import type { AgentPlugin, UserText } from "@minpeter/pss-runtime";
+import { Agent } from "@minpeter/pss-runtime";
 
-// After the completion reminder arrives:
-background_output({ task_id: "bg_...", block: true });
-background_cancel({ task_id: "bg_..." });
+const pokeTagsPlugin: AgentPlugin = {
+  name: "poke-tags",
+  on: ({ event }) => {
+    if (event.type !== "user-text" || event.meta?.source !== "delegate") {
+      return;
+    }
+
+    const text =
+      typeof event.text === "string" ? event.text : event.text.join("\n");
+
+    return {
+      action: "transform",
+      event: {
+        ...event,
+        text: `<poke>\n${text}\n</poke>`,
+      } satisfies UserText,
+    };
+  },
+};
+
+const executionAgent = new Agent({
+  namespace: "execution",
+  plugins: [pokeTagsPlugin],
+  model,
+});
 ```
 
-The parent model context stays compact by default: completion reminders include
-the task id, subagent name, description, and retrieval instruction. Full child
-traces are not injected into the parent transcript by default. Background jobs
-run in task-scoped child sessions. In-memory job handles are cleaned up after
-completed output retrieval, while durable hosts keep compact completed output
-available through the execution store for reconstructed agents. Background jobs
-launched during the same parent turn share an internal completion barrier:
-successful jobs notify once when the group settles, while failed jobs notify
-immediately.
+The parent coordinator stays unchanged; only the nested child agent carries the
+plugin.
+
+### Migration
+
+- **`plugins[].events.on`** — deprecated. Use top-level `plugins[].on`. The legacy
+  handler still receives every event but intercept returns are ignored (observe-only).
+- **`wrapDelegatePrompt`** — removed. Use a child `plugins[].on` handler that checks
+  `meta.source === "delegate"` and returns `transform`, as above.
 
 ## Send, Host Resume, and Steer
 
@@ -268,9 +352,9 @@ const agent = new Agent({
 });
 ```
 
-For durable sessions, use the exported file POC. Set a stable `namespace` when
-subagents also use durable stores, so reconstructed agents map the same parent
-session and child `sessionKey` suffixes back to the same child transcripts:
+For durable sessions, use the exported file POC. Set a stable `namespace` so
+reconstructed agents map the same app-owned session keys back to the same
+transcripts:
 
 ```ts
 import { FileSessionStore } from "@minpeter/pss-runtime/session-store/file";
@@ -284,15 +368,20 @@ const agent = new Agent({
 });
 ```
 
-Hosts that need durable runs pass `host:` into `Agent`. A durable host owns
-execution state, scheduling, and its session snapshot store through
-`store.sessions`; `ExecutionHost` does not accept a separate `sessionStore`
-override.
+Hosts that need durable runs pass `host:` into `Agent`. The execution subpath
+keeps the durable surface split by responsibility, so hosts can implement only
+the capabilities they need: `SessionHost`, `RunHost`, `CheckpointHost`,
+`EventHost`, `NotificationHost`, `BackgroundSchedulerHost`, and
+`ExecutionTransactionHost`. `ExecutionHost` remains the aggregate contract for
+in-process or full-store hosts, while `DurableBackgroundHost` and
+`DurableNotificationResumeHost` describe the smaller durable surfaces required
+for background scheduling and notification resume.
 
 ```ts
 import { Agent } from "@minpeter/pss-runtime";
 import {
   createInMemoryExecutionHost,
+  type DurableBackgroundHost,
   type ExecutionHost,
 } from "@minpeter/pss-runtime/execution";
 
@@ -304,10 +393,15 @@ const agent = new Agent({
   namespace: "support-agent",
 });
 
-const durableHost: ExecutionHost = {
-  capabilities: { backgroundSubagents: "durable" },
-  scheduler,
-  store,
+const durableHost: DurableBackgroundHost = {
+  capabilities: {},
+  backgroundScheduler,
+  checkpointStore,
+  eventStore,
+  notificationInbox,
+  runStore,
+  sessionStore,
+  transaction,
 };
 ```
 
@@ -315,25 +409,20 @@ const durableHost: ExecutionHost = {
 
 The runtime supports both long-running Node.js processes and edge hosts that
 reconstruct runtime objects between turns. The same public DX stays centered on
-`new Agent({ subagents: [...] })`; host-specific durability and scheduling live
+`new Agent({ model, tools, host })`; host-specific durability and scheduling live
 behind the `host` boundary.
 
 Long-running Node.js can keep an `Agent` and `SessionHandle` alive across turns.
-The default in-memory host advertises in-process background subagent capability,
-so `run_in_background`, `background_output`, and `background_cancel` remain
-available while that process owns the work. `FileSessionStore` persists session
-snapshots only; it does not make background work durable by itself.
+`FileSessionStore` persists session snapshots only; app-owned background work
+needs its own durable task/output storage if it must survive process restarts.
 
 Cloudflare Durable Objects and similar edge hosts should reconstruct `Agent`
-objects per turn and persist opaque session state through `store.sessions`.
-When a host does not advertise background subagent capability, the runtime hides
-background tools from the parent model and exposes blocking delegation only.
-This avoids pretending that in-memory background work survived a hibernation,
-isolate restart, or request deadline.
-
-See `examples/cloudflare-edge-subagent` for an edge-hosted turn loop with a
-Worker/Durable Object-shaped host, and `examples/subagent` for a long-running
-local background subagent flow.
+objects per turn and persist opaque session state through a durable
+`sessionStore`.
+Use `@minpeter/pss-runtime/cloudflare` for the packaged Cloudflare Durable
+Object adapter. See the sync example package for blocking app-owned delegation
+and the background example package for durable background delegation in a local
+interactive CLI.
 
 The same core API supports room/user/session routing through stable session keys.
 
@@ -348,11 +437,10 @@ storage is durable across hibernation/restores, while in-memory state remains
 request-local. Do not store canonical agent session or run state in memory
 attachments.
 
-Durable background subagents require a host capability that owns task ids,
-attempts, leases, checkpoints, cancellation, scheduling, and completion
-notifications. The Cloudflare edge example includes a Worker/Durable
-Object-shaped host that persists scheduled runs and session prompts, sets alarms, and
-resumes work through `Agent.resume(...)`.
+Durable background workflows require host-owned task ids, attempts, leases,
+checkpoints, cancellation, scheduling, session snapshots, and completion
+notifications. The Cloudflare adapter persists scheduled runs and session
+prompts, sets alarms, and resumes work through `Agent.resume(...)`.
 
 ## Checkpoints and Cancellation
 
@@ -368,14 +456,13 @@ calls. Tools are checkpointed before and after execution and receive stable
 `attempt`, `idempotencyKey`, `retryPolicy`, `signal`, and public `toolCallId`
 values. The `@minpeter/pss-runtime/execution` entrypoint also exposes the same
 low-level tool execution checkpoint types for custom resume runners built
-directly on `createLlm`.
+directly on AI SDK `LanguageModel` objects.
 
 These checkpoints are rollback boundaries, not a complete host adapter by
 themselves. Edge hosts still need durable scheduling, leases, resume workers,
 and notification resume handling; externally visible side-effect tools still need
 idempotent execution or a manual recovery flow.
 
-Cancellation is persisted before aborting active work. Parent `delete()` and
-`kill()` mark linked child runs as `cancelled` through the execution store before
-falling back to process-local cleanup, so stale child completions cannot enqueue
-new parent notifications.
+Cancellation is persisted before aborting active work. `delete()` and `dispose()`
+stop the current session's in-process work; durable hosts remain responsible for
+any app-owned background run cancellation, cleanup, and notification policy.

package/dist/agent-host-session-store.js

@@ -1,10 +1,8 @@
-import { executionHost } from "./execution/host.js";
+import { sessionHost } from "./execution/host.js";
 import { MemorySessionStore } from "./session/store/memory.js";
 //#region src/agent-host-session-store.ts
 function sessionStoreForHost(host) {
-	if ("sessionStore" in host && host.sessionStore) return host.sessionStore;
-	const hostExecution = executionHost(host);
-	return hostExecution ? hostExecution.store.sessions : new MemorySessionStore();
+	return sessionHost(host).sessionStore ?? new MemorySessionStore();
 }
 //#endregion
 export { sessionStoreForHost };

package/dist/agent-host-session-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-host-session-store.js","names":[],"sources":["../src/agent-host-session-store.ts"],"sourcesContent":["import { executionHost } from \"./execution/host\";\nimport type { AgentHost } from \"./execution/types\";\nimport { MemorySessionStore } from \"./session/store/memory\";\nimport type { SessionStore } from \"./session/store/types\";\n\nexport function sessionStoreForHost(host: AgentHost): SessionStore {\n  if (\"sessionStore\" in host && host.sessionStore) {\n    return host.sessionStore;\n  }\n\n  const hostExecution = executionHost(host);\n  return hostExecution\n    ? hostExecution.store.sessions\n    : new MemorySessionStore();\n}\n"],"mappings":";;;AAKA,SAAgB,oBAAoB,MAA+B;CACjE,IAAI,kBAAkB,QAAQ,KAAK,cACjC,OAAO,KAAK;CAGd,MAAM,gBAAgB,cAAc,IAAI;CACxC,OAAO,gBACH,cAAc,MAAM,WACpB,IAAI,mBAAmB;AAC7B"}
+{"version":3,"file":"agent-host-session-store.js","names":[],"sources":["../src/agent-host-session-store.ts"],"sourcesContent":["import { sessionHost } from \"./execution/host\";\nimport type { AgentHost } from \"./execution/types\";\nimport { MemorySessionStore } from \"./session/store/memory\";\nimport type { SessionStore } from \"./session/store/types\";\n\nexport function sessionStoreForHost(host: AgentHost): SessionStore {\n  return sessionHost(host).sessionStore ?? new MemorySessionStore();\n}\n"],"mappings":";;;AAKA,SAAgB,oBAAoB,MAA+B;CACjE,OAAO,YAAY,IAAI,EAAE,gBAAgB,IAAI,mBAAmB;AAClE"}

package/dist/agent-loop.js

@@ -1,6 +1,7 @@
 import { modelMessageToAgentEvents } from "./session/mapping.js";
+import { generateModelStep } from "./llm.js";
 //#region src/agent-loop.ts
-async function runAgentLoop({ captureObserverEvents = captureNoObserverEvents, emit, history, llm, signal = new AbortController().signal, toolExecution }) {
+async function runAgentLoop({ captureObserverEvents = captureNoObserverEvents, emit, history, model, signal = new AbortController().signal, toolExecution }) {
 	while (true) {
 		if (signal.aborted) return "aborted";
 		if (await emitBoundary({
@@ -8,9 +9,9 @@ async function runAgentLoop({ captureObserverEvents = captureNoObserverEvents, e
 			event: { type: "step-start" },
 			signal
 		}) === "aborted") return "aborted";
-		const capturedOutput = await captureObserverEvents(() => readLlmOutput({
+		const capturedOutput = await captureObserverEvents(() => readModelOutput({
 			history,
-			llm,
+			model,
 			signal,
 			toolExecution
 		}));
@@ -65,10 +66,11 @@ async function captureNoObserverEvents(callback) {
 	};
 }
 function releaseNoObserverEvents() {}
-async function readLlmOutput({ history, llm, signal, toolExecution }) {
+async function readModelOutput({ history, model, signal, toolExecution }) {
 	try {
-		return await llm({
+		return await generateModelStep({
 			history: history.modelSnapshot(),
+			...model,
 			signal,
 			toolExecution
 		});
@@ -122,9 +124,8 @@ async function appendStepOutput({ emit, history, observerEvents, output, signal
 	await flushObserverEvents();
 	return shouldContinue ? "continue" : "completed";
 }
-function isLaunchOrBlockingObserverEvent(event) {
-	if (event.type === "subagent-job-update") return false;
-	return !(event.type === "subagent-job-end" && event.task_id);
+function isLaunchOrBlockingObserverEvent(_event) {
+	return true;
 }
 //#endregion
 export { runAgentLoop };

package/dist/agent-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loop.js","names":[],"sources":["../src/agent-loop.ts"],"sourcesContent":["import type { ModelMessage } from \"ai\";\nimport type { RuntimeLlm, RuntimeLlmOutput } from \"./llm\";\nimport type { RuntimeToolExecutionContext } from \"./llm-tool-execution\";\nimport type { AgentEvent } from \"./session/events\";\nimport { modelMessageToAgentEvents } from \"./session/mapping\";\n\ninterface ModelHistory {\n  appendModelMessage(message: ModelMessage): void;\n  modelSnapshot(): ModelMessage[];\n}\n\ninterface RunAgentLoopOptions {\n  captureObserverEvents?: ObserverEventCapture;\n  emit: AgentLoopEventListener;\n  history: ModelHistory;\n  llm: RuntimeLlm;\n  signal?: AbortSignal;\n  toolExecution?: RuntimeToolExecutionContext;\n}\n\ntype AgentLoopResult = \"completed\" | \"aborted\";\ntype AgentLoopBoundaryEvent = Extract<\n  AgentEvent,\n  { type: \"step-end\" } | { type: \"step-start\" }\n>;\ninterface AgentLoopBoundaryDecision {\n  readonly runtimeInputAdded?: boolean;\n}\ntype AgentLoopEventListener = (\n  event: AgentEvent\n) =>\n  | AgentLoopBoundaryDecision\n  | Promise<AgentLoopBoundaryDecision | undefined>\n  | undefined;\ntype StepOutputResult = \"aborted\" | \"completed\" | \"continue\";\ninterface ObserverEventCaptureResult<T> {\n  readonly events: AgentEvent[];\n  readonly release: () => void;\n  readonly value: T;\n}\ntype ObserverEventCapture = <T>(\n  callback: () => Promise<T>\n) => Promise<ObserverEventCaptureResult<T>>;\n\nexport async function runAgentLoop({\n  captureObserverEvents = captureNoObserverEvents,\n  emit,\n  history,\n  llm,\n  signal = new AbortController().signal,\n  toolExecution,\n}: RunAgentLoopOptions): Promise<AgentLoopResult> {\n  while (true) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    const stepStartDecision = await emitBoundary({\n      emit,\n      event: { type: \"step-start\" },\n      signal,\n    });\n\n    if (stepStartDecision === \"aborted\") {\n      return \"aborted\";\n    }\n\n    const capturedOutput = await captureObserverEvents(() =>\n      readLlmOutput({ history, llm, signal, toolExecution })\n    );\n    const output = capturedOutput.value;\n\n    if (output === \"aborted\") {\n      return \"aborted\";\n    }\n\n    const result = await appendCapturedStepOutput({\n      capturedOutput,\n      emit,\n      history,\n      output,\n      signal,\n    });\n\n    if (result === \"aborted\") {\n      return \"aborted\";\n    }\n\n    const stepEndDecision = await emitBoundary({\n      emit,\n      event: { type: \"step-end\" },\n      signal,\n    });\n\n    if (stepEndDecision === \"aborted\") {\n      return \"aborted\";\n    }\n\n    // Runtime input after step-end intentionally forces another inference step,\n    // even after final-looking assistant text. Unconditional insertion on every\n    // step-end can create an unbounded loop.\n    if (result === \"completed\" && !stepEndDecision?.runtimeInputAdded) {\n      return \"completed\";\n    }\n  }\n}\n\nasync function emitBoundary({\n  emit,\n  event,\n  signal,\n}: Pick<RunAgentLoopOptions, \"emit\"> & {\n  event: AgentLoopBoundaryEvent;\n  signal: AbortSignal;\n}): Promise<AgentLoopBoundaryDecision | \"aborted\" | undefined> {\n  if (signal.aborted) {\n    return \"aborted\";\n  }\n\n  const abort = createAbortBoundary(signal);\n  try {\n    return await Promise.race([Promise.resolve(emit(event)), abort.promise]);\n  } catch (error) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    throw error;\n  } finally {\n    abort.dispose();\n  }\n}\n\nfunction createAbortBoundary(signal: AbortSignal): {\n  dispose: () => void;\n  promise: Promise<\"aborted\">;\n} {\n  let dispose: () => void = () => undefined;\n\n  const promise = new Promise<\"aborted\">((resolve) => {\n    const onAbort = () => resolve(\"aborted\");\n    dispose = () => signal.removeEventListener(\"abort\", onAbort);\n    signal.addEventListener(\"abort\", onAbort, { once: true });\n  });\n\n  return { dispose, promise };\n}\n\nasync function captureNoObserverEvents<T>(callback: () => Promise<T>): Promise<{\n  readonly events: AgentEvent[];\n  readonly release: () => void;\n  readonly value: T;\n}> {\n  return {\n    events: [],\n    release: releaseNoObserverEvents,\n    value: await callback(),\n  };\n}\n\nfunction releaseNoObserverEvents(): void {\n  return;\n}\n\nasync function readLlmOutput({\n  history,\n  llm,\n  signal,\n  toolExecution,\n}: Pick<RunAgentLoopOptions, \"history\" | \"llm\"> & {\n  signal: AbortSignal;\n  toolExecution?: RuntimeToolExecutionContext;\n}): Promise<RuntimeLlmOutput | \"aborted\"> {\n  try {\n    return await llm({\n      history: history.modelSnapshot(),\n      signal,\n      toolExecution,\n    });\n  } catch (error) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    throw error;\n  }\n}\n\nasync function appendCapturedStepOutput({\n  capturedOutput,\n  emit,\n  history,\n  output,\n  signal,\n}: Pick<RunAgentLoopOptions, \"emit\"> & { history: ModelHistory } & {\n  capturedOutput: ObserverEventCaptureResult<RuntimeLlmOutput | \"aborted\">;\n  output: RuntimeLlmOutput;\n  signal: AbortSignal;\n}): Promise<StepOutputResult> {\n  try {\n    return await appendStepOutput({\n      emit,\n      history,\n      observerEvents: capturedOutput.events,\n      output,\n      signal,\n    });\n  } finally {\n    capturedOutput.release();\n  }\n}\n\nasync function appendStepOutput({\n  emit,\n  history,\n  observerEvents,\n  output,\n  signal,\n}: Pick<RunAgentLoopOptions, \"emit\"> & { history: ModelHistory } & {\n  observerEvents: AgentEvent[];\n  output: RuntimeLlmOutput;\n  signal: AbortSignal;\n}): Promise<StepOutputResult> {\n  if (signal.aborted) {\n    return \"aborted\";\n  }\n\n  let shouldContinue = false;\n  const pendingObserverEvents = observerEvents;\n  const flushObserverEvents = async (\n    shouldFlush: (event: AgentEvent) => boolean = () => true\n  ) => {\n    for (let index = 0; index < pendingObserverEvents.length; ) {\n      const event = pendingObserverEvents[index];\n      if (!(event && shouldFlush(event))) {\n        index += 1;\n        continue;\n      }\n      pendingObserverEvents.splice(index, 1);\n      await emit(event);\n    }\n  };\n\n  for (const message of output) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    history.appendModelMessage(message);\n    const events = modelMessageToAgentEvents(message);\n    const hasToolResult = events.some((event) => event.type === \"tool-result\");\n\n    for (const event of events) {\n      await emit(event);\n      if (event.type === \"tool-call\") {\n        shouldContinue = true;\n        await flushObserverEvents(isLaunchOrBlockingObserverEvent);\n      }\n    }\n\n    if (hasToolResult) {\n      await flushObserverEvents();\n    }\n  }\n\n  await flushObserverEvents();\n\n  return shouldContinue ? \"continue\" : \"completed\";\n}\n\nfunction isLaunchOrBlockingObserverEvent(event: AgentEvent): boolean {\n  if (event.type === \"subagent-job-update\") {\n    return false;\n  }\n\n  return !(event.type === \"subagent-job-end\" && event.task_id);\n}\n"],"mappings":"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"}
+{"version":3,"file":"agent-loop.js","names":[],"sources":["../src/agent-loop.ts"],"sourcesContent":["import type { ModelMessage } from \"ai\";\nimport {\n  generateModelStep,\n  type ModelGenerationOptions,\n  type ModelStepOutput,\n} from \"./llm\";\nimport type { RuntimeToolExecutionContext } from \"./llm-tool-execution\";\nimport type { AgentEvent } from \"./session/events\";\nimport { modelMessageToAgentEvents } from \"./session/mapping\";\n\ninterface ModelHistory {\n  appendModelMessage(message: ModelMessage): void;\n  modelSnapshot(): ModelMessage[];\n}\n\ninterface RunAgentLoopOptions {\n  captureObserverEvents?: ObserverEventCapture;\n  emit: AgentLoopEventListener;\n  history: ModelHistory;\n  model: ModelGenerationOptions;\n  signal?: AbortSignal;\n  toolExecution?: RuntimeToolExecutionContext;\n}\n\ntype AgentLoopResult = \"completed\" | \"aborted\";\ntype AgentLoopBoundaryEvent = Extract<\n  AgentEvent,\n  { type: \"step-end\" } | { type: \"step-start\" }\n>;\ninterface AgentLoopBoundaryDecision {\n  readonly runtimeInputAdded?: boolean;\n}\ntype AgentLoopEventListener = (\n  event: AgentEvent\n) =>\n  | AgentLoopBoundaryDecision\n  | Promise<AgentLoopBoundaryDecision | undefined>\n  | undefined;\ntype StepOutputResult = \"aborted\" | \"completed\" | \"continue\";\ninterface ObserverEventCaptureResult<T> {\n  readonly events: AgentEvent[];\n  readonly release: () => void;\n  readonly value: T;\n}\ntype ObserverEventCapture = <T>(\n  callback: () => Promise<T>\n) => Promise<ObserverEventCaptureResult<T>>;\n\nexport async function runAgentLoop({\n  captureObserverEvents = captureNoObserverEvents,\n  emit,\n  history,\n  model,\n  signal = new AbortController().signal,\n  toolExecution,\n}: RunAgentLoopOptions): Promise<AgentLoopResult> {\n  while (true) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    const stepStartDecision = await emitBoundary({\n      emit,\n      event: { type: \"step-start\" },\n      signal,\n    });\n\n    if (stepStartDecision === \"aborted\") {\n      return \"aborted\";\n    }\n\n    const capturedOutput = await captureObserverEvents(() =>\n      readModelOutput({ history, model, signal, toolExecution })\n    );\n    const output = capturedOutput.value;\n\n    if (output === \"aborted\") {\n      return \"aborted\";\n    }\n\n    const result = await appendCapturedStepOutput({\n      capturedOutput,\n      emit,\n      history,\n      output,\n      signal,\n    });\n\n    if (result === \"aborted\") {\n      return \"aborted\";\n    }\n\n    const stepEndDecision = await emitBoundary({\n      emit,\n      event: { type: \"step-end\" },\n      signal,\n    });\n\n    if (stepEndDecision === \"aborted\") {\n      return \"aborted\";\n    }\n\n    // Runtime input after step-end intentionally forces another inference step,\n    // even after final-looking assistant text. Unconditional insertion on every\n    // step-end can create an unbounded loop.\n    if (result === \"completed\" && !stepEndDecision?.runtimeInputAdded) {\n      return \"completed\";\n    }\n  }\n}\n\nasync function emitBoundary({\n  emit,\n  event,\n  signal,\n}: Pick<RunAgentLoopOptions, \"emit\"> & {\n  event: AgentLoopBoundaryEvent;\n  signal: AbortSignal;\n}): Promise<AgentLoopBoundaryDecision | \"aborted\" | undefined> {\n  if (signal.aborted) {\n    return \"aborted\";\n  }\n\n  const abort = createAbortBoundary(signal);\n  try {\n    return await Promise.race([Promise.resolve(emit(event)), abort.promise]);\n  } catch (error) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    throw error;\n  } finally {\n    abort.dispose();\n  }\n}\n\nfunction createAbortBoundary(signal: AbortSignal): {\n  dispose: () => void;\n  promise: Promise<\"aborted\">;\n} {\n  let dispose: () => void = () => undefined;\n\n  const promise = new Promise<\"aborted\">((resolve) => {\n    const onAbort = () => resolve(\"aborted\");\n    dispose = () => signal.removeEventListener(\"abort\", onAbort);\n    signal.addEventListener(\"abort\", onAbort, { once: true });\n  });\n\n  return { dispose, promise };\n}\n\nasync function captureNoObserverEvents<T>(callback: () => Promise<T>): Promise<{\n  readonly events: AgentEvent[];\n  readonly release: () => void;\n  readonly value: T;\n}> {\n  return {\n    events: [],\n    release: releaseNoObserverEvents,\n    value: await callback(),\n  };\n}\n\nfunction releaseNoObserverEvents(): void {\n  return;\n}\n\nasync function readModelOutput({\n  history,\n  model,\n  signal,\n  toolExecution,\n}: Pick<RunAgentLoopOptions, \"history\" | \"model\"> & {\n  signal: AbortSignal;\n  toolExecution?: RuntimeToolExecutionContext;\n}): Promise<ModelStepOutput | \"aborted\"> {\n  try {\n    return await generateModelStep({\n      history: history.modelSnapshot(),\n      ...model,\n      signal,\n      toolExecution,\n    });\n  } catch (error) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    throw error;\n  }\n}\n\nasync function appendCapturedStepOutput({\n  capturedOutput,\n  emit,\n  history,\n  output,\n  signal,\n}: Pick<RunAgentLoopOptions, \"emit\"> & { history: ModelHistory } & {\n  capturedOutput: ObserverEventCaptureResult<ModelStepOutput | \"aborted\">;\n  output: ModelStepOutput;\n  signal: AbortSignal;\n}): Promise<StepOutputResult> {\n  try {\n    return await appendStepOutput({\n      emit,\n      history,\n      observerEvents: capturedOutput.events,\n      output,\n      signal,\n    });\n  } finally {\n    capturedOutput.release();\n  }\n}\n\nasync function appendStepOutput({\n  emit,\n  history,\n  observerEvents,\n  output,\n  signal,\n}: Pick<RunAgentLoopOptions, \"emit\"> & { history: ModelHistory } & {\n  observerEvents: AgentEvent[];\n  output: ModelStepOutput;\n  signal: AbortSignal;\n}): Promise<StepOutputResult> {\n  if (signal.aborted) {\n    return \"aborted\";\n  }\n\n  let shouldContinue = false;\n  const pendingObserverEvents = observerEvents;\n  const flushObserverEvents = async (\n    shouldFlush: (event: AgentEvent) => boolean = () => true\n  ) => {\n    for (let index = 0; index < pendingObserverEvents.length; ) {\n      const event = pendingObserverEvents[index];\n      if (!(event && shouldFlush(event))) {\n        index += 1;\n        continue;\n      }\n      pendingObserverEvents.splice(index, 1);\n      await emit(event);\n    }\n  };\n\n  for (const message of output) {\n    if (signal.aborted) {\n      return \"aborted\";\n    }\n\n    history.appendModelMessage(message);\n    const events = modelMessageToAgentEvents(message);\n    const hasToolResult = events.some((event) => event.type === \"tool-result\");\n\n    for (const event of events) {\n      await emit(event);\n      if (event.type === \"tool-call\") {\n        shouldContinue = true;\n        await flushObserverEvents(isLaunchOrBlockingObserverEvent);\n      }\n    }\n\n    if (hasToolResult) {\n      await flushObserverEvents();\n    }\n  }\n\n  await flushObserverEvents();\n\n  return shouldContinue ? \"continue\" : \"completed\";\n}\n\nfunction isLaunchOrBlockingObserverEvent(_event: AgentEvent): boolean {\n  return true;\n}\n"],"mappings":"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"}

package/dist/agent-namespace.js

@@ -8,17 +8,13 @@ function agentNamespace(namespace) {
 function namespacePart(value) {
 	return encodeURIComponent(value);
 }
-function parentSessionNamespace({ generation, sessionKey, sessionNamespace }) {
-	return `${sessionNamespace}:session:${namespacePart(sessionKey)}:generation:${generation}`;
-}
 function ownsAgentNamespace(ownerNamespace, sessionNamespace) {
 	return ownerNamespace === sessionNamespace || ownerNamespace?.startsWith(`${sessionNamespace}:session:`) === true;
 }
-function stableAgentNamespace({ name, namespace }) {
-	const stableNamespace = namespace ?? name;
-	return stableNamespace ? agentNamespace(stableNamespace) : randomAgentNamespace();
+function stableAgentNamespace({ namespace }) {
+	return namespace ? agentNamespace(namespace) : randomAgentNamespace();
 }
 //#endregion
-export { ownsAgentNamespace, parentSessionNamespace, stableAgentNamespace };
+export { ownsAgentNamespace, stableAgentNamespace };
 
 //# sourceMappingURL=agent-namespace.js.map

package/dist/agent-namespace.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-namespace.js","names":[],"sources":["../src/agent-namespace.ts"],"sourcesContent":["export function randomAgentNamespace(): string {\n  return agentNamespace(crypto.randomUUID());\n}\n\nexport function agentNamespace(namespace: string): string {\n  return `agent:${namespacePart(namespace)}`;\n}\n\nexport function namespacePart(value: string): string {\n  return encodeURIComponent(value);\n}\n\nexport function parentSessionNamespace({\n  generation,\n  sessionKey,\n  sessionNamespace,\n}: {\n  readonly generation: number;\n  readonly sessionKey: string;\n  readonly sessionNamespace: string;\n}): string {\n  return `${sessionNamespace}:session:${namespacePart(\n    sessionKey\n  )}:generation:${generation}`;\n}\n\nexport function ownsAgentNamespace(\n  ownerNamespace: string | undefined,\n  sessionNamespace: string\n): boolean {\n  return (\n    ownerNamespace === sessionNamespace ||\n    ownerNamespace?.startsWith(`${sessionNamespace}:session:`) === true\n  );\n}\n\nexport function stableAgentNamespace({\n  name,\n  namespace,\n}: {\n  readonly name?: string;\n  readonly namespace?: string;\n}): string {\n  const stableNamespace = namespace ?? name;\n  return stableNamespace\n    ? agentNamespace(stableNamespace)\n    : randomAgentNamespace();\n}\n"],"mappings":";AAAA,SAAgB,uBAA+B;CAC7C,OAAO,eAAe,OAAO,WAAW,CAAC;AAC3C;AAEA,SAAgB,eAAe,WAA2B;CACxD,OAAO,SAAS,cAAc,SAAS;AACzC;AAEA,SAAgB,cAAc,OAAuB;CACnD,OAAO,mBAAmB,KAAK;AACjC;AAEA,SAAgB,uBAAuB,EACrC,YACA,YACA,oBAKS;CACT,OAAO,GAAG,iBAAiB,WAAW,cACpC,UACF,EAAE,cAAc;AAClB;AAEA,SAAgB,mBACd,gBACA,kBACS;CACT,OACE,mBAAmB,oBACnB,gBAAgB,WAAW,GAAG,iBAAiB,UAAU,MAAM;AAEnE;AAEA,SAAgB,qBAAqB,EACnC,MACA,aAIS;CACT,MAAM,kBAAkB,aAAa;CACrC,OAAO,kBACH,eAAe,eAAe,IAC9B,qBAAqB;AAC3B"}
+{"version":3,"file":"agent-namespace.js","names":[],"sources":["../src/agent-namespace.ts"],"sourcesContent":["export function randomAgentNamespace(): string {\n  return agentNamespace(crypto.randomUUID());\n}\n\nexport function agentNamespace(namespace: string): string {\n  return `agent:${namespacePart(namespace)}`;\n}\n\nexport function namespacePart(value: string): string {\n  return encodeURIComponent(value);\n}\n\nexport function parentSessionNamespace({\n  generation,\n  sessionKey,\n  sessionNamespace,\n}: {\n  readonly generation: number;\n  readonly sessionKey: string;\n  readonly sessionNamespace: string;\n}): string {\n  return `${sessionNamespace}:session:${namespacePart(\n    sessionKey\n  )}:generation:${generation}`;\n}\n\nexport function ownsAgentNamespace(\n  ownerNamespace: string | undefined,\n  sessionNamespace: string\n): boolean {\n  return (\n    ownerNamespace === sessionNamespace ||\n    ownerNamespace?.startsWith(`${sessionNamespace}:session:`) === true\n  );\n}\n\nexport function stableAgentNamespace({\n  namespace,\n}: {\n  readonly namespace?: string;\n}): string {\n  return namespace ? agentNamespace(namespace) : randomAgentNamespace();\n}\n"],"mappings":";AAAA,SAAgB,uBAA+B;CAC7C,OAAO,eAAe,OAAO,WAAW,CAAC;AAC3C;AAEA,SAAgB,eAAe,WAA2B;CACxD,OAAO,SAAS,cAAc,SAAS;AACzC;AAEA,SAAgB,cAAc,OAAuB;CACnD,OAAO,mBAAmB,KAAK;AACjC;AAgBA,SAAgB,mBACd,gBACA,kBACS;CACT,OACE,mBAAmB,oBACnB,gBAAgB,WAAW,GAAG,iBAAiB,UAAU,MAAM;AAEnE;AAEA,SAAgB,qBAAqB,EACnC,aAGS;CACT,OAAO,YAAY,eAAe,SAAS,IAAI,qBAAqB;AACtE"}

package/dist/agent-options.d.ts

@@ -1,35 +1,20 @@
-import { AgentToolChoice, RuntimeLlm } from "./llm.js";
+import { AgentToolChoice } from "./llm.js";
 import { AgentHost } from "./execution/types.js";
 import { AgentPlugin } from "./plugins.js";
-import { Agent } from "./agent.js";
 import { LanguageModel, ToolSet } from "ai";
 
 //#region src/agent-options.d.ts
 interface AgentLanguageModelOptions {
-  readonly description?: string;
   readonly host?: AgentHost;
   readonly instructions?: string;
   readonly model: LanguageModel;
-  readonly name?: string;
   readonly namespace?: string;
   readonly plugins?: readonly AgentPlugin[];
-  readonly subagents?: readonly Agent[];
   readonly toolChoice?: AgentToolChoice;
   readonly tools?: ToolSet;
 }
-interface AgentRuntimeModelOptions {
-  readonly description?: string;
-  readonly host?: AgentHost;
-  readonly instructions?: never;
-  readonly model: RuntimeLlm;
-  readonly name?: string;
-  readonly namespace?: string;
-  readonly plugins?: readonly AgentPlugin[];
-  readonly subagents?: never;
-  readonly toolChoice?: never;
-  readonly tools?: never;
-}
-type AgentOptions = AgentLanguageModelOptions | AgentRuntimeModelOptions;
+type AgentOptions = AgentLanguageModelOptions;
+type AgentConstructionOptions = AgentOptions;
 //#endregion
-export { AgentOptions };
+export { AgentConstructionOptions, AgentOptions };
 //# sourceMappingURL=agent-options.d.ts.map

package/dist/agent-options.js

@@ -1,16 +1,10 @@
 //#region src/agent-options.ts
 function assertAgentOptions(options) {
 	if (options === null || typeof options !== "object") throw new TypeError("Agent options are required. Provide { model }.");
-	if ("sessions" in options) throw new TypeError("Agent: unsupported options.sessions. Use host: { sessionStore } and namespace instead.");
-	if ("runtime" in options) throw new TypeError("Agent: unsupported options.runtime. Use host.");
-	if ("llm" in options) throw new TypeError("Agent: unsupported options.llm. Use model for both AI SDK models and custom RuntimeLlm functions.");
 	if (!("model" in options && options.model != null)) throw new TypeError("Agent: missing options.model.");
-	if (typeof options.model !== "function" && (typeof options.model !== "object" || options.model === null)) throw new TypeError("Agent: invalid options.model.");
-}
-function hasRuntimeModel(options) {
-	return typeof options.model === "function";
+	if (typeof options.model !== "object" || options.model === null) throw new TypeError("Agent: invalid options.model.");
 }
 //#endregion
-export { assertAgentOptions, hasRuntimeModel };
+export { assertAgentOptions };
 
 //# sourceMappingURL=agent-options.js.map

package/dist/agent-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-options.js","names":[],"sources":["../src/agent-options.ts"],"sourcesContent":["import type { LanguageModel, ToolSet } from \"ai\";\nimport type { Agent } from \"./agent\";\nimport type { AgentHost } from \"./execution/types\";\nimport type { AgentToolChoice, RuntimeLlm } from \"./llm\";\nimport type { AgentPlugin } from \"./plugins\";\n\ninterface AgentLanguageModelOptions {\n  readonly description?: string;\n  readonly host?: AgentHost;\n  readonly instructions?: string;\n  readonly model: LanguageModel;\n  readonly name?: string;\n  readonly namespace?: string;\n  readonly plugins?: readonly AgentPlugin[];\n  readonly subagents?: readonly Agent[];\n  readonly toolChoice?: AgentToolChoice;\n  readonly tools?: ToolSet;\n}\n\ninterface AgentRuntimeModelOptions {\n  readonly description?: string;\n  readonly host?: AgentHost;\n  readonly instructions?: never;\n  readonly model: RuntimeLlm;\n  readonly name?: string;\n  readonly namespace?: string;\n  readonly plugins?: readonly AgentPlugin[];\n  readonly subagents?: never;\n  readonly toolChoice?: never;\n  readonly tools?: never;\n}\n\nexport type AgentModelOptions = Pick<\n  AgentLanguageModelOptions,\n  \"instructions\" | \"model\" | \"toolChoice\"\n>;\nexport type AgentOptions = AgentLanguageModelOptions | AgentRuntimeModelOptions;\n\nexport function assertAgentOptions(\n  options: unknown\n): asserts options is AgentOptions {\n  if (options === null || typeof options !== \"object\") {\n    throw new TypeError(\"Agent options are required. Provide { model }.\");\n  }\n\n  if (\"sessions\" in options) {\n    throw new TypeError(\n      \"Agent: unsupported options.sessions. Use host: { sessionStore } and namespace instead.\"\n    );\n  }\n\n  if (\"runtime\" in options) {\n    throw new TypeError(\"Agent: unsupported options.runtime. Use host.\");\n  }\n\n  if (\"llm\" in options) {\n    throw new TypeError(\n      \"Agent: unsupported options.llm. Use model for both AI SDK models and custom RuntimeLlm functions.\"\n    );\n  }\n\n  const hasModel = \"model\" in options && options.model != null;\n\n  if (!hasModel) {\n    throw new TypeError(\"Agent: missing options.model.\");\n  }\n\n  if (\n    typeof options.model !== \"function\" &&\n    (typeof options.model !== \"object\" || options.model === null)\n  ) {\n    throw new TypeError(\"Agent: invalid options.model.\");\n  }\n}\n\nexport function hasRuntimeModel(\n  options: AgentOptions\n): options is AgentRuntimeModelOptions {\n  return typeof options.model === \"function\";\n}\n"],"mappings":";AAsCA,SAAgB,mBACd,SACiC;CACjC,IAAI,YAAY,QAAQ,OAAO,YAAY,UACzC,MAAM,IAAI,UAAU,gDAAgD;CAGtE,IAAI,cAAc,SAChB,MAAM,IAAI,UACR,wFACF;CAGF,IAAI,aAAa,SACf,MAAM,IAAI,UAAU,+CAA+C;CAGrE,IAAI,SAAS,SACX,MAAM,IAAI,UACR,mGACF;CAKF,IAAI,EAFa,WAAW,WAAW,QAAQ,SAAS,OAGtD,MAAM,IAAI,UAAU,+BAA+B;CAGrD,IACE,OAAO,QAAQ,UAAU,eACxB,OAAO,QAAQ,UAAU,YAAY,QAAQ,UAAU,OAExD,MAAM,IAAI,UAAU,+BAA+B;AAEvD;AAEA,SAAgB,gBACd,SACqC;CACrC,OAAO,OAAO,QAAQ,UAAU;AAClC"}
+{"version":3,"file":"agent-options.js","names":[],"sources":["../src/agent-options.ts"],"sourcesContent":["import type { LanguageModel, ToolSet } from \"ai\";\nimport type { AgentHost } from \"./execution/types\";\nimport type { AgentToolChoice } from \"./llm\";\nimport type { AgentPlugin } from \"./plugins\";\n\nexport interface AgentLanguageModelOptions {\n  readonly host?: AgentHost;\n  readonly instructions?: string;\n  readonly model: LanguageModel;\n  readonly namespace?: string;\n  readonly plugins?: readonly AgentPlugin[];\n  readonly toolChoice?: AgentToolChoice;\n  readonly tools?: ToolSet;\n}\n\nexport type AgentModelOptions = Pick<\n  AgentLanguageModelOptions,\n  \"instructions\" | \"model\" | \"toolChoice\" | \"tools\"\n>;\nexport type AgentOptions = AgentLanguageModelOptions;\n\nexport type AgentConstructionOptions = AgentOptions;\n\nexport function assertAgentOptions(\n  options: unknown\n): asserts options is AgentConstructionOptions {\n  if (options === null || typeof options !== \"object\") {\n    throw new TypeError(\"Agent options are required. Provide { model }.\");\n  }\n\n  const hasModel = \"model\" in options && options.model != null;\n\n  if (!hasModel) {\n    throw new TypeError(\"Agent: missing options.model.\");\n  }\n\n  if (typeof options.model !== \"object\" || options.model === null) {\n    throw new TypeError(\"Agent: invalid options.model.\");\n  }\n}\n"],"mappings":";AAuBA,SAAgB,mBACd,SAC6C;CAC7C,IAAI,YAAY,QAAQ,OAAO,YAAY,UACzC,MAAM,IAAI,UAAU,gDAAgD;CAKtE,IAAI,EAFa,WAAW,WAAW,QAAQ,SAAS,OAGtD,MAAM,IAAI,UAAU,+BAA+B;CAGrD,IAAI,OAAO,QAAQ,UAAU,YAAY,QAAQ,UAAU,MACzD,MAAM,IAAI,UAAU,+BAA+B;AAEvD"}