@yolk-sdk/agent 0.1.0-canary.114 → 0.1.0-canary.115

package/README.md

@@ -121,9 +121,9 @@ import { FauxProvider, Reply, TestToolExecutor } from '@yolk-sdk/agent/loop/test
 
 ## Headless React chat
 
-`useAgentChat` exposes protocol messages, render-oriented chat messages, run/error/waiting state,
-and actions for submit, stop, edit, regenerate, delete, tool approval, question, and typed input responses. The
-package supplies no components, styling, auth, or route ownership, and React remains an optional
+`useAgentChat` exposes protocol messages, render-oriented chat messages, the run `status`
+(`AgentStatus`), per-subagent `subagents` statuses, running/waiting flags, and actions for submit,
+stop, edit, regenerate, delete, tool approval, question, and typed input responses. The package supplies no components, styling, auth, or route ownership, and React remains an optional
 peer used only by React subpaths.
 
 Chat ADTs on `@yolk-sdk/agent/react` are value constructors: `AgentChatPart`, `ChatToolState`,
@@ -455,8 +455,9 @@ policy and emits protocol-visible retry/error state:
 - `AgentError.provider` preserves final terminal metadata.
 - `AgentErrorCode` includes `rate_limit`, `overloaded`, `context_overflow`, and generic
   `provider_error`.
-- Client and React state keep `error: string | null` for compatibility and add typed `errorInfo` /
-  `retryInfo`.
+- Client and React state carry an `AgentStatus` (ADR 0010): terminal errors are `Failed` (with the
+  `AgentError` when the stream sent one) and pending retries `Working(Retrying)`
+  (`agentStatusRetry`).
 - `buildAgentChatItems` can project active retry state as an `AgentChatItem` with `_tag: 'Retry'`.
 - Anthropic prompt-too-long responses become non-retryable `context_overflow`; the host-owned
   compaction wrapper may compact and retry once.

package/dist/client/index.d.mts

@@ -1,4 +1,4 @@
 import { documentPartFromTextFile, textFromBlob } from "./attachments.mjs";
-import { AgentClientState, AgentRunStatus, AgentToolRun, AgentTranscript, ApplyAgentEventOptions, appendAgentMessage, applyAgentEvent, completedToolRuns, initialAgentClientState, isActiveToolRun, markAgentAborted, markAgentError, reduceAgentEvents, submitAgentUserMessage, toolRunsFromHitlRequests } from "./state.mjs";
+import { AgentClientState, AgentToolRun, AgentTranscript, ApplyAgentEventOptions, appendAgentMessage, applyAgentEvent, completedToolRuns, initialAgentClientState, isActiveToolRun, markAgentAborted, markAgentError, reduceAgentEvents, submitAgentUserMessage, toolRunsFromHitlRequests } from "./state.mjs";
 import { AgentHttpResponseInfo, AgentRunContinuationOptions, AgentRunIdleReconnectOptions, AgentTransportError, CancelAgentRunRequest, StreamAgentEventHandler, StreamAgentEventsRequest, StreamAgentEventsUntilTerminalRequest, StreamAgentRunEventsRequest, StreamAgentRunEventsUntilTerminalRequest, StreamAgentRunHitlResponseEventsRequest, StreamAgentRunHitlResponseEventsUntilTerminalRequest, StreamCloudflareAgentEventsRequest, SubmitInputResponseRequest, SubmitInteractionResponseRequest, SubmitQuestionResponseRequest, SubmitToolApprovalResponseRequest, agentRunEndpointWithStartIndex, agentRunIdFromHeaders, agentRunStreamStartIndexFromHeaders, agentRunStreamTailIndexFromHeaders, cancelAgentRun, collectAgentEvents, streamAgentEventStream, streamAgentEventStreamUntilTerminal, streamAgentRunEventStream, streamAgentRunEventStreamUntilTerminal, streamAgentRunHitlResponseEventStream, streamAgentRunHitlResponseEventStreamUntilTerminal, streamCloudflareAgentEventStream, streamInputResponseEventStream, streamInteractionResponseEventStream, streamQuestionResponseEventStream, streamToolApprovalResponseEventStream } from "./transport.mjs";
