@copilotkitnext/core 1.54.1-next.5 → 1.54.1

package/dist/index.cjs

@@ -492,9 +492,12 @@ function hasCredentials(agent) {
 function isZodError(error) {
 	return error !== null && typeof error === "object" && "name" in error && error.name === "ZodError";
 }
+function isAbortError(error) {
+	return (error instanceof DOMException || error instanceof Error) && error.name === "AbortError";
+}
 function withAbortErrorHandling(observable) {
 	return observable.pipe((0, rxjs_operators.catchError)((error) => {
-		if (isZodError(error)) return rxjs.EMPTY;
+		if (isZodError(error) || isAbortError(error)) return rxjs.EMPTY;
 		throw error;
 	}));
 }
@@ -1371,10 +1374,31 @@ const SUGGEST_TOOL = {
 */
 var RunHandler = class {
 	_tools = [];
+	/**
+	* Tracks whether the current run (including in-flight tool execution)
+	* has been aborted via `stopAgent()` or `agent.abortRun()`. Created
+	* fresh in `runAgent()`, aborted by `abortCurrentRun()`.
+	*/
+	_runAbortController = null;
+	/**
+	* Tracks recursive `runAgent` depth so that the abort controller and
+	* `agent.abortRun()` intercept are only set up / torn down at the
+	* top-level call, not on follow-up recursive calls from
+	* `processAgentResult`.
+	*/
+	_runDepth = 0;
 	constructor(core) {
 		this.core = core;
 	}
 	/**
+	* Abort the current run. Called by `CopilotKitCore.stopAgent()` to signal
+	* that in-flight tool handlers should stop and `processAgentResult` should
+	* not start a follow-up run.
+	*/
+	abortCurrentRun() {
+		this._runAbortController?.abort();
+	}
+	/**
 	* Typed access to CopilotKitCore's internal ("friend") methods.
 	* Centralises the single unavoidable cast so call-sites stay clean.
 	*/
@@ -1468,6 +1492,18 @@ var RunHandler = class {
 		if (agent.agentId) this._internal.suggestionEngine.clearSuggestions(agent.agentId);
 		if (agent instanceof _ag_ui_client.HttpAgent) agent.headers = { ...this._internal.headers };
 		if (agent.detachActiveRun) await agent.detachActiveRun();
+		const isTopLevel = this._runDepth === 0;
+		let originalAbortRun;
+		if (isTopLevel) {
+			this._runAbortController = new AbortController();
+			const controller = this._runAbortController;
+			originalAbortRun = agent.abortRun.bind(agent);
+			agent.abortRun = () => {
+				controller.abort();
+				originalAbortRun();
+			};
+		}
+		this._runDepth++;
 		try {
 			const runAgentResult = await agent.runAgent({
 				forwardedProps: {
@@ -1477,7 +1513,7 @@ var RunHandler = class {
 				tools: this.buildFrontendTools(agent.agentId),
 				context: Object.values(this._internal.context)
 			}, this.createAgentErrorSubscriber(agent));
-			return this.processAgentResult({
+			return await this.processAgentResult({
 				runAgentResult,
 				agent
 			});
@@ -1491,6 +1527,9 @@ var RunHandler = class {
 				context
 			});
 			return { newMessages: [] };
+		} finally {
+			this._runDepth--;
+			if (isTopLevel && originalAbortRun) agent.abortRun = originalAbortRun;
 		}
 	}
 	/**
@@ -1519,7 +1558,7 @@ var RunHandler = class {
 				}
 			}
 		}
-		if (needsFollowUp) {
+		if (needsFollowUp && !this._runAbortController?.signal.aborted) {
 			await this._internal.waitForPendingFrameworkUpdates();
 			return await this.runAgent({ agent });
 		}
@@ -1565,7 +1604,8 @@ var RunHandler = class {
 		if (!errorMessage) try {
 			const result = await tool.handler(parsedArgs, {
 				toolCall,
-				agent
+				agent,
+				signal: this._runAbortController?.signal
 			});
 			if (result === void 0 || result === null) toolCallResult = "";
 			else if (typeof result === "string") toolCallResult = result;
@@ -2311,6 +2351,7 @@ var CopilotKitCore = class {
 		return this.runHandler.connectAgent(params);
 	}
 	stopAgent(params) {
+		this.runHandler.abortCurrentRun();
 		params.agent.abortRun();
 	}
 	async runAgent(params) {
@@ -2808,15 +2849,19 @@ const REQUEST_TIMEOUT_MS = 15e3;
 const initialThreadState = {
 	threads: [],
 	isLoading: false,
+	isFetchingNextPage: false,
 	error: null,
 	context: null,
 	sessionId: 0,
-	metadataCredentialsRequested: false
+	metadataCredentialsRequested: false,
+	metadataJoinCode: null,
+	nextCursor: null
 };
 const threadAdapterEvents = createActionGroup("Thread Adapter", {
 	started: empty(),
 	stopped: empty(),
 	contextChanged: props(),
+	fetchNextPageRequested: empty(),
 	renameRequested: props(),
 	archiveRequested: props(),
 	deleteRequested: props()
@@ -2825,6 +2870,8 @@ const threadRestEvents = createActionGroup("Thread REST", {
 	listRequested: props(),
 	listSucceeded: props(),
 	listFailed: props(),
+	nextPageSucceeded: props(),
+	nextPageFailed: props(),
 	metadataCredentialsRequested: props(),
 	metadataCredentialsSucceeded: props(),
 	metadataCredentialsFailed: props(),
@@ -2857,14 +2904,20 @@ const threadReducer = createReducer(initialThreadState, on(threadAdapterEvents.c
 	sessionId: state.sessionId + 1,
 	threads: [],
 	isLoading: Boolean(context),
+	isFetchingNextPage: false,
 	error: null,
-	metadataCredentialsRequested: false
+	metadataCredentialsRequested: false,
+	metadataJoinCode: null,
+	nextCursor: null
 })), on(threadAdapterEvents.stopped, (state) => ({
 	...state,
 	threads: [],
 	isLoading: false,
+	isFetchingNextPage: false,
 	error: null,
-	metadataCredentialsRequested: false
+	metadataCredentialsRequested: false,
+	metadataJoinCode: null,
+	nextCursor: null
 })), on(threadRestEvents.listRequested, (state, { sessionId }) => {
 	if (sessionId !== state.sessionId || !state.context) return state;
 	return {
@@ -2872,13 +2925,15 @@ const threadReducer = createReducer(initialThreadState, on(threadAdapterEvents.c
 		isLoading: true,
 		error: null
 	};
-}), on(threadRestEvents.listSucceeded, (state, { sessionId, threads }) => {
+}), on(threadRestEvents.listSucceeded, (state, { sessionId, threads, joinCode, nextCursor }) => {
 	if (sessionId !== state.sessionId) return state;
 	return {
 		...state,
 		threads: sortThreadsByUpdatedAt(threads),
 		isLoading: false,
-		error: null
+		error: null,
+		metadataJoinCode: joinCode,
+		nextCursor
 	};
 }), on(threadRestEvents.listFailed, (state, { sessionId, error }) => {
 	if (sessionId !== state.sessionId) return state;
@@ -2887,6 +2942,23 @@ const threadReducer = createReducer(initialThreadState, on(threadAdapterEvents.c
 		isLoading: false,
 		error
 	};
+}), on(threadRestEvents.nextPageSucceeded, (state, { sessionId, threads, nextCursor }) => {
+	if (sessionId !== state.sessionId) return state;
+	let merged = state.threads;
+	for (const thread of threads) merged = upsertThread(merged, thread);
+	return {
+		...state,
+		threads: merged,
+		isFetchingNextPage: false,
+		nextCursor
+	};
+}), on(threadRestEvents.nextPageFailed, (state, { sessionId, error }) => {
+	if (sessionId !== state.sessionId) return state;
+	return {
+		...state,
+		isFetchingNextPage: false,
+		error
+	};
 }), on(threadRestEvents.metadataCredentialsFailed, (state, { sessionId, error }) => {
 	if (sessionId !== state.sessionId) return state;
 	return {
@@ -2899,6 +2971,12 @@ const threadReducer = createReducer(initialThreadState, on(threadAdapterEvents.c
 		...state,
 		metadataCredentialsRequested: true
 	};
+}), on(threadAdapterEvents.fetchNextPageRequested, (state) => {
+	if (!state.nextCursor || state.isFetchingNextPage) return state;
+	return {
+		...state,
+		isFetchingNextPage: true
+	};
 }), on(threadRestEvents.mutationFinished, (state, { outcome }) => ({
 	...state,
 	error: outcome.ok ? state.error : outcome.error
@@ -2918,6 +2996,8 @@ const threadReducer = createReducer(initialThreadState, on(threadAdapterEvents.c
 const selectThreads = createSelector((state) => state.threads);
 const selectThreadsIsLoading = createSelector((state) => state.isLoading);
 const selectThreadsError = createSelector((state) => state.error);
+const selectHasNextPage = createSelector((state) => state.nextCursor != null);
+const selectIsFetchingNextPage = createSelector((state) => state.isFetchingNextPage);
 let threadRequestId = 0;
 function createThreadRequestId() {
 	threadRequestId += 1;
@@ -2925,11 +3005,11 @@ function createThreadRequestId() {
 }
 function createThreadFetchObservable(environment, context, sessionId) {
 	return (0, rxjs.defer)(() => {
-		const params = new URLSearchParams({
-			userId: context.userId,
-			agentId: context.agentId
-		});
-		return (0, rxjs_fetch.fromFetch)(`${context.runtimeUrl}/threads?${params.toString()}`, {
+		const params = { agentId: context.agentId };
+		if (context.includeArchived) params.includeArchived = "true";
+		if (context.limit != null) params.limit = String(context.limit);
+		const qs = new URLSearchParams(params);
+		return (0, rxjs_fetch.fromFetch)(`${context.runtimeUrl}/threads?${qs.toString()}`, {
 			selector: (response) => {
 				if (!response.ok) throw new Error(`Failed to fetch threads: ${response.status}`);
 				return response.json();
@@ -2944,7 +3024,9 @@ function createThreadFetchObservable(environment, context, sessionId) {
 			}
 		}), (0, rxjs_operators.map)((data) => threadRestEvents.listSucceeded({
 			sessionId,
-			threads: data.threads
+			threads: data.threads,
+			joinCode: typeof data.joinCode === "string" && data.joinCode.length > 0 ? data.joinCode : null,
+			nextCursor: data.nextCursor ?? null
 		})), (0, rxjs_operators.catchError)((error) => {
 			return (0, rxjs.of)(threadRestEvents.listFailed({
 				sessionId,
@@ -2966,7 +3048,7 @@ function createThreadMetadataCredentialsObservable(environment, context, session
 				...context.headers,
 				"Content-Type": "application/json"
 			},
-			body: JSON.stringify({ userId: context.userId })
+			body: JSON.stringify({})
 		}).pipe((0, rxjs_operators.timeout)({
 			first: REQUEST_TIMEOUT_MS,
 			with: () => {
@@ -3022,7 +3104,7 @@ function createThreadStore(environment) {
 				context
 			})), (0, rxjs_operators.takeUntil)(actions$.pipe(ofType(threadAdapterEvents.contextChanged, threadAdapterEvents.stopped))), (0, rxjs_operators.switchMap)(({ action: currentAction, context }) => createThreadFetchObservable(environment, context, currentAction.sessionId)))))),
 			createEffect((actions$, state$) => actions$.pipe(ofType(threadRestEvents.listSucceeded), (0, rxjs_operators.withLatestFrom)(state$), (0, rxjs_operators.filter)(([action, state]) => {
-				return action.sessionId === state.sessionId && !state.metadataCredentialsRequested && Boolean(state.context?.wsUrl);
+				return action.sessionId === state.sessionId && !state.metadataCredentialsRequested && Boolean(state.context?.wsUrl) && Boolean(state.metadataJoinCode);
 			}), (0, rxjs_operators.map)(([action]) => threadRestEvents.metadataCredentialsRequested({ sessionId: action.sessionId })))),
 			createEffect((actions$, state$) => actions$.pipe(ofType(threadRestEvents.metadataCredentialsRequested), (0, rxjs_operators.switchMap)((action) => state$.pipe((0, rxjs_operators.map)((state) => state.context), (0, rxjs_operators.filter)((context) => Boolean(context)), (0, rxjs_operators.take)(1), (0, rxjs_operators.map)((context) => ({
 				action,
@@ -3033,6 +3115,7 @@ function createThreadStore(environment) {
 			}), (0, rxjs_operators.switchMap)(([action, state]) => {
 				const context = state.context;
 				const joinToken = action.joinToken;
+				const joinCode = state.metadataJoinCode;
 				const shutdown$ = actions$.pipe(ofType(threadAdapterEvents.contextChanged, threadAdapterEvents.stopped));
 				return (0, rxjs.defer)(() => {
 					const socket$ = ɵphoenixSocket$({
@@ -3048,7 +3131,7 @@ function createThreadStore(environment) {
 					}));
 					const channel$ = ɵphoenixChannel$({
 						socket$,
-						topic: `user_meta:${context.userId}`
+						topic: `user_meta:${joinCode}`
 					}).pipe((0, rxjs_operators.shareReplay)({
 						bufferSize: 1,
 						refCount: true
@@ -3064,18 +3147,50 @@ function createThreadStore(environment) {
 					}))), ɵobservePhoenixJoinOutcome$(channel$).pipe((0, rxjs_operators.filter)((outcome) => outcome.type !== "joined"), (0, rxjs_operators.map)((outcome) => outcome.type === "timeout" ? threadSocketEvents.joinTimedOut({ sessionId: action.sessionId }) : threadSocketEvents.joinFailed({ sessionId: action.sessionId })))).pipe((0, rxjs_operators.takeUntil)((0, rxjs.merge)(shutdown$, fatalSocketShutdown$)));
 				});
 			}))),
-			createEffect((actions$, state$) => actions$.pipe(ofType(threadSocketEvents.metadataReceived), (0, rxjs_operators.withLatestFrom)(state$), (0, rxjs_operators.filter)(([action, state]) => {
-				return action.sessionId === state.sessionId && action.payload.userId === state.context?.userId;
-			}), (0, rxjs_operators.map)(([action]) => {
+			createEffect((actions$, state$) => actions$.pipe(ofType(threadSocketEvents.metadataReceived), (0, rxjs_operators.withLatestFrom)(state$), (0, rxjs_operators.filter)(([action, state]) => action.sessionId === state.sessionId), (0, rxjs_operators.map)(([action, state]) => {
 				if (action.payload.operation === "deleted") return threadDomainEvents.threadDeleted({
 					sessionId: action.sessionId,
 					threadId: action.payload.deleted.id
 				});
+				if (action.payload.operation === "archived" && !state.context?.includeArchived) return threadDomainEvents.threadDeleted({
+					sessionId: action.sessionId,
+					threadId: action.payload.threadId
+				});
 				return threadDomainEvents.threadUpserted({
 					sessionId: action.sessionId,
 					thread: action.payload.thread
 				});
 			}))),
+			createEffect((actions$, state$) => actions$.pipe(ofType(threadAdapterEvents.fetchNextPageRequested), (0, rxjs_operators.withLatestFrom)(state$), (0, rxjs_operators.filter)(([, state]) => Boolean(state.context) && Boolean(state.nextCursor)), (0, rxjs_operators.switchMap)(([, state]) => {
+				const context = state.context;
+				const params = {
+					agentId: context.agentId,
+					cursor: state.nextCursor
+				};
+				if (context.includeArchived) params.includeArchived = "true";
+				if (context.limit != null) params.limit = String(context.limit);
+				return (0, rxjs_fetch.fromFetch)(`${context.runtimeUrl}/threads?${new URLSearchParams(params).toString()}`, {
+					selector: (response) => {
+						if (!response.ok) throw new Error(`Failed to fetch next page: ${response.status}`);
+						return response.json();
+					},
+					fetch: environment.fetch,
+					method: "GET",
+					headers: { ...context.headers }
+				}).pipe((0, rxjs_operators.timeout)({
+					first: REQUEST_TIMEOUT_MS,
+					with: () => {
+						throw new Error("Request timed out");
+					}
+				}), (0, rxjs_operators.map)((data) => threadRestEvents.nextPageSucceeded({
+					sessionId: state.sessionId,
+					threads: data.threads,
+					nextCursor: data.nextCursor ?? null
+				})), (0, rxjs_operators.catchError)((error) => (0, rxjs.of)(threadRestEvents.nextPageFailed({
+					sessionId: state.sessionId,
+					error: error instanceof Error ? error : new Error(String(error))
+				}))), (0, rxjs_operators.takeUntil)(actions$.pipe(ofType(threadAdapterEvents.contextChanged, threadAdapterEvents.stopped))));
+			}))),
 			createEffect((actions$, state$) => actions$.pipe(ofType(threadAdapterEvents.renameRequested, threadAdapterEvents.archiveRequested, threadAdapterEvents.deleteRequested), (0, rxjs_operators.withLatestFrom)(state$), (0, rxjs_operators.mergeMap)(([action, state]) => {
 				const context = state.context;
 				if (!context?.runtimeUrl) {
@@ -3086,10 +3201,7 @@ function createThreadStore(environment) {
 						error: /* @__PURE__ */ new Error("Runtime URL is not configured")
 					} }));
 				}
-				const commonBody = {
-					userId: context.userId,
-					agentId: context.agentId
-				};
+				const commonBody = { agentId: context.agentId };
 				if (threadAdapterEvents.renameRequested.match(action)) return createThreadMutationObservable(environment, context, {
 					requestId: action.requestId,
 					method: "PATCH",
@@ -3138,6 +3250,9 @@ function createThreadStore(environment) {
 		setContext(context) {
 			store.dispatch(threadAdapterEvents.contextChanged({ context }));
 		},
+		fetchNextPage() {
+			store.dispatch(threadAdapterEvents.fetchNextPageRequested());
+		},
 		renameThread(threadId, name) {
 			return trackMutation(threadAdapterEvents.renameRequested({
 				requestId: createThreadRequestId(),
@@ -3167,6 +3282,8 @@ const ɵthreadAdapterEvents = threadAdapterEvents;
 const ɵselectThreads = selectThreads;
 const ɵselectThreadsIsLoading = selectThreadsIsLoading;
 const ɵselectThreadsError = selectThreadsError;
+const ɵselectHasNextPage = selectHasNextPage;
+const ɵselectIsFetchingNextPage = selectIsFetchingNextPage;
 
 //#endregion
 exports.AgentRegistry = AgentRegistry;
@@ -3201,6 +3318,8 @@ exports.ɵobservePhoenixSocketHealth$ = ɵobservePhoenixSocketHealth$;
 exports.ɵobservePhoenixSocketSignals$ = ɵobservePhoenixSocketSignals$;
 exports.ɵphoenixChannel$ = ɵphoenixChannel$;
 exports.ɵphoenixSocket$ = ɵphoenixSocket$;
+exports.ɵselectHasNextPage = ɵselectHasNextPage;
+exports.ɵselectIsFetchingNextPage = ɵselectIsFetchingNextPage;
 exports.ɵselectThreads = ɵselectThreads;
 exports.ɵselectThreadsError = ɵselectThreadsError;
 exports.ɵselectThreadsIsLoading = ɵselectThreadsIsLoading;