@copilotkit/core 1.64.2 → 1.64.3-canary.1785633429

package/dist/index.umd.js

@@ -3564,13 +3564,15 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				throw new MemoryError("MEMORY_REQUEST_TIMEOUT");
 			}
 		}), (0, rxjs_operators.map)((data) => {
-			if (typeof data.joinToken !== "string" || data.joinToken.length === 0) throw new Error("missing joinToken");
-			if (typeof data.joinCode !== "string" || data.joinCode.length === 0) throw new Error("missing joinCode");
+			const hasUserCreds = typeof data.joinToken === "string" && data.joinToken.length > 0 && typeof data.joinCode === "string" && data.joinCode.length > 0;
 			const hasProjectCreds = typeof data.projectJoinToken === "string" && data.projectJoinToken.length > 0 && typeof data.projectJoinCode === "string" && data.projectJoinCode.length > 0;
+			if (!hasUserCreds && !hasProjectCreds) throw new Error("missing memory realtime credentials");
 			return memoryRestEvents.credentialsSucceeded({
 				sessionId,
-				joinToken: data.joinToken,
-				joinCode: data.joinCode,
+				...hasUserCreds ? {
+					joinToken: data.joinToken,
+					joinCode: data.joinCode
+				} : {},
 				...hasProjectCreds ? {
 					projectJoinToken: data.projectJoinToken,
 					projectJoinCode: data.projectJoinCode
@@ -3801,6 +3803,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 				}), (0, rxjs_operators.switchMap)(([action, state]) => {
 					const context = state.context;
 					const { joinToken, joinCode, projectJoinToken, projectJoinCode } = action;
+					const primaryJoinToken = joinToken !== null && joinToken !== void 0 ? joinToken : projectJoinToken;
+					const primaryTopic = joinToken && joinCode ? `user_meta:memories:${joinCode}` : `project_meta:memories:${projectJoinCode}`;
 					const sessionId = action.sessionId;
 					const shutdown$ = actions$.pipe(ofType(memoryAdapterEvents.contextChanged, memoryAdapterEvents.stopped));
 					const channelMetadata$ = (channelJoinToken, topic) => {
@@ -3830,7 +3834,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 						const socket$ = ɵphoenixSocket$({
 							url: context.wsUrl,
 							options: {
-								params: { join_token: joinToken },
+								params: { join_token: primaryJoinToken },
 								reconnectAfterMs: (0, _copilotkit_shared.phoenixExponentialBackoff)(100, 1e4),
 								rejoinAfterMs: (0, _copilotkit_shared.phoenixExponentialBackoff)(1e3, 3e4)
 							}
@@ -3840,7 +3844,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 						}));
 						const channel$ = ɵphoenixChannel$({
 							socket$,
-							topic: `user_meta:memories:${joinCode}`
+							topic: primaryTopic
 						}).pipe((0, rxjs_operators.shareReplay)({
 							bufferSize: 1,
 							refCount: true
@@ -3852,10 +3856,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 						const fatalStatus$ = fatalSocketShutdown$.pipe((0, rxjs_operators.map)(() => memoryDomainEvents.realtimeUnavailable({ sessionId })));
 						const metadata$ = channel$.pipe((0, rxjs_operators.switchMap)(({ channel }) => ɵobservePhoenixEvent$(channel, MEMORY_METADATA_EVENT)), (0, rxjs_operators.map)((event) => mapMemoryMetadataEvent(event, action.sessionId)));
 						const join$ = ɵjoinPhoenixChannel$(channel$).pipe((0, rxjs_operators.concatWith)((0, rxjs.of)(memoryDomainEvents.realtimeConnected({ sessionId }))), (0, rxjs_operators.catchError)((error) => {
-							console.warn(`[memory] failed to join user_meta:memories:${joinCode}`, error);
+							console.warn(`[memory] failed to join ${primaryTopic}`, error);
 							return (0, rxjs.of)(memoryDomainEvents.realtimeUnavailable({ sessionId }));
 						}));
-						const projectMetadata$ = projectJoinToken && projectJoinCode ? channelMetadata$(projectJoinToken, `project_meta:memories:${projectJoinCode}`) : rxjs.EMPTY;
+						const projectMetadata$ = joinToken && joinCode && projectJoinToken && projectJoinCode ? channelMetadata$(projectJoinToken, `project_meta:memories:${projectJoinCode}`) : rxjs.EMPTY;
 						return (0, rxjs.merge)((0, rxjs.of)(memoryDomainEvents.realtimeConnecting({ sessionId })), metadata$, join$, projectMetadata$, fatalStatus$).pipe((0, rxjs_operators.takeUntil)((0, rxjs.merge)(shutdown$, fatalSocketShutdown$.pipe((0, rxjs.observeOn)(rxjs.asapScheduler)))), (0, rxjs_operators.finalize)(() => {}));
 					});
 				})))