@better-agent/client 0.1.0-canary.6 → 0.2.0-beta.2

package/dist/react/index.d.mts

@@ -1,96 +1,28 @@
-import { E as UIMessage, K as AgentNameFromApp, M as BetterAgentClient, Y as ModalitiesForAgent, b as PendingToolApproval, f as SendResult, i as ApproveToolCallParams, k as AgentClientError, l as RetryResult, m as SubmitInput, p as SetMessagesInput, r as AgentStatus, t as AgentChatControllerOptions, u as SendMessageInputForAgent } from "../controller-CJ79_cSR.mjs";
+import { M as BetterAgentClientAgentMemoryHandle, U as AgentHasMemory, W as AgentNameOf, a as AgentControllerOptions, c as AgentInterruptState, j as BetterAgentClientAgentHandle, l as AgentMessageInput, o as AgentControllerSnapshot, p as SendOptions, t as AgentController, u as AgentStreamResume } from "../controller-BkCxCUpn.mjs";
 
 //#region src/react/types.d.ts
-/** Options for `useAgent`. */
-type UseAgentOptions<TApp = unknown, TAgentName extends AgentNameFromApp<TApp> = AgentNameFromApp<TApp>> = AgentChatControllerOptions<TApp, TAgentName>;
-/** Return type of `useAgent`. */
-interface UseAgentResult<TApp = unknown, TAgentName extends AgentNameFromApp<TApp> = AgentNameFromApp<TApp>> {
-  /** Stable local chat id. */
-  id: string;
-  /** Conversation messages. */
-  messages: UIMessage[];
-  /** Current request status. */
-  status: AgentStatus;
-  /** Latest client error. */
-  error: AgentClientError | undefined;
-  /** Latest stream id. */
-  streamId: string | undefined;
-  /** Latest run id. */
-  runId: string | undefined;
-  /** Conversation id, when configured. */
-  conversationId: string | undefined;
-  /** True while a request is active. */
-  isLoading: boolean;
-  /** True while streaming events are being consumed. */
-  isStreaming: boolean;
-  /** Pending tool approvals. */
-  pendingToolApprovals: PendingToolApproval[];
-  /** Sends a message. */
-  sendMessage<const TModalities extends ModalitiesForAgent<TApp, TAgentName> | undefined = undefined>(input: SendMessageInputForAgent<TApp, TAgentName, TModalities>, options?: {
-    signal?: AbortSignal;
-  }): Promise<SendResult>;
-  /** Retries the most recent user message. */
-  regenerate(): Promise<void>;
-  /** Retries one user message. */
-  retryMessage(localId: string): Promise<RetryResult>;
-  /** Stops the active run or stream. */
-  stop(): void;
-  /** Resumes one stream. */
-  resumeStream(options: {
-    streamId: string;
-    afterSeq?: number;
-  }): Promise<void>;
-  /** Resumes the active conversation stream. */
-  resumeConversation(options?: {
-    afterSeq?: number;
-  }): Promise<void>;
-  /** Approves or denies a tool call. */
-  approveToolCall(params: ApproveToolCallParams): Promise<void>;
-  /** Clears the latest error. */
-  clearError(): void;
-  /** Resets local state. */
-  reset(): void;
-  /** Replaces the local messages. */
-  setMessages(input: SetMessagesInput): void;
+interface UseAgentOptions<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>> extends Pick<AgentControllerOptions<TApp, TName>, "context" | "threadId" | "toolHandlers" | "onEvent" | "onFinish" | "onError"> {
+  initialMessages?: AgentControllerOptions<TApp, TName>["initialMessages"];
+  initialState?: unknown;
+  resume?: AgentStreamResume;
+  initialInterruptState?: AgentInterruptState;
 }
+type UseAgentResult<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>> = AgentControllerSnapshot & {
+  sendMessage(input: AgentMessageInput, options?: SendOptions<TApp, TName>): Promise<void>;
+  stop(): void;
+  resume(input?: AgentStreamResume): Promise<void>;
+  approveToolCall(interruptId: string, metadata?: Record<string, unknown>): Promise<void>;
+  rejectToolCall(interruptId: string, metadata?: Record<string, unknown> | string): Promise<void>;
+  setMessages: AgentController<TApp, TName>["setMessages"];
+} & (AgentHasMemory<TApp, TName> extends true ? {
+  loadMessages(threadId?: string): Promise<void>;
+  selectThread(threadId: string): Promise<void>;
+  clearThread(): void;
+} : Record<never, never>);
 //#endregion
 //#region src/react/useAgent.d.ts
-/**
- * React hook for talking to one Better Agent conversation.
- *
- * Returns chat state and chat actions.
- *
- * @example
- * ```tsx
- * const agent = useAgent(client, {
- *   agent: "assistant",
- *   conversationId: "conv_123",
- * });
- *
- * await agent.sendMessage("Hello");
- *
- * console.log(agent.messages);
- * console.log(agent.status);
- * agent.stop();
- * ```
- *
- * @example
- * ```tsx
- * function Chat() {
- *   const agent = useAgent(client, { agent: "assistant" });
- *
- *   return (
- *     <div>
- *       {agent.messages.map((message) => (
- *         <div key={message.localId}>{message.role}</div>
- *       ))}
- *       <button onClick={() => agent.sendMessage("Hello")}>Send</button>
- *     </div>
- *   );
- * }
- * ```
- */
-declare const useAgent: <TApp = unknown, TAgentName extends AgentNameFromApp<TApp> = AgentNameFromApp<TApp>>(client: BetterAgentClient<TApp>, options: UseAgentOptions<TApp, TAgentName>) => UseAgentResult<TApp, TAgentName>;
+declare function useAgent<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>>(agent: BetterAgentClientAgentMemoryHandle<TApp, TName>, options?: UseAgentOptions<TApp, TName>): UseAgentResult<TApp, TName>;
+declare function useAgent<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>>(agent: BetterAgentClientAgentHandle<TApp, TName>, options?: UseAgentOptions<TApp, TName>): UseAgentResult<TApp, TName>;
 //#endregion
-export { type SetMessagesInput, type SubmitInput, type UseAgentOptions, type UseAgentResult, useAgent };
+export { type UseAgentOptions, type UseAgentResult, useAgent };
 //# sourceMappingURL=index.d.mts.map

package/dist/react/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/react/types.ts","../../src/react/useAgent.ts"],"mappings":";;;;KAgBY,eAAA,oCAEW,gBAAA,CAAiB,IAAA,IAAQ,gBAAA,CAAiB,IAAA,KAC7D,0BAAA,CAA2B,IAAA,EAAM,UAAA;;UAGpB,cAAA,oCAEM,gBAAA,CAAiB,IAAA,IAAQ,gBAAA,CAAiB,IAAA;EANjB;EAS5C,EAAA;EARiC;EAUjC,QAAA,EAAU,SAAA;EAVgB;EAY1B,MAAA,EAAQ,WAAA;EAdR;EAgBA,KAAA,EAAO,gBAAA;EAfY;EAiBnB,QAAA;EAjB4C;EAmB5C,KAAA;EAlBA;EAoBA,cAAA;EApBiC;EAsBjC,SAAA;EAtB2C;EAwB3C,WAAA;EArB2B;EAuB3B,oBAAA,EAAsB,mBAAA;EArBc;EAwBpC,WAAA,2BAC8B,kBAAA,CAAmB,IAAA,EAAM,UAAA,2BAEnD,KAAA,EAAO,wBAAA,CAAyB,IAAA,EAAM,UAAA,EAAY,WAAA,GAClD,OAAA;IAAY,MAAA,GAAS,WAAA;EAAA,IACtB,OAAA,CAAQ,UAAA;EAxBD;EA0BV,UAAA,IAAc,OAAA;EAtBP;EAwBP,YAAA,CAAa,OAAA,WAAkB,OAAA,CAAQ,WAAA;EARU;EAUjD,IAAA;EAV8B;EAY9B,YAAA,CAAa,OAAA;IAAW,QAAA;IAAkB,QAAA;EAAA,IAAsB,OAAA;EATvC;EAWzB,kBAAA,CAAmB,OAAA;IAAY,QAAA;EAAA,IAAsB,OAAA;EANd;EAQvC,eAAA,CAAgB,MAAA,EAAQ,qBAAA,GAAwB,OAAA;EAJgB;EAMhE,UAAA;EAFwB;EAIxB,KAAA;EAEmB;EAAnB,WAAA,CAAY,KAAA,EAAO,gBAAA;AAAA;;;AAvDvB;;;;;;;;;;;;;;;;;;;;;;;AAMA;;;;;;;;;;;;AANA,cC8Ba,QAAA,sCAEU,gBAAA,CAAiB,IAAA,IAAK,gBAAA,CAAA,IAAA,GAAA,MAAA,EAEjC,iBAAA,CAAkB,IAAA,GAAK,OAAA,EACtB,eAAA,CAAgB,IAAA,EAAM,UAAA,MAChC,cAAA,CAAe,IAAA,EAAM,UAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/react/types.ts","../../src/react/useAgent.ts"],"mappings":";;;UAWiB,eAAA,+BAEC,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA,WACxC,IAAA,CACF,sBAAA,CAAuB,IAAA,EAAM,KAAA;EAGjC,eAAA,GAAkB,sBAAA,CAAuB,IAAA,EAAM,KAAA;EAC/C,YAAA;EACA,MAAA,GAAS,iBAAA;EACT,qBAAA,GAAwB,mBAAA;AAAA;AAAA,KAGhB,cAAA,+BAEM,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA,KAC9C,uBAAA;EACA,WAAA,CAAY,KAAA,EAAO,iBAAA,EAAmB,OAAA,GAAU,WAAA,CAAY,IAAA,EAAM,KAAA,IAAS,OAAA;EAC3E,IAAA;EACA,MAAA,CAAO,KAAA,GAAQ,iBAAA,GAAoB,OAAA;EACnC,eAAA,CAAgB,WAAA,UAAqB,QAAA,GAAW,MAAA,oBAA0B,OAAA;EAC1E,cAAA,CAAe,WAAA,UAAqB,QAAA,GAAW,MAAA,6BAAmC,OAAA;EAClF,WAAA,EAAa,eAAA,CAAgB,IAAA,EAAM,KAAA;AAAA,KAClC,cAAA,CAAe,IAAA,EAAM,KAAA;EAEZ,YAAA,CAAa,QAAA,YAAoB,OAAA;EACjC,YAAA,CAAa,QAAA,WAAmB,OAAA;EAChC,WAAA;AAAA,IAEJ,MAAA;;;iBC9BM,QAAA,+BAAuC,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA,EAAA,CACnF,KAAA,EAAO,kCAAA,CAAmC,IAAA,EAAM,KAAA,GAChD,OAAA,GAAU,eAAA,CAAgB,IAAA,EAAM,KAAA,IACjC,cAAA,CAAe,IAAA,EAAM,KAAA;AAAA,iBACR,QAAA,+BAAuC,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA,EAAA,CACnF,KAAA,EAAO,4BAAA,CAA6B,IAAA,EAAM,KAAA,GAC1C,OAAA,GAAU,eAAA,CAAgB,IAAA,EAAM,KAAA,IACjC,cAAA,CAAe,IAAA,EAAM,KAAA"}

package/dist/react/index.mjs

@@ -1,122 +1,58 @@
-import { t as AgentChatController } from "../controller-BrBUfjhZ.mjs";
-import { n as getLatestUserMessageId, r as normalizeSendInput, t as cloneControllerOptions } from "../utils-CiHUj_BW.mjs";
-import { useEffect, useReducer, useRef } from "react";
+import { n as createAgentController } from "../controller-xMlzSCc7.mjs";
+import { useEffect, useMemo, useRef, useSyncExternalStore } from "react";
 
 //#region src/react/useAgent.ts
-/**
-* React hook for talking to one Better Agent conversation.
-*
-* Returns chat state and chat actions.
-*
-* @example
-* ```tsx
-* const agent = useAgent(client, {
-*   agent: "assistant",
-*   conversationId: "conv_123",
-* });
-*
-* await agent.sendMessage("Hello");
-*
-* console.log(agent.messages);
-* console.log(agent.status);
-* agent.stop();
-* ```
-*
-* @example
-* ```tsx
-* function Chat() {
-*   const agent = useAgent(client, { agent: "assistant" });
-*
-*   return (
-*     <div>
-*       {agent.messages.map((message) => (
-*         <div key={message.localId}>{message.role}</div>
-*       ))}
-*       <button onClick={() => agent.sendMessage("Hello")}>Send</button>
-*     </div>
-*   );
-* }
-* ```
-*/
-const useAgent = (client, options) => {
-	const [, forceRender] = useReducer((count) => count + 1, 0);
-	const latestClientRef = useRef(client);
+function useAgent(agent, options = {}) {
 	const latestOptionsRef = useRef(options);
-	latestClientRef.current = client;
 	latestOptionsRef.current = options;
-	const controllerRef = useRef(null);
-	const ensureController = () => {
-		if (!controllerRef.current) controllerRef.current = new AgentChatController(latestClientRef.current, cloneControllerOptions(latestOptionsRef.current));
-		return controllerRef.current;
-	};
-	const controller = ensureController();
-	const getController = () => {
-		const current = ensureController();
-		current.updateClient(latestClientRef.current);
-		current.updateOptions(cloneControllerOptions(latestOptionsRef.current));
-		return current;
-	};
-	useEffect(() => {
-		controller.updateClient(latestClientRef.current);
-		controller.updateOptions(cloneControllerOptions(latestOptionsRef.current));
-	}, [controller]);
-	useEffect(() => {
-		return controller.subscribe(forceRender);
-	}, [controller]);
+	const toolHandlers = useMemo(() => new Proxy({}, { get(_target, key) {
+		return latestOptionsRef.current.toolHandlers?.[key];
+	} }), []);
+	const lifecycleHooks = useMemo(() => ({
+		onEvent: (event) => latestOptionsRef.current.onEvent?.(event),
+		onFinish: (finish) => latestOptionsRef.current.onFinish?.(finish),
+		onError: (error) => latestOptionsRef.current.onError?.(error)
+	}), []);
+	const controller = useMemo(() => {
+		return createAgentController(agent, {
+			initialMessages: options.initialMessages,
+			initialState: options.initialState,
+			initialInterruptState: options.initialInterruptState,
+			resume: options.resume,
+			context: options.context,
+			threadId: options.threadId,
+			toolHandlers,
+			onEvent: lifecycleHooks.onEvent,
+			onFinish: lifecycleHooks.onFinish,
+			onError: lifecycleHooks.onError
+		});
+	}, [
+		agent,
+		options.initialMessages,
+		options.initialState,
+		options.initialInterruptState,
+		options.resume,
+		options.context,
+		options.threadId,
+		toolHandlers,
+		lifecycleHooks
+	]);
 	useEffect(() => {
-		controller.updateClient(latestClientRef.current);
-		controller.updateOptions(cloneControllerOptions(latestOptionsRef.current));
-		controller.init();
-		return () => {
-			controller.destroy();
-			if (controllerRef.current === controller) controllerRef.current = null;
-		};
+		controller.start();
 	}, [controller]);
-	const snapshot = controller.getSnapshot();
 	return {
-		id: snapshot.id,
-		messages: snapshot.messages,
-		status: snapshot.status,
-		error: snapshot.error,
-		streamId: snapshot.streamId,
-		runId: snapshot.runId,
-		conversationId: snapshot.conversationId,
-		isLoading: snapshot.isLoading,
-		isStreaming: snapshot.isStreaming,
-		pendingToolApprovals: snapshot.pendingToolApprovals,
-		sendMessage: (input, requestOptions) => {
-			return getController().sendMessage(normalizeSendInput(input), requestOptions);
-		},
-		regenerate: async () => {
-			const current = getController();
-			await current.retryMessage(getLatestUserMessageId(current));
-		},
-		retryMessage: (localId) => {
-			return getController().retryMessage(localId);
-		},
-		stop: () => {
-			getController().stop();
-		},
-		resumeStream: (resumeOptions) => {
-			return getController().resumeStream(resumeOptions);
-		},
-		resumeConversation: (resumeOptions) => {
-			return getController().resumeConversation(resumeOptions);
-		},
-		approveToolCall: (params) => {
-			return getController().approveToolCall(params);
-		},
-		clearError: () => {
-			getController().clearError();
-		},
-		reset: () => {
-			getController().reset();
-		},
-		setMessages: (input) => {
-			getController().setMessages(input);
-		}
+		...useSyncExternalStore((listener) => controller.subscribe(listener), () => controller.getSnapshot(), () => controller.getSnapshot()),
+		sendMessage: (input, sendOptions) => controller.sendMessage(input, sendOptions),
+		stop: () => controller.stop(),
+		resume: (resume) => controller.resume(resume),
+		selectThread: (threadId) => controller.selectThread(threadId),
+		clearThread: () => controller.clearThread(),
+		loadMessages: (threadId) => controller.loadMessages(threadId),
+		approveToolCall: (interruptId, metadata) => controller.approveToolCall(interruptId, metadata),
+		rejectToolCall: (interruptId, metadata) => controller.rejectToolCall(interruptId, metadata),
+		setMessages: (messages) => controller.setMessages(messages)
 	};
-};
+}
 
 //#endregion
 export { useAgent };

package/dist/react/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../../src/react/useAgent.ts"],"sourcesContent":["import { useEffect, useReducer, useRef } from \"react\";\nimport { AgentChatController } from \"../core/controller\";\nimport {\n    cloneControllerOptions,\n    getLatestUserMessageId,\n    normalizeSendInput,\n} from \"../framework-internals/utils\";\nimport type { BetterAgentClient } from \"../types/client\";\nimport type { AgentNameFromApp } from \"../types/client-type-helpers\";\nimport type { UseAgentOptions, UseAgentResult } from \"./types\";\n\n/**\n * React hook for talking to one Better Agent conversation.\n *\n * Returns chat state and chat actions.\n *\n * @example\n * ```tsx\n * const agent = useAgent(client, {\n *   agent: \"assistant\",\n *   conversationId: \"conv_123\",\n * });\n *\n * await agent.sendMessage(\"Hello\");\n *\n * console.log(agent.messages);\n * console.log(agent.status);\n * agent.stop();\n * ```\n *\n * @example\n * ```tsx\n * function Chat() {\n *   const agent = useAgent(client, { agent: \"assistant\" });\n *\n *   return (\n *     <div>\n *       {agent.messages.map((message) => (\n *         <div key={message.localId}>{message.role}</div>\n *       ))}\n *       <button onClick={() => agent.sendMessage(\"Hello\")}>Send</button>\n *     </div>\n *   );\n * }\n * ```\n */\nexport const useAgent = <\n    TApp = unknown,\n    TAgentName extends AgentNameFromApp<TApp> = AgentNameFromApp<TApp>,\n>(\n    client: BetterAgentClient<TApp>,\n    options: UseAgentOptions<TApp, TAgentName>,\n): UseAgentResult<TApp, TAgentName> => {\n    const [, forceRender] = useReducer((count: number) => count + 1, 0);\n    const latestClientRef = useRef(client);\n    const latestOptionsRef = useRef(options);\n    latestClientRef.current = client;\n    latestOptionsRef.current = options;\n\n    const controllerRef = useRef<AgentChatController<TApp, TAgentName> | null>(null);\n    const ensureController = () => {\n        if (!controllerRef.current) {\n            controllerRef.current = new AgentChatController<TApp, TAgentName>(\n                latestClientRef.current,\n                cloneControllerOptions(latestOptionsRef.current),\n            );\n        }\n\n        return controllerRef.current;\n    };\n    const controller = ensureController();\n\n    const getController = () => {\n        const current = ensureController();\n        current.updateClient(latestClientRef.current);\n        current.updateOptions(\n            cloneControllerOptions(latestOptionsRef.current) as UseAgentOptions<TApp, TAgentName>,\n        );\n        return current;\n    };\n\n    useEffect(() => {\n        controller.updateClient(latestClientRef.current);\n        controller.updateOptions(\n            cloneControllerOptions(latestOptionsRef.current) as UseAgentOptions<TApp, TAgentName>,\n        );\n    }, [controller]);\n\n    useEffect(() => {\n        return controller.subscribe(forceRender);\n    }, [controller]);\n\n    useEffect(() => {\n        controller.updateClient(latestClientRef.current);\n        controller.updateOptions(\n            cloneControllerOptions(latestOptionsRef.current) as UseAgentOptions<TApp, TAgentName>,\n        );\n        controller.init();\n\n        return () => {\n            controller.destroy();\n            if (controllerRef.current === controller) {\n                controllerRef.current = null;\n            }\n        };\n    }, [controller]);\n\n    const snapshot = controller.getSnapshot();\n\n    return {\n        id: snapshot.id,\n        messages: snapshot.messages,\n        status: snapshot.status,\n        error: snapshot.error,\n        streamId: snapshot.streamId,\n        runId: snapshot.runId,\n        conversationId: snapshot.conversationId,\n        isLoading: snapshot.isLoading,\n        isStreaming: snapshot.isStreaming,\n        pendingToolApprovals: snapshot.pendingToolApprovals,\n        sendMessage: (input, requestOptions) => {\n            return getController().sendMessage(normalizeSendInput(input), requestOptions);\n        },\n        regenerate: async () => {\n            const current = getController();\n            await current.retryMessage(getLatestUserMessageId(current));\n        },\n        retryMessage: (localId) => {\n            return getController().retryMessage(localId);\n        },\n        stop: () => {\n            getController().stop();\n        },\n        resumeStream: (resumeOptions) => {\n            return getController().resumeStream(resumeOptions);\n        },\n        resumeConversation: (resumeOptions) => {\n            return getController().resumeConversation(resumeOptions);\n        },\n        approveToolCall: (params) => {\n            return getController().approveToolCall(params);\n        },\n        clearError: () => {\n            getController().clearError();\n        },\n        reset: () => {\n            getController().reset();\n        },\n        setMessages: (input) => {\n            getController().setMessages(input);\n        },\n    };\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8CA,MAAa,YAIT,QACA,YACmC;CACnC,MAAM,GAAG,eAAe,YAAY,UAAkB,QAAQ,GAAG,EAAE;CACnE,MAAM,kBAAkB,OAAO,OAAO;CACtC,MAAM,mBAAmB,OAAO,QAAQ;AACxC,iBAAgB,UAAU;AAC1B,kBAAiB,UAAU;CAE3B,MAAM,gBAAgB,OAAqD,KAAK;CAChF,MAAM,yBAAyB;AAC3B,MAAI,CAAC,cAAc,QACf,eAAc,UAAU,IAAI,oBACxB,gBAAgB,SAChB,uBAAuB,iBAAiB,QAAQ,CACnD;AAGL,SAAO,cAAc;;CAEzB,MAAM,aAAa,kBAAkB;CAErC,MAAM,sBAAsB;EACxB,MAAM,UAAU,kBAAkB;AAClC,UAAQ,aAAa,gBAAgB,QAAQ;AAC7C,UAAQ,cACJ,uBAAuB,iBAAiB,QAAQ,CACnD;AACD,SAAO;;AAGX,iBAAgB;AACZ,aAAW,aAAa,gBAAgB,QAAQ;AAChD,aAAW,cACP,uBAAuB,iBAAiB,QAAQ,CACnD;IACF,CAAC,WAAW,CAAC;AAEhB,iBAAgB;AACZ,SAAO,WAAW,UAAU,YAAY;IACzC,CAAC,WAAW,CAAC;AAEhB,iBAAgB;AACZ,aAAW,aAAa,gBAAgB,QAAQ;AAChD,aAAW,cACP,uBAAuB,iBAAiB,QAAQ,CACnD;AACD,aAAW,MAAM;AAEjB,eAAa;AACT,cAAW,SAAS;AACpB,OAAI,cAAc,YAAY,WAC1B,eAAc,UAAU;;IAGjC,CAAC,WAAW,CAAC;CAEhB,MAAM,WAAW,WAAW,aAAa;AAEzC,QAAO;EACH,IAAI,SAAS;EACb,UAAU,SAAS;EACnB,QAAQ,SAAS;EACjB,OAAO,SAAS;EAChB,UAAU,SAAS;EACnB,OAAO,SAAS;EAChB,gBAAgB,SAAS;EACzB,WAAW,SAAS;EACpB,aAAa,SAAS;EACtB,sBAAsB,SAAS;EAC/B,cAAc,OAAO,mBAAmB;AACpC,UAAO,eAAe,CAAC,YAAY,mBAAmB,MAAM,EAAE,eAAe;;EAEjF,YAAY,YAAY;GACpB,MAAM,UAAU,eAAe;AAC/B,SAAM,QAAQ,aAAa,uBAAuB,QAAQ,CAAC;;EAE/D,eAAe,YAAY;AACvB,UAAO,eAAe,CAAC,aAAa,QAAQ;;EAEhD,YAAY;AACR,kBAAe,CAAC,MAAM;;EAE1B,eAAe,kBAAkB;AAC7B,UAAO,eAAe,CAAC,aAAa,cAAc;;EAEtD,qBAAqB,kBAAkB;AACnC,UAAO,eAAe,CAAC,mBAAmB,cAAc;;EAE5D,kBAAkB,WAAW;AACzB,UAAO,eAAe,CAAC,gBAAgB,OAAO;;EAElD,kBAAkB;AACd,kBAAe,CAAC,YAAY;;EAEhC,aAAa;AACT,kBAAe,CAAC,OAAO;;EAE3B,cAAc,UAAU;AACpB,kBAAe,CAAC,YAAY,MAAM;;EAEzC"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../../src/react/useAgent.ts"],"sourcesContent":["import { useEffect, useMemo, useRef, useSyncExternalStore } from \"react\";\nimport { createAgentController } from \"../core/controller\";\nimport type { AgentNameOf } from \"../core/inference\";\nimport type {\n    AgentControllerOptions,\n    BetterAgentClientAgentHandle,\n    BetterAgentClientAgentMemoryHandle,\n} from \"../types\";\nimport type { UseAgentOptions, UseAgentResult } from \"./types\";\n\nexport function useAgent<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>>(\n    agent: BetterAgentClientAgentMemoryHandle<TApp, TName>,\n    options?: UseAgentOptions<TApp, TName>,\n): UseAgentResult<TApp, TName>;\nexport function useAgent<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>>(\n    agent: BetterAgentClientAgentHandle<TApp, TName>,\n    options?: UseAgentOptions<TApp, TName>,\n): UseAgentResult<TApp, TName>;\nexport function useAgent<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>>(\n    agent: BetterAgentClientAgentHandle<TApp, TName>,\n    options: UseAgentOptions<TApp, TName> = {},\n): UseAgentResult<TApp, TName> {\n    const latestOptionsRef = useRef(options);\n    latestOptionsRef.current = options;\n\n    const toolHandlers = useMemo<AgentControllerOptions<TApp, TName>[\"toolHandlers\"]>(\n        () =>\n            new Proxy(\n                {},\n                {\n                    get(_target, key) {\n                        const handlers = latestOptionsRef.current.toolHandlers as\n                            | Record<PropertyKey, unknown>\n                            | undefined;\n                        return handlers?.[key];\n                    },\n                },\n            ) as AgentControllerOptions<TApp, TName>[\"toolHandlers\"],\n        [],\n    );\n\n    const lifecycleHooks = useMemo<\n        Pick<AgentControllerOptions<TApp, TName>, \"onEvent\" | \"onFinish\" | \"onError\">\n    >(\n        () => ({\n            onEvent: (event) => latestOptionsRef.current.onEvent?.(event),\n            onFinish: (finish) => latestOptionsRef.current.onFinish?.(finish),\n            onError: (error) => latestOptionsRef.current.onError?.(error),\n        }),\n        [],\n    );\n\n    const controller = useMemo(() => {\n        const controllerOptions: AgentControllerOptions<TApp, TName> = {\n            initialMessages: options.initialMessages,\n            initialState: options.initialState,\n            initialInterruptState: options.initialInterruptState,\n            resume: options.resume,\n            context: options.context,\n            threadId: options.threadId,\n            toolHandlers,\n            onEvent: lifecycleHooks.onEvent,\n            onFinish: lifecycleHooks.onFinish,\n            onError: lifecycleHooks.onError,\n        };\n        return createAgentController<TApp, TName>(agent, controllerOptions);\n    }, [\n        agent,\n        options.initialMessages,\n        options.initialState,\n        options.initialInterruptState,\n        options.resume,\n        options.context,\n        options.threadId,\n        toolHandlers,\n        lifecycleHooks,\n    ]);\n\n    useEffect(() => {\n        controller.start();\n    }, [controller]);\n\n    const snapshot = useSyncExternalStore(\n        (listener) => controller.subscribe(listener),\n        () => controller.getSnapshot(),\n        () => controller.getSnapshot(),\n    );\n\n    return {\n        ...snapshot,\n        sendMessage: (input, sendOptions) => controller.sendMessage(input, sendOptions),\n        stop: () => controller.stop(),\n        resume: (resume) => controller.resume(resume),\n        selectThread: (threadId) => controller.selectThread(threadId),\n        clearThread: () => controller.clearThread(),\n        loadMessages: (threadId) => controller.loadMessages(threadId),\n        approveToolCall: (interruptId, metadata) =>\n            controller.approveToolCall(interruptId, metadata),\n        rejectToolCall: (interruptId, metadata) => controller.rejectToolCall(interruptId, metadata),\n        setMessages: (messages) => controller.setMessages(messages),\n    };\n}\n"],"mappings":";;;;AAkBA,SAAgB,SACZ,OACA,UAAwC,EAAE,EACf;CAC3B,MAAM,mBAAmB,OAAO,QAAQ;AACxC,kBAAiB,UAAU;CAE3B,MAAM,eAAe,cAEb,IAAI,MACA,EAAE,EACF,EACI,IAAI,SAAS,KAAK;AAId,SAHiB,iBAAiB,QAAQ,eAGxB;IAEzB,CACJ,EACL,EAAE,CACL;CAED,MAAM,iBAAiB,eAGZ;EACH,UAAU,UAAU,iBAAiB,QAAQ,UAAU,MAAM;EAC7D,WAAW,WAAW,iBAAiB,QAAQ,WAAW,OAAO;EACjE,UAAU,UAAU,iBAAiB,QAAQ,UAAU,MAAM;EAChE,GACD,EAAE,CACL;CAED,MAAM,aAAa,cAAc;AAa7B,SAAO,sBAAmC,OAZqB;GAC3D,iBAAiB,QAAQ;GACzB,cAAc,QAAQ;GACtB,uBAAuB,QAAQ;GAC/B,QAAQ,QAAQ;GAChB,SAAS,QAAQ;GACjB,UAAU,QAAQ;GAClB;GACA,SAAS,eAAe;GACxB,UAAU,eAAe;GACzB,SAAS,eAAe;GAC3B,CACkE;IACpE;EACC;EACA,QAAQ;EACR,QAAQ;EACR,QAAQ;EACR,QAAQ;EACR,QAAQ;EACR,QAAQ;EACR;EACA;EACH,CAAC;AAEF,iBAAgB;AACZ,aAAW,OAAO;IACnB,CAAC,WAAW,CAAC;AAQhB,QAAO;EACH,GAPa,sBACZ,aAAa,WAAW,UAAU,SAAS,QACtC,WAAW,aAAa,QACxB,WAAW,aAAa,CACjC;EAIG,cAAc,OAAO,gBAAgB,WAAW,YAAY,OAAO,YAAY;EAC/E,YAAY,WAAW,MAAM;EAC7B,SAAS,WAAW,WAAW,OAAO,OAAO;EAC7C,eAAe,aAAa,WAAW,aAAa,SAAS;EAC7D,mBAAmB,WAAW,aAAa;EAC3C,eAAe,aAAa,WAAW,aAAa,SAAS;EAC7D,kBAAkB,aAAa,aAC3B,WAAW,gBAAgB,aAAa,SAAS;EACrD,iBAAiB,aAAa,aAAa,WAAW,eAAe,aAAa,SAAS;EAC3F,cAAc,aAAa,WAAW,YAAY,SAAS;EAC9D"}