-export { type AgentClientState, type AgentHttpResponseInfo, type AgentRunContinuationOptions, type AgentRunIdleReconnectOptions, type AgentRunStatus, type AgentToolRun, type AgentTranscript, AgentTransportError, type ApplyAgentEventOptions, type CancelAgentRunRequest, type StreamAgentEventHandler, type StreamAgentEventsRequest, type StreamAgentEventsUntilTerminalRequest, type StreamAgentRunEventsRequest, type StreamAgentRunEventsUntilTerminalRequest, type StreamAgentRunHitlResponseEventsRequest, type StreamAgentRunHitlResponseEventsUntilTerminalRequest, type StreamCloudflareAgentEventsRequest, type SubmitInputResponseRequest, type SubmitInteractionResponseRequest, type SubmitQuestionResponseRequest, type SubmitToolApprovalResponseRequest, agentRunEndpointWithStartIndex, agentRunIdFromHeaders, agentRunStreamStartIndexFromHeaders, agentRunStreamTailIndexFromHeaders, appendAgentMessage, applyAgentEvent, cancelAgentRun, collectAgentEvents, completedToolRuns, documentPartFromTextFile, initialAgentClientState, isActiveToolRun, markAgentAborted, markAgentError, reduceAgentEvents, streamAgentEventStream, streamAgentEventStreamUntilTerminal, streamAgentRunEventStream, streamAgentRunEventStreamUntilTerminal, streamAgentRunHitlResponseEventStream, streamAgentRunHitlResponseEventStreamUntilTerminal, streamCloudflareAgentEventStream, streamInputResponseEventStream, streamInteractionResponseEventStream, streamQuestionResponseEventStream, streamToolApprovalResponseEventStream, submitAgentUserMessage, textFromBlob, toolRunsFromHitlRequests };
+export { type AgentClientState, type AgentHttpResponseInfo, type AgentRunContinuationOptions, type AgentRunIdleReconnectOptions, type AgentToolRun, type AgentTranscript, AgentTransportError, type ApplyAgentEventOptions, type CancelAgentRunRequest, type StreamAgentEventHandler, type StreamAgentEventsRequest, type StreamAgentEventsUntilTerminalRequest, type StreamAgentRunEventsRequest, type StreamAgentRunEventsUntilTerminalRequest, type StreamAgentRunHitlResponseEventsRequest, type StreamAgentRunHitlResponseEventsUntilTerminalRequest, type StreamCloudflareAgentEventsRequest, type SubmitInputResponseRequest, type SubmitInteractionResponseRequest, type SubmitQuestionResponseRequest, type SubmitToolApprovalResponseRequest, agentRunEndpointWithStartIndex, agentRunIdFromHeaders, agentRunStreamStartIndexFromHeaders, agentRunStreamTailIndexFromHeaders, appendAgentMessage, applyAgentEvent, cancelAgentRun, collectAgentEvents, completedToolRuns, documentPartFromTextFile, initialAgentClientState, isActiveToolRun, markAgentAborted, markAgentError, reduceAgentEvents, streamAgentEventStream, streamAgentEventStreamUntilTerminal, streamAgentRunEventStream, streamAgentRunEventStreamUntilTerminal, streamAgentRunHitlResponseEventStream, streamAgentRunHitlResponseEventStreamUntilTerminal, streamCloudflareAgentEventStream, streamInputResponseEventStream, streamInteractionResponseEventStream, streamQuestionResponseEventStream, streamToolApprovalResponseEventStream, submitAgentUserMessage, textFromBlob, toolRunsFromHitlRequests };

package/dist/client/state.d.mts

@@ -1,8 +1,7 @@
 import { Data } from "effect";
-import { AgentError, AgentEvent, AgentMessage, AgentRetry, HitlRequest, InputRequest, InputResponse, InteractionRequest, InteractionResponse, QuestionRequest, QuestionResponse, ToolApprovalRequest, ToolCall, ToolResult, UserMessage } from "@yolk-sdk/agent/protocol";
+import { AgentError, AgentEvent, AgentMessage, AgentStatus, AgentStatusTree, HitlRequest, InputRequest, InputResponse, InteractionRequest, InteractionResponse, QuestionRequest, QuestionResponse, ToolApprovalRequest, ToolCall, ToolResult, UserMessage } from "@yolk-sdk/agent/protocol";
 
 //#region src/client/state.d.ts