package/dist/solid/index.d.mts

@@ -1,99 +1,39 @@
-import { E as UIMessage, K as AgentNameFromApp, M as BetterAgentClient, Y as ModalitiesForAgent, b as PendingToolApproval, f as SendResult, i as ApproveToolCallParams, k as AgentClientError, l as RetryResult, p as SetMessagesInput, r as AgentStatus, t as AgentChatControllerOptions, u as SendMessageInputForAgent } from "../controller-CJ79_cSR.mjs";
+import { M as BetterAgentClientAgentMemoryHandle, O as BetterAgentClientError, U as AgentHasMemory, W as AgentNameOf, a as AgentControllerOptions, c as AgentInterruptState, d as PendingClientTool, f as PendingToolApproval, j as BetterAgentClientAgentHandle, l as AgentMessageInput, p as SendOptions, s as AgentControllerStatus, t as AgentController, u as AgentStreamResume, w as UIMessage } from "../controller-BkCxCUpn.mjs";
 import { Accessor } from "solid-js";
 
 //#region src/solid/types.d.ts
-/** Plain value or Solid accessor. */
 type MaybeAccessor<T> = T | Accessor<T>;
-/** Options for `useAgent`. */
-type UseAgentOptions<TApp = unknown, TAgentName extends AgentNameFromApp<TApp> = AgentNameFromApp<TApp>> = AgentChatControllerOptions<TApp, TAgentName>;
-/** Return type of `useAgent`. */
-interface UseAgentResult<TApp = unknown, TAgentName extends AgentNameFromApp<TApp> = AgentNameFromApp<TApp>> {
-  /** Stable local chat id. */
-  id: Accessor<string>;
-  /** Conversation messages. */
+interface UseAgentOptions<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>> extends Pick<AgentControllerOptions<TApp, TName>, "context" | "threadId" | "toolHandlers" | "onEvent" | "onFinish" | "onError"> {
+  initialMessages?: AgentControllerOptions<TApp, TName>["initialMessages"];
+  initialState?: unknown;
+  resume?: AgentStreamResume;
+  initialInterruptState?: AgentInterruptState;
+}
+type UseAgentResult<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>> = {
   messages: Accessor<UIMessage[]>;
-  /** Current request status. */
-  status: Accessor<AgentStatus>;
-  /** Latest client error. */
-  error: Accessor<AgentClientError | undefined>;
-  /** Latest stream id. */
-  streamId: Accessor<string | undefined>;
-  /** Latest run id. */
+  state: Accessor<unknown>;
+  status: Accessor<AgentControllerStatus>;
+  error: Accessor<BetterAgentClientError | undefined>;
   runId: Accessor<string | undefined>;
-  /** Conversation id, when configured. */
-  conversationId: Accessor<string | undefined>;
-  /** True while a request is active. */
-  isLoading: Accessor<boolean>;
-  /** True while streaming events are being consumed. */
-  isStreaming: Accessor<boolean>;
-  /** Pending tool approvals. */
+  threadId: Accessor<string | undefined>;
+  isRunning: Accessor<boolean>;
+  pendingClientTools: Accessor<PendingClientTool[]>;
   pendingToolApprovals: Accessor<PendingToolApproval[]>;
-  /** Sends a message. */
-  sendMessage<const TModalities extends ModalitiesForAgent<TApp, TAgentName> | undefined = undefined>(input: SendMessageInputForAgent<TApp, TAgentName, TModalities>, options?: {
-    signal?: AbortSignal;
-  }): Promise<SendResult>;
-  /** Retries the most recent user message. */
-  regenerate(): Promise<void>;
-  /** Retries one user message. */
-  retryMessage(localId: string): Promise<RetryResult>;
-  /** Stops the active run or stream. */
+  sendMessage(input: AgentMessageInput, options?: SendOptions<TApp, TName>): Promise<void>;
   stop(): void;
-  /** Resumes one stream. */
-  resumeStream(options: {
-    streamId: string;
-    afterSeq?: number;
-  }): Promise<void>;
-  /** Resumes the active conversation stream. */
-  resumeConversation(options?: {
-    afterSeq?: number;
-  }): Promise<void>;
-  /** Approves or denies a tool call. */
-  approveToolCall(params: ApproveToolCallParams): Promise<void>;
-  /** Clears the latest error. */
-  clearError(): void;
-  /** Resets local state. */
-  reset(): void;
-  /** Replaces the local messages. */
-  setMessages(input: SetMessagesInput): void;
-}
+  resume(input?: AgentStreamResume): Promise<void>;
+  approveToolCall(interruptId: string, metadata?: Record<string, unknown>): Promise<void>;
+  rejectToolCall(interruptId: string, metadata?: Record<string, unknown> | string): Promise<void>;
+  setMessages: AgentController<TApp, TName>["setMessages"];
+} & (AgentHasMemory<TApp, TName> extends true ? {
+  loadMessages(threadId?: string): Promise<void>;
+  selectThread(threadId: string): Promise<void>;
+  clearThread(): void;
+} : Record<never, never>);
 //#endregion
 //#region src/solid/useAgent.d.ts