-type AgentRunStatus = 'idle' | 'running' | 'waiting' | 'done' | 'error' | 'aborted';
 type AgentToolRun = {
   readonly _tag: 'InputStreaming';
   readonly id: string;
@@ -479,15 +478,13 @@ declare const AgentToolRun: {
   };
 };
 type AgentClientState = {
-  readonly status: AgentRunStatus;
+  /** Run status; failures and pending retries live here (`Failed`, `Working(Retrying)`). */readonly status: AgentStatus;
+  readonly subagents: AgentStatusTree['subagents'];
   readonly messages: ReadonlyArray<AgentMessage>;
   readonly liveMessages: ReadonlyArray<AgentMessage>;
   readonly text: string;
   readonly reasoning: string;
   readonly toolRuns: ReadonlyArray<AgentToolRun>;
-  readonly error: string | null;
-  readonly errorInfo: AgentError | null;
-  readonly retryInfo: AgentRetry | null;
   readonly seenEventIds: ReadonlyArray<string>;
 };
 type ApplyAgentEventOptions = {
@@ -538,9 +535,11 @@ declare const appendAgentMessage: (messages: ReadonlyArray<AgentMessage>, messag
 declare const applyAgentEvent: (state: AgentClientState, event: AgentEvent) => AgentClientState;
 declare const applyAgentEventWithOptions: (state: AgentClientState, event: AgentEvent, options?: ApplyAgentEventOptions) => AgentClientState;
 declare const submitAgentUserMessage: (state: AgentClientState, message: UserMessage) => AgentClientState;
-declare const markAgentError: (state: AgentClientState, message?: string, errorInfo?: AgentError | null) => AgentClientState;
+/** Marks the run `Failed`, e.g. after a transport failure that produced no `AgentError` event. */
+declare const markAgentError: (state: AgentClientState, message?: string, error?: AgentError) => AgentClientState;
+/** The person stopped the run; per OSC 7501 a cancelled run is `Idle`. */
 declare const markAgentAborted: (state: AgentClientState) => AgentClientState;
 declare const reduceAgentEvents: (events: ReadonlyArray<AgentEvent>, initialState?: AgentClientState, options?: ApplyAgentEventOptions) => AgentClientState;
 //#endregion
-export { AgentClientState, AgentRunStatus, AgentToolRun, AgentTranscript, ApplyAgentEventOptions, appendAgentMessage, applyAgentEvent, applyAgentEventWithOptions, completedToolRuns, initialAgentClientState, isActiveToolRun, markAgentAborted, markAgentError, reduceAgentEvents, submitAgentUserMessage, toolRunsFromHitlRequests };
+export { AgentClientState, AgentToolRun, AgentTranscript, ApplyAgentEventOptions, appendAgentMessage, applyAgentEvent, applyAgentEventWithOptions, completedToolRuns, initialAgentClientState, isActiveToolRun, markAgentAborted, markAgentError, reduceAgentEvents, submitAgentUserMessage, toolRunsFromHitlRequests };
 //# sourceMappingURL=state.d.mts.map

package/dist/client/state.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"state.d.mts","names":[],"sources":["../../src/client/state.ts"],"mappings":"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"}
+{"version":3,"file":"state.d.mts","names":[],"sources":["../../src/client/state.ts"],"mappings":";;;;KA0BY,YAAA;EAAA,SAEG,IAAA;EAAA,SACA,EAAA;EAAA,SACA,IAAA;EAAA,SACA,KAAA;AAAA;EAAA,SAEA,IAAA;EAAA,SAA6B,IAAA,EAAM,QAAA;AAAA;EAAA,SAEnC,IAAA;EAAA,SACA,IAAA,EAAM,QAAA;EAAA,SACN,OAAA,GAAU,mBAAA;AAAA;EAAA,SAEV,IAAA;EAAA,SAAyB,UAAA;EAAA,SAA6B,MAAA;AAAA;EAAA,SACtD,IAAA;EAAA,SAAoC,OAAA,EAAS,eAAA;AAAA;EAAA,SAE7C,IAAA;EAAA,SACA,QAAA,EAAU,gBAAA;EAAA,SACV,OAAA,GAAU,eAAA;AAAA;EAAA,SAGV,IAAA;EAAA,SACA,QAAA,EAAU,gBAAA;EAAA,SACV,OAAA,GAAU,eAAA;AAAA;EAAA,SAEV,IAAA;EAAA,SAAiC,OAAA,EAAS,YAAA;AAAA;EAAA,SAE1C,IAAA;EAAA,SACA,QAAA,EAAU,aAAA;EAAA,SACV,OAAA,GAAU,YAAA;AAAA;EAAA,SAGV,IAAA;EAAA,SACA,QAAA,EAAU,aAAA;EAAA,SACV,OAAA,GAAU,YAAA;AAAA;EAAA,SAEV,IAAA;EAAA,SAAuC,OAAA,EAAS,kBAAA;AAAA;EAAA,SAEhD,IAAA;EAAA,SACA,QAAA,EAAU,mBAAA;EAAA,SACV,OAAA,GAAU,kBAAA;AAAA;EAAA,SAGV,IAAA;EAAA,SACA,QAAA,EAAU,mBAAA;EAAA,SACV,OAAA,GAAU,kBAAA;AAAA;EAAA,SAGV,IAAA;EAAA,SACA,IAAA,EAAM,QAAA;EAAA,SACN,WAAA,UAjCU;EAAA,SAmCV,WAAA;AAAA;EAAA,SAGA,IAAA;EAAA,SACA,IAAA,EAAM,QAAA;EAAA,SACN,MAAA,EAAQ,UAAA;EAAA,SACR,WAAA;EAAA,SACA,SAAA;AAAA;EAAA,SAGA,IAAA;EAAA,SACA,IAAA,EAAM,QAAA;EAAA,SACN,MAAA,EAAQ,UAAA;EAAA,SACR,WAAA;EAAA,SACA,SAAA;AAAA;EAAA,SAGA,IAAA;EAAA,SACA,IAAA,EAAM,QAAA;EAAA,SACN,OAAA;EAAA,SACA,SAAA;AAAA;EAAA,SAEA,IAAA;EAAA,SAAoC,IAAA,EAAM,QAAA;EAAA,SAAmB,MAAA,EAAQ,UAAA;AAAA;AAAA,cAEvE,YAAA;EAAA;;;;;;;;mBArEqC,QAAA;EAAA;EAAA;;mBAG7B,QAAA;IAAA,mBACI,mBAAA;EAAA;EAAA;;;;;;;sBAGmC,eAAA;EAAA;EAAA;;uBAGnC,gBAAA;IAAA,mBACA,eAAA;EAAA;EAAA;;uBAIA,gBAAA;IAAA,mBACA,eAAA;EAAA;EAAA;;sBAEgC,YAAA;EAAA;EAAA;;uBAGhC,aAAA;IAAA,mBACA,YAAA;EAAA;EAAA;;uBAIA,aAAA;IAAA,mBACA,YAAA;EAAA;EAAA;;sBAEsC,kBAAA;EAAA;EAAA;;uBAGtC,mBAAA;IAAA,mBACA,kBAAA;EAAA;EAAA;;uBAIA,mBAAA;IAAA,mBACA,kBAAA;EAAA;EAAA;;mBAIJ,QAAA;IAAA,8BAb0C;IAAA;;;;mBAoB1C,QAAA;IAAA,iBACE,UAAA;IAAA;;;;;mBAMF,QAAA;IAAA,iBACE,UAAA;IAAA;;;;;mBAMF,QAAA;IAAA;;;;;mBAIoC,QAAA;IAAA,iBAA2B,UAAA;EAAA;EAAA;;;;;;;;;mBAnElC,QAAA;EAAA;IAAA;;;mBAG7B,QAAA;IAAA,mBACI,mBAAA;EAAA;IAAA;;;;;;;;;sBAGmC,eAAA;EAAA;IAAA;;;uBAGnC,gBAAA;IAAA,mBACA,eAAA;EAAA;IAAA;;;uBAIA,gBAAA;IAAA,mBACA,eAAA;EAAA;IAAA;;;sBAEgC,YAAA;EAAA;IAAA;;;uBAGhC,aAAA;IAAA,mBACA,YAAA;EAAA;IAAA;;;uBAIA,aAAA;IAAA,mBACA,YAAA;EAAA;IAAA;;;sBAEsC,kBAAA;EAAA;IAAA;;;uBAGtC,mBAAA;IAAA,mBACA,kBAAA;EAAA;IAAA;;;uBAIA,mBAAA;IAAA,mBACA,kBAAA;EAAA;IAAA;;;mBAIJ,QAAA;IAAA,8BAqBA;IAAA;;;;;mBAdA,QAAA;IAAA,iBACE,UAAA;IAAA;;;;;;mBAMF,QAAA;IAAA,iBACE,UAAA;IAAA;;;;;;mBAMF,QAAA;IAAA;;;;;;mBAIoC,QAAA;IAAA,iBAA2B,UAAA;EAAA;IAAA;;;;;;;;;;;;uBAnElC,QAAA;MAAA;MAAA;;uBAG7B,QAAA;QAAA,mBACI,mBAAA;MAAA;MAAA;;;;;;;0BAGmC,eAAA;MAAA;MAAA;;2BAGnC,gBAAA;QAAA,mBACA,eAAA;MAAA;MAAA;;2BAIA,gBAAA;QAAA,mBACA,eAAA;MAAA;MAAA;;0BAEgC,YAAA;MAAA;MAAA;;2BAGhC,aAAA;QAAA,mBACA,YAAA;MAAA;MAAA;;2BAIA,aAAA;QAAA,mBACA,YAAA;MAAA;MAAA;;0BAEsC,kBAAA;MAAA;MAAA;;2BAGtC,mBAAA;QAAA,mBACA,kBAAA;MAAA;MAAA;;2BAIA,mBAAA;QAAA,mBACA,kBAAA;MAAA;MAAA;;uBAIJ,QAAA;QAAA;;;;;uBAOA,QAAA;QAAA,iBACE,UAAA;QAAA;;;;;uBAMF,QAAA;QAAA,iBACE,UAAA;QAAA;;;;;uBAMF,QAAA;QAAA;;;;;uBAIoC,QAAA;QAAA,iBAA2B,UAAA;MAAA;IAAA;;;;;;;;;;uBAnElC,QAAA;MAAA;MAAA;;uBAG7B,QAAA;QAAA,mBACI,mBAAA;MAAA;MAAA;;;;;;;0BAGmC,eAAA;MAAA;MAAA;;2BAGnC,gBAAA;QAAA,mBACA,eAAA;MAAA;MAAA;;2BAIA,gBAAA;QAAA,mBACA,eAAA;MAAA;MAAA;;0BAEgC,YAAA;MAAA;MAAA;;2BAGhC,aAAA;QAAA,mBACA,YAAA;MAAA;MAAA;;2BAIA,aAAA;QAAA,mBACA,YAAA;MAAA;MAAA;;0BAEsC,kBAAA;MAAA;MAAA;;2BAGtC,mBAAA;QAAA,mBACA,kBAAA;MAAA;MAAA;;2BAIA,mBAAA;QAAA,mBACA,kBAAA;MAAA;MAAA;;uBAIJ,QAAA;QAAA;;;;;uBAOA,QAAA;QAAA,iBACE,UAAA;QAAA;;;;;uBAMF,QAAA;QAAA,iBACE,UAAA;QAAA;;;;;uBAMF,QAAA;QAAA;;;;;uBAIoC,QAAA;QAAA,iBAA2B,UAAA;MAAA;IAAA;;;KASxE,gBAAA;EArEgD,mGAuEjD,MAAA,EAAQ,WAAA;EAAA,SACR,SAAA,EAAW,eAAA;EAAA,SACX,QAAA,EAAU,aAAA,CAAc,YAAA;EAAA,SACxB,YAAA,EAAc,aAAA,CAAc,YAAA;EAAA,SAC5B,IAAA;EAAA,SACA,SAAA;EAAA,SACA,QAAA,EAAU,aAAA,CAAc,YAAA;EAAA,SACxB,YAAA,EAAc,aAAA;AAAA;AAAA,KAGb,sBAAA;EAAA,SACD,KAAK;AAAA;AAAA,KAcJ,eAAA,aAA4B,YAAA,KAAiB,KAAA,CAAM,YAAA;AAAA,cAElD,uBAAA,EAAyB,gBASrC;AAAA,cA+CY,eAAA,GAAmB,GAAA,EAAK,YAAA,KAAY,GAAA;EAAA;;;;;;iBAjKC,QAAA;AAAA;EAAA;iBAG7B,QAAA;EAAA,mBACI,mBAAA;AAAA;EAAA;oBAGmC,eAAA;AAAA;EAAA;oBAWH,YAAA;AAAA;EAAA;oBAWM,kBAAA;AAAA;EAAA;qBAGtC,mBAAA;EAAA,mBACA,kBAAA;AAAA;EAAA;iBASJ,QAAA;EAAA,8BAb0C;EAAA;;cAgJlD,iBAAA,GAAqB,IAAA,EAAM,aAAA,CAAc,YAAA;EAAA;iBA5HjC,QAAA;EAAA,iBACE,UAAA;EAAA;;;cAwIV,wBAAA,GACX,QAAA,EAAU,aAAA,CAAc,WAAA,MACvB,aAAA,CAAc,YAAA;AAAA,cAwNJ,kBAAA,GACX,QAAA,EAAU,aAAA,CAAc,YAAA,GACxB,OAAA,EAAS,YAAA,KACR,eAAA;AAAA,cAUU,eAAA,GAAmB,KAAA,EAAO,gBAAA,EAAkB,KAAA,EAAO,UAAA,KAAa,gBAAA;AAAA,cAMhE,0BAAA,GACX,KAAA,EAAO,gBAAA,EACP,KAAA,EAAO,UAAA,EACP,OAAA,GAAS,sBAAA,KACR,gBAAA;AAAA,cAmSU,sBAAA,GACX,KAAA,EAAO,gBAAA,EACP,OAAA,EAAS,WAAA,KACR,gBAAA;;cAeU,cAAA,GACX,KAAA,EAAO,gBAAA,EACP,OAAA,WACA,KAAA,GAAQ,UAAA,KACP,gBAAA;;cAUU,gBAAA,GAAoB,KAAA,EAAO,gBAAA,KAAmB,gBAIxD;AAAA,cAEU,iBAAA,GACX,MAAA,EAAQ,aAAA,CAAc,UAAA,GACtB,YAAA,GAAc,gBAAA,EACd,OAAA,GAAS,sBAAA,KAA2B,gBAAA"}

package/dist/client/state.mjs

@@ -1,5 +1,6 @@
 import { Data, Match, Predicate } from "effect";
 import * as Schema$1 from "effect/Schema";
+import { AgentFailed, idleAgentStatus, nextAgentStatusTree, settleAgentStatusTree, startAgentStatusTree } from "@yolk-sdk/agent/protocol";
 //#region src/client/state.ts
 const AgentToolRun = Data.taggedEnum();
 const AgentToolRunInputStreaming = Schema$1.TaggedStruct("InputStreaming", {
@@ -12,20 +13,23 @@ const AgentToolRunDenied = Schema$1.TaggedStruct("Denied", {
 	reason: Schema$1.String
 });
 const initialAgentClientState = {
-	status: "idle",
+	status: idleAgentStatus,
+	subagents: [],
 	messages: [],
 	liveMessages: [],
 	text: "",
 	reasoning: "",
 	toolRuns: [],
-	error: null,
-	errorInfo: null,
-	retryInfo: null,
 	seenEventIds: []
 };
-const clearRetryInfo = (state) => state.retryInfo === null ? state : {
+const statusTree = (state) => ({
+	root: state.status,
+	subagents: state.subagents
+});
+const withStatusTree = (state, tree) => tree.root === state.status && tree.subagents === state.subagents ? state : {
 	...state,
-	retryInfo: null
+	status: tree.root,
+	subagents: tree.subagents
 };
 const hasSeenEvent = (state, event) => event.eventId !== void 0 && state.seenEventIds.includes(event.eventId);
 const rememberEvent = (state, event) => event.eventId === void 0 ? state : {
@@ -107,186 +111,170 @@ const applyAgentEvent = (state, event) => {
 const applyAgentEventWithOptions = (state, event, options = {}) => {
 	const nowMs = options.nowMs ?? 0;
 	if (hasSeenEvent(state, event)) return state;
-	return rememberEvent(applyAgentEventUnchecked(state, event, nowMs), event);
-};
-const activeEventToolCallId = (event) => Match.value(event).pipe(Match.tag("ToolInputStart", "ToolInputDelta", (current) => current.id), Match.tag("ToolInputEnd", "ToolExecutionStarted", "ToolApprovalRequested", (current) => current.call.id), Match.tag("QuestionRequested", (current) => current.request.toolCallId), Match.tag("InputRequested", (current) => current.request.toolCallId), Match.tag("InteractionRequested", (current) => current.request.toolCallId), Match.orElse(() => void 0));
-const applyAgentEventUnchecked = (state, event, nowMs) => {
 	const activeCallId = activeEventToolCallId(event);
-	const acknowledgesActiveCall = (message) => Predicate.isTagged(message, "ToolResult") && message.toolCallId === activeCallId && message.acceptance !== void 0;
-	if (activeCallId !== void 0 && (state.messages.some(acknowledgesActiveCall) || state.liveMessages.some(acknowledgesActiveCall))) return {
+	if (activeCallId !== void 0 && isAcknowledgedCall(state, activeCallId)) return rememberEvent({
 		...state,
 		toolRuns: state.toolRuns.filter((run) => toolRunId(run) !== activeCallId || !isActiveToolRun(run))
-	};
-	return Match.value(event).pipe(Match.withReturnType(), Match.tag("AgentStart", () => ({
-		...state,
-		status: "running",
-		text: "",
-		reasoning: "",
-		liveMessages: [],
-		toolRuns: retainedSettledToolRuns(state.toolRuns),
-		error: null,
-		errorInfo: null,
-		retryInfo: null
-	})), Match.tag("AgentError", (current) => markAgentError(state, current.message, current)), Match.tag("LLMTextDelta", (current) => clearRetryInfo({
-		...state,
-		text: `${state.text}${current.text}`
-	})), Match.tag("LLMReasoningDelta", (current) => clearRetryInfo({
-		...state,
-		reasoning: `${state.reasoning}${current.text}`
-	})), Match.tag("LLMReasoningReplay", () => clearRetryInfo(state)), Match.tag("ToolInputStart", (current) => clearRetryInfo({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRunInputStreaming.make({
-			id: current.id,
-			name: current.name,
-			input: ""
-		}))
-	})), Match.tag("ToolInputDelta", (current) => clearRetryInfo({
-		...state,
-		toolRuns: appendToolInputDelta(state.toolRuns, current.id, current.delta)
-	})), Match.tag("ToolInputEnd", (current) => clearRetryInfo({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.InputReady({ call: current.call }))
-	})), Match.tag("ToolApprovalRequested", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.ApprovalRequested({
-			call: current.call,
-			request: current.request
-		}))
-	})), Match.tag("ToolApprovalGranted", () => state), Match.tag("ToolApprovalDenied", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRunDenied.make({
-			toolCallId: current.toolCallId,
-			reason: current.reason
-		}))
-	})), Match.tag("QuestionRequested", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.QuestionRequested({ request: current.request }))
-	})), Match.tag("InputRequested", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.InputRequested({ request: current.request }))
-	})), Match.tag("InteractionRequested", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.InteractionRequested({ request: current.request }))
-	}))).pipe(Match.tag("QuestionAnswered", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, questionAnsweredRun(current.response, questionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
-	})), Match.tag("QuestionCancelled", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, questionCancelledRun(current.response, questionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
-	})), Match.tag("InputSubmitted", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, inputSubmittedRun(current.response, inputRequestForToolCall(state.toolRuns, current.response.toolCallId)))
-	})), Match.tag("InputCancelled", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, inputCancelledRun(current.response, inputRequestForToolCall(state.toolRuns, current.response.toolCallId)))
-	})), Match.tag("InteractionSubmitted", (current) => ({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, interactionSubmittedRun(current.response, interactionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
-	})), Match.tag("InteractionCancelled", (current) => ({
+	}, event);
+	return rememberEvent(withStatusTree(applyAgentEventUnchecked(state, event, nowMs), nextAgentStatusTree(statusTree(state), event)), event);
+};
+const isAcknowledgedCall = (state, toolCallId) => {
+	const acknowledges = (message) => Predicate.isTagged(message, "ToolResult") && message.toolCallId === toolCallId && message.acceptance !== void 0;
+	return state.messages.some(acknowledges) || state.liveMessages.some(acknowledges);
+};
+const activeEventToolCallId = (event) => Match.value(event).pipe(Match.tag("ToolInputStart", "ToolInputDelta", (current) => current.id), Match.tag("ToolInputEnd", "ToolExecutionStarted", "ToolApprovalRequested", (current) => current.call.id), Match.tag("QuestionRequested", (current) => current.request.toolCallId), Match.tag("InputRequested", (current) => current.request.toolCallId), Match.tag("InteractionRequested", (current) => current.request.toolCallId), Match.orElse(() => void 0));
+const applyAgentEventUnchecked = (state, event, nowMs) => Match.value(event).pipe(Match.withReturnType(), Match.tag("AgentStart", () => ({
+	...state,
+	text: "",
+	reasoning: "",
+	liveMessages: [],
+	toolRuns: retainedSettledToolRuns(state.toolRuns)
+})), Match.tag("AgentError", () => ({
+	...state,
+	toolRuns: retainedSettledToolRuns(state.toolRuns)
+})), Match.tag("LLMTextDelta", (current) => ({
+	...state,
+	text: `${state.text}${current.text}`
+})), Match.tag("LLMReasoningDelta", (current) => ({
+	...state,
+	reasoning: `${state.reasoning}${current.text}`
+})), Match.tag("ToolInputStart", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRunInputStreaming.make({
+		id: current.id,
+		name: current.name,
+		input: ""
+	}))
+})), Match.tag("ToolInputDelta", (current) => ({
+	...state,
+	toolRuns: appendToolInputDelta(state.toolRuns, current.id, current.delta)
+})), Match.tag("ToolInputEnd", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.InputReady({ call: current.call }))
+})), Match.tag("LLMReasoningReplay", () => state), Match.tag("ToolApprovalRequested", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.ApprovalRequested({
+		call: current.call,
+		request: current.request
+	}))
+})), Match.tag("ToolApprovalGranted", () => state), Match.tag("ToolApprovalDenied", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRunDenied.make({
+		toolCallId: current.toolCallId,
+		reason: current.reason
+	}))
+})), Match.tag("QuestionRequested", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.QuestionRequested({ request: current.request }))
+})), Match.tag("InputRequested", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.InputRequested({ request: current.request }))
+})), Match.tag("InteractionRequested", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.InteractionRequested({ request: current.request }))
+}))).pipe(Match.tag("QuestionAnswered", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, questionAnsweredRun(current.response, questionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
+})), Match.tag("QuestionCancelled", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, questionCancelledRun(current.response, questionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
+})), Match.tag("InputSubmitted", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, inputSubmittedRun(current.response, inputRequestForToolCall(state.toolRuns, current.response.toolCallId)))
+})), Match.tag("InputCancelled", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, inputCancelledRun(current.response, inputRequestForToolCall(state.toolRuns, current.response.toolCallId)))
+})), Match.tag("InteractionSubmitted", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, interactionSubmittedRun(current.response, interactionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
+})), Match.tag("InteractionCancelled", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, interactionCancelledRun(current.response, interactionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
+})), Match.tag("ToolExecutionStarted", (current) => {
+	const prior = state.toolRuns.find((run) => toolRunId(run) === current.call.id);
+	const executing = AgentToolRun.Executing({
+		call: current.call,
+		startedAtMs: nowMs
+	});
+	const isInteraction = Predicate.isTagged(prior, "InteractionSubmitted") || Predicate.isTagged(prior, "Executing") && prior.interaction === true;
+	return {
 		...state,
-		toolRuns: replaceToolRun(state.toolRuns, interactionCancelledRun(current.response, interactionRequestForToolCall(state.toolRuns, current.response.toolCallId)))
-	})), Match.tag("ToolExecutionStarted", (current) => {
-		const prior = state.toolRuns.find((run) => toolRunId(run) === current.call.id);
-		const executing = AgentToolRun.Executing({
-			call: current.call,
-			startedAtMs: nowMs
-		});
-		const isInteraction = Predicate.isTagged(prior, "InteractionSubmitted") || Predicate.isTagged(prior, "Executing") && prior.interaction === true;
-		return {
-			...state,
-			toolRuns: replaceToolRun(state.toolRuns, isInteraction ? {
-				...executing,
-				interaction: true
-			} : executing)
-		};
-	}), Match.tag("ToolExecutionAccepted", "ToolExecutionCompleted", (current) => {
-		const endedAtMs = nowMs;
-		const startedAtMs = startedAtMsFor(state.toolRuns, current.call.id) ?? endedAtMs;
-		return {
-			...state,
-			toolRuns: replaceToolRun(state.toolRuns, Predicate.isTagged(current, "ToolExecutionAccepted") ? AgentToolRun.Accepted({
-				call: current.call,
-				result: current.result,
-				startedAtMs,
-				endedAtMs
-			}) : AgentToolRun.Completed({
-				call: current.call,
-				result: current.result,
-				startedAtMs,
-				endedAtMs
-			}))
-		};
-	}), Match.tag("ToolExecutionError", (current) => ({
+		toolRuns: replaceToolRun(state.toolRuns, isInteraction ? {
+			...executing,
+			interaction: true
+		} : executing)
+	};
+}), Match.tag("ToolExecutionAccepted", "ToolExecutionCompleted", (current) => {
+	const endedAtMs = nowMs;
+	const startedAtMs = startedAtMsFor(state.toolRuns, current.call.id) ?? endedAtMs;
+	return {
 		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.Errored({
+		toolRuns: replaceToolRun(state.toolRuns, Predicate.isTagged(current, "ToolExecutionAccepted") ? AgentToolRun.Accepted({
 			call: current.call,
-			message: current.message,
-			endedAtMs: nowMs
-		}))
-	})), Match.tag("ProviderToolResult", (current) => clearRetryInfo({
-		...state,
-		toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.ProviderCompleted({
+			result: current.result,
+			startedAtMs,
+			endedAtMs
+		}) : AgentToolRun.Completed({
 			call: current.call,
-			result: current.result
+			result: current.result,
+			startedAtMs,
+			endedAtMs
 		}))
-	})), Match.tag("UserMessage", "AssistantMessage", (current) => clearRetryInfo({
-		...state,
-		liveMessages: [...state.liveMessages, current.message],
-		text: "",
-		reasoning: ""
-	})), Match.tag("AgentEnd", (current) => ({
-		...state,
-		status: "done",
-		messages: [...state.messages, ...current.messages],
-		liveMessages: [],
-		text: "",
-		reasoning: "",
-		toolRuns: retainedSettledToolRuns(state.toolRuns),
-		retryInfo: null
-	})), Match.tag("AgentAwaitingInput", (current) => ({
-		...state,
-		status: "waiting",
-		messages: [...state.messages, ...current.messages],
-		liveMessages: [],
-		text: "",
-		reasoning: "",
-		error: null,
-		errorInfo: null,
-		retryInfo: null
-	})), Match.tag("AgentRetry", (current) => ({
-		...state,
-		retryInfo: current
-	})), Match.tag("CompactionEnd", "CompactionStart", "LLMStreamEnd", "LLMStreamStart", "SubagentCompleted", "SubagentStarted", "TurnEnd", "TurnStart", "UsageUpdate", () => state), Match.exhaustive);
-};
-const submitAgentUserMessage = (state, message) => ({
+	};
+}), Match.tag("ToolExecutionError", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.Errored({
+		call: current.call,
+		message: current.message,
+		endedAtMs: nowMs
+	}))
+})), Match.tag("ProviderToolResult", (current) => ({
+	...state,
+	toolRuns: replaceToolRun(state.toolRuns, AgentToolRun.ProviderCompleted({
+		call: current.call,
+		result: current.result
+	}))
+})), Match.tag("UserMessage", "AssistantMessage", (current) => ({
+	...state,
+	liveMessages: [...state.liveMessages, current.message],
+	text: "",
+	reasoning: ""
+})), Match.tag("AgentEnd", (current) => ({
+	...state,
+	messages: [...state.messages, ...current.messages],
+	liveMessages: [],
+	text: "",
+	reasoning: "",
+	toolRuns: retainedSettledToolRuns(state.toolRuns)
+})), Match.tag("AgentAwaitingInput", (current) => ({
+	...state,
+	messages: [...state.messages, ...current.messages],
+	liveMessages: [],
+	text: "",
+	reasoning: ""
+})), Match.tag("AgentRetry", "CompactionEnd", "CompactionStart", "LLMStreamEnd", "LLMStreamStart", "SubagentCompleted", "SubagentStarted", "TurnEnd", "TurnStart", "UsageUpdate", () => state), Match.exhaustive);
+const submitAgentUserMessage = (state, message) => withStatusTree({
 	...state,
-	status: "running",
 	messages: appendAgentMessage(state.messages, message),
 	liveMessages: [],
 	text: "",
 	reasoning: "",
 	toolRuns: retainedSettledToolRuns(state.toolRuns),
-	error: null,
-	errorInfo: null,
-	retryInfo: null,
 	seenEventIds: []
-});
-const markAgentError = (state, message = "Agent request failed", errorInfo = null) => ({
+}, startAgentStatusTree(statusTree(state)));
+/** Marks the run `Failed`, e.g. after a transport failure that produced no `AgentError` event. */
+const markAgentError = (state, message = "Agent request failed", error) => withStatusTree({
 	...state,
-	status: "error",
-	toolRuns: retainedSettledToolRuns(state.toolRuns),
-	error: message,
-	errorInfo,
-	retryInfo: null
-});
-const markAgentAborted = (state) => ({
+	toolRuns: retainedSettledToolRuns(state.toolRuns)
+}, settleAgentStatusTree(statusTree(state), error === void 0 ? AgentFailed.make({ message }) : AgentFailed.make({
+	message,
+	error
+})));
+/** The person stopped the run; per OSC 7501 a cancelled run is `Idle`. */
+const markAgentAborted = (state) => withStatusTree({
 	...state,
-	status: "aborted",
-	toolRuns: retainedSettledToolRuns(state.toolRuns),
-	error: null,
-	errorInfo: null,
-	retryInfo: null
-});
+	toolRuns: retainedSettledToolRuns(state.toolRuns)
+}, settleAgentStatusTree(statusTree(state), idleAgentStatus));
 const reduceAgentEvents = (events, initialState = initialAgentClientState, options = {}) => events.reduce((state, event) => applyAgentEventWithOptions(state, event, options), initialState);
 //#endregion
 export { AgentToolRun, appendAgentMessage, applyAgentEvent, applyAgentEventWithOptions, completedToolRuns, initialAgentClientState, isActiveToolRun, markAgentAborted, markAgentError, reduceAgentEvents, submitAgentUserMessage, toolRunsFromHitlRequests };