-/**
- * Solid primitive for talking to one Better Agent conversation.
- *
- * Returns reactive chat state and chat actions.
- *
- * @example
- * ```ts
- * const agent = useAgent(client, {
- *   agent: "assistant",
- *   conversationId: "conv_123",
- * });
- *
- * await agent.sendMessage("Hello");
- *
- * console.log(agent.messages());
- * console.log(agent.status());
- * agent.stop();
- * ```
- *
- * @example
- * ```tsx
- * function Chat() {
- *   const agent = useAgent(client, { agent: "assistant" });
- *
- *   return (
- *     <div>
- *       <For each={agent.messages()}>
- *         {(message) => <div>{message.role}</div>}
- *       </For>
- *       <button onClick={() => agent.sendMessage("Hello")}>Send</button>
- *     </div>
- *   );
- * }
- * ```
- */
-declare function useAgent<TApp = unknown, TAgentName extends AgentNameFromApp<TApp> = AgentNameFromApp<TApp>>(client: MaybeAccessor<BetterAgentClient<TApp>>, options: MaybeAccessor<UseAgentOptions<TApp, TAgentName>>): UseAgentResult<TApp, TAgentName>;
+declare function useAgent<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>>(agent: BetterAgentClientAgentMemoryHandle<TApp, TName>, options?: MaybeAccessor<UseAgentOptions<TApp, TName> | undefined>): UseAgentResult<TApp, TName>;
+declare function useAgent<TApp = unknown, TName extends AgentNameOf<TApp> = AgentNameOf<TApp>>(agent: BetterAgentClientAgentHandle<TApp, TName>, options?: MaybeAccessor<UseAgentOptions<TApp, TName> | undefined>): UseAgentResult<TApp, TName>;
 //#endregion
-export { type SetMessagesInput, type UseAgentOptions, type UseAgentResult, useAgent };
+export { type MaybeAccessor, type UseAgentOptions, type UseAgentResult, useAgent };
 //# sourceMappingURL=index.d.mts.map

package/dist/solid/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/solid/types.ts","../../src/solid/useAgent.ts"],"mappings":";;;;;KAiBY,aAAA,MAAmB,CAAA,GAAI,QAAA,CAAS,CAAA;;KAGhC,eAAA,oCAEW,gBAAA,CAAiB,IAAA,IAAQ,gBAAA,CAAiB,IAAA,KAC7D,0BAAA,CAA2B,IAAA,EAAM,UAAA;;UAGpB,cAAA,oCAEM,gBAAA,CAAiB,IAAA,IAAQ,gBAAA,CAAiB,IAAA;EAXvC;EActB,EAAA,EAAI,QAAA;EAd2B;EAgB/B,QAAA,EAAU,QAAA,CAAS,SAAA;EAhBsB;EAkBzC,MAAA,EAAQ,QAAA,CAAS,WAAA;EAfT;EAiBR,KAAA,EAAO,QAAA,CAAS,gBAAA;EAjBO;EAmBvB,QAAA,EAAU,QAAA;EAjBS;EAmBnB,KAAA,EAAO,QAAA;EAnBqC;EAqB5C,cAAA,EAAgB,QAAA;EApBiB;EAsBjC,SAAA,EAAW,QAAA;EAtBe;EAwB1B,WAAA,EAAa,QAAA;EA1Bb;EA4BA,oBAAA,EAAsB,QAAA,CAAS,mBAAA;EA3BZ;EA6BnB,WAAA,2BAC8B,kBAAA,CAAmB,IAAA,EAAM,UAAA,2BAEnD,KAAA,EAAO,wBAAA,CAAyB,IAAA,EAAM,UAAA,EAAY,WAAA,GAClD,OAAA;IAAY,MAAA,GAAS,WAAA;EAAA,IACtB,OAAA,CAAQ,UAAA;EAjCX;EAmCA,UAAA,IAAc,OAAA;EAnCmB;EAqCjC,YAAA,CAAa,OAAA,WAAkB,OAAA,CAAQ,WAAA;EArCI;EAuC3C,IAAA;EApC2B;EAsC3B,YAAA,CAAa,OAAA;IAAW,QAAA;IAAkB,QAAA;EAAA,IAAsB,OAAA;EApCpB;EAsC5C,kBAAA,CAAmB,OAAA;IAAY,QAAA;EAAA,IAAsB,OAAA;EA/BpC;EAiCjB,eAAA,CAAgB,MAAA,EAAQ,qBAAA,GAAwB,OAAA;EA/BhC;EAiChB,UAAA;EA/BU;EAiCV,KAAA;EA7BgB;EA+BhB,WAAA,CAAY,KAAA,EAAO,gBAAA;AAAA;;;;AAzDvB;;;;;;;;;;;;;;AAGA;;;;;;;;;;;;;;;;;;;;iBC6BgB,QAAA,oCAEO,gBAAA,CAAiB,IAAA,IAAQ,gBAAA,CAAiB,IAAA,EAAA,CAE7D,MAAA,EAAQ,aAAA,CAAc,iBAAA,CAAkB,IAAA,IACxC,OAAA,EAAS,aAAA,CAAc,eAAA,CAAgB,IAAA,EAAM,UAAA,KAC9C,cAAA,CAAe,IAAA,EAAM,UAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/solid/types.ts","../../src/solid/useAgent.ts"],"mappings":";;;;KAgBY,aAAA,MAAmB,CAAA,GAAI,QAAA,CAAS,CAAA;AAAA,UAE3B,eAAA,+BAEC,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA,WACxC,IAAA,CACF,sBAAA,CAAuB,IAAA,EAAM,KAAA;EAGjC,eAAA,GAAkB,sBAAA,CAAuB,IAAA,EAAM,KAAA;EAC/C,YAAA;EACA,MAAA,GAAS,iBAAA;EACT,qBAAA,GAAwB,mBAAA;AAAA;AAAA,KAGhB,cAAA,+BAA6C,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA;EACrF,QAAA,EAAU,QAAA,CAAS,SAAA;EACnB,KAAA,EAAO,QAAA;EACP,MAAA,EAAQ,QAAA,CAAS,qBAAA;EACjB,KAAA,EAAO,QAAA,CAAS,sBAAA;EAChB,KAAA,EAAO,QAAA;EACP,QAAA,EAAU,QAAA;EACV,SAAA,EAAW,QAAA;EACX,kBAAA,EAAoB,QAAA,CAAS,iBAAA;EAC7B,oBAAA,EAAsB,QAAA,CAAS,mBAAA;EAC/B,WAAA,CAAY,KAAA,EAAO,iBAAA,EAAmB,OAAA,GAAU,WAAA,CAAY,IAAA,EAAM,KAAA,IAAS,OAAA;EAC3E,IAAA;EACA,MAAA,CAAO,KAAA,GAAQ,iBAAA,GAAoB,OAAA;EACnC,eAAA,CAAgB,WAAA,UAAqB,QAAA,GAAW,MAAA,oBAA0B,OAAA;EAC1E,cAAA,CAAe,WAAA,UAAqB,QAAA,GAAW,MAAA,6BAAmC,OAAA;EAClF,WAAA,EAAa,eAAA,CAAgB,IAAA,EAAM,KAAA;AAAA,KAClC,cAAA,CAAe,IAAA,EAAM,KAAA;EAEhB,YAAA,CAAa,QAAA,YAAoB,OAAA;EACjC,YAAA,CAAa,QAAA,WAAmB,OAAA;EAChC,WAAA;AAAA,IAEJ,MAAA;;;iBCxCU,QAAA,+BAAuC,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA,EAAA,CACnF,KAAA,EAAO,kCAAA,CAAmC,IAAA,EAAM,KAAA,GAChD,OAAA,GAAU,aAAA,CAAc,eAAA,CAAgB,IAAA,EAAM,KAAA,iBAC/C,cAAA,CAAe,IAAA,EAAM,KAAA;AAAA,iBACR,QAAA,+BAAuC,WAAA,CAAY,IAAA,IAAQ,WAAA,CAAY,IAAA,EAAA,CACnF,KAAA,EAAO,4BAAA,CAA6B,IAAA,EAAM,KAAA,GAC1C,OAAA,GAAU,aAAA,CAAc,eAAA,CAAgB,IAAA,EAAM,KAAA,iBAC/C,cAAA,CAAe,IAAA,EAAM,KAAA"}