@lobehub/lobehub 2.0.0-next.342 → 2.0.0-next.344

package/src/features/IntegrationDetailModal/index.tsx

@@ -8,7 +8,7 @@ import {
 } from '@lobechat/const';
 import { Flexbox, Icon, Image, Modal, Tag, Text, Typography } from '@lobehub/ui';
 import { Button, Divider } from 'antd';
-import { createStyles, cssVar } from 'antd-style';
+import { createStaticStyles, cssVar } from 'antd-style';
 import { ExternalLink, Loader2, SquareArrowOutUpRight } from 'lucide-react';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -18,7 +18,7 @@ import { klavisStoreSelectors, lobehubSkillStoreSelectors } from '@/store/tool/s
 import { KlavisServerStatus } from '@/store/tool/slices/klavisStore';
 import { LobehubSkillStatus } from '@/store/tool/slices/lobehubSkillStore/types';
 
-const useStyles = createStyles(({ css, token }) => ({
+const styles = createStaticStyles(({ css, cssVar }) => ({
   authorLink: css`
     cursor: pointer;
 
@@ -26,7 +26,7 @@ const useStyles = createStyles(({ css, token }) => ({
     gap: 4px;
     align-items: center;
 
-    color: ${token.colorPrimary};
+    color: ${cssVar.colorPrimary};
 
     &:hover {
       text-decoration: underline;
@@ -39,7 +39,7 @@ const useStyles = createStyles(({ css, token }) => ({
   `,
   detailLabel: css`
     font-size: 12px;
-    color: ${token.colorTextTertiary};
+    color: ${cssVar.colorTextTertiary};
   `,
   header: css`
     display: flex;
@@ -49,7 +49,7 @@ const useStyles = createStyles(({ css, token }) => ({
     padding: 16px;
     border-radius: 12px;
 
-    background: ${token.colorFillTertiary};
+    background: ${cssVar.colorFillTertiary};
   `,
   icon: css`
     display: flex;
@@ -61,25 +61,25 @@ const useStyles = createStyles(({ css, token }) => ({
     height: 56px;
     border-radius: 12px;
 
-    background: ${token.colorBgContainer};
+    background: ${cssVar.colorBgContainer};
   `,
   introduction: css`
     font-size: 14px;
     line-height: 1.8;
-    color: ${token.colorText};
+    color: ${cssVar.colorText};
   `,
   sectionTitle: css`
     font-size: 14px;
     font-weight: 600;
-    color: ${token.colorText};
+    color: ${cssVar.colorText};
   `,
   title: css`
     font-size: 18px;
     font-weight: 600;
-    color: ${token.colorText};
+    color: ${cssVar.colorText};
   `,
   toolTag: css`
-    font-family: ${token.fontFamilyCode};
+    font-family: ${cssVar.fontFamilyCode};
     font-size: 12px;
   `,
   toolsContainer: css`
@@ -90,7 +90,7 @@ const useStyles = createStyles(({ css, token }) => ({
   trustWarning: css`
     font-size: 12px;
     line-height: 1.6;
-    color: ${token.colorTextTertiary};
+    color: ${cssVar.colorTextTertiary};
   `,
 }));
 
@@ -107,7 +107,6 @@ export interface IntegrationDetailModalProps {
 
 const IntegrationDetailModal = memo<IntegrationDetailModalProps>(
   ({ open, onClose, type, identifier, isConnecting, onConnect }) => {
-    const { styles } = useStyles();
     const { t } = useTranslation(['plugin', 'setting']);
 
     // Get static config based on type

package/src/features/ResourceManager/index.tsx

@@ -2,8 +2,8 @@
 
 import { BRANDING_NAME } from '@lobechat/business-const';
 import { Flexbox } from '@lobehub/ui';
-import { createStyles, cssVar } from 'antd-style';
-import { memo, useEffect } from 'react';
+import { createStaticStyles, useTheme } from 'antd-style';
+import { memo, useEffect, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 import { useResourceManagerStore } from '@/app/[variants]/(main)/resource/features/store';
@@ -19,7 +19,7 @@ import UploadDock from './components/UploadDock';
 
 const ChunkDrawer = dynamic(() => import('./components/ChunkDrawer'), { ssr: false });
 
-const useStyles = createStyles(({ css, token }) => {
+const styles = createStaticStyles(({ css, cssVar }) => {
   return {
     container: css`
       position: relative;
@@ -33,7 +33,7 @@ const useStyles = createStyles(({ css, token }) => {
       width: 100%;
       height: 100%;
 
-      background-color: ${token.colorBgContainerSecondary};
+      background-color: var(--editor-overlay-bg, ${cssVar.colorBgContainer});
     `,
     pageEditorOverlay: css`
       position: absolute;
@@ -56,7 +56,7 @@ export type ResouceManagerMode = 'editor' | 'explorer' | 'page';
  * Business component, no need be reusable.
  */
 const ResourceManager = memo(() => {
-  const { styles } = useStyles();
+  const theme = useTheme();
   const [, setSearchParams] = useSearchParams();
   const [mode, currentViewItemId, libraryId, setMode, setCurrentViewItemId] =
     useResourceManagerStore((s) => [
@@ -69,6 +69,13 @@ const ResourceManager = memo(() => {
 
   const currentDocument = useFileStore(documentSelectors.getDocumentById(currentViewItemId));
 
+  const cssVariables = useMemo<Record<string, string>>(
+    () => ({
+      '--editor-overlay-bg': theme.colorBgContainerSecondary,
+    }),
+    [theme.colorBgContainerSecondary],
+  );
+
   // Fetch specific document when switching to page mode if not already loaded
   useEffect(() => {
     if (mode === 'page' && currentViewItemId && !currentDocument) {
@@ -98,7 +105,7 @@ const ResourceManager = memo(() => {
 
   return (
     <>
-      <Flexbox className={styles.container} height={'100%'}>
+      <Flexbox className={styles.container} height={'100%'} style={cssVariables}>
         {/* Explorer is always rendered to preserve its state */}
         <Explorer />
 

package/src/features/ShareModal/ShareImage/Preview.tsx

@@ -1,9 +1,7 @@
 import { ModelTag } from '@lobehub/icons';
-import { Avatar, Flexbox, Markdown } from '@lobehub/ui';
-import { ChatHeaderTitle } from '@lobehub/ui/chat';
+import { Avatar, Flexbox, Markdown, Text } from '@lobehub/ui';
 import { cx } from 'antd-style';
 import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
 import { ProductLogo } from '@/components/Branding';
 import PluginTag from '@/features/PluginTag';
@@ -19,21 +17,17 @@ import { type FieldType } from './type';
 
 const Preview = memo<FieldType & { title?: string }>(
   ({ title, withSystemRole, withBackground, withFooter, widthMode }) => {
-    const [model, plugins, systemRole, isInbox, description, avatar, backgroundColor] =
-      useAgentStore((s) => [
-        agentSelectors.currentAgentModel(s),
-        agentSelectors.displayableAgentPlugins(s),
-        agentSelectors.currentAgentSystemRole(s),
-        builtinAgentSelectors.isInboxAgent(s),
-        agentSelectors.currentAgentDescription(s),
-        agentSelectors.currentAgentAvatar(s),
-        agentSelectors.currentAgentBackgroundColor(s),
-      ]);
-
-    const { t } = useTranslation('chat');
+    const [model, plugins, systemRole, isInbox, avatar, backgroundColor] = useAgentStore((s) => [
+      agentSelectors.currentAgentModel(s),
+      agentSelectors.displayableAgentPlugins(s),
+      agentSelectors.currentAgentSystemRole(s),
+      builtinAgentSelectors.isInboxAgent(s),
+      agentSelectors.currentAgentDescription(s),
+      agentSelectors.currentAgentAvatar(s),
+      agentSelectors.currentAgentBackgroundColor(s),
+    ]);
 
     const displayTitle = isInbox ? 'Lobe AI' : title;
-    const displayDesc = isInbox ? t('inbox.desc') : description;
 
     return (
       <div
@@ -50,24 +44,21 @@ const Preview = memo<FieldType & { title?: string }>(
             gap={16}
           >
             <div className={styles.header}>
-              <Flexbox align={'flex-start'} gap={12} horizontal>
+              <Flexbox align={'center'} gap={12} horizontal>
                 <Avatar
                   avatar={avatar}
                   background={backgroundColor}
                   shape={'square'}
-                  size={40}
+                  size={28}
                   title={title}
                 />
-                <ChatHeaderTitle
-                  desc={displayDesc}
-                  tag={
-                    <Flexbox gap={4} horizontal>
-                      <ModelTag model={model} />
-                      {plugins?.length > 0 && <PluginTag plugins={plugins} />}
-                    </Flexbox>
-                  }
-                  title={displayTitle}
-                />
+                <Text fontSize={16} strong>
+                  {displayTitle}
+                </Text>
+                <Flexbox gap={4} horizontal>
+                  <ModelTag model={model} />
+                  {plugins?.length > 0 && <PluginTag plugins={plugins} />}
+                </Flexbox>
               </Flexbox>
               {withSystemRole && systemRole && (
                 <div className={styles.role}>

package/src/features/ShareModal/ShareImage/style.ts

@@ -12,7 +12,7 @@ export const styles = createStaticStyles(({ css, cssVar }) => ({
     background-size: 120% 120%;
   `,
   container: css`
-    background: ${cssVar.colorBgLayout};
+    background: ${cssVar.colorBgContainer};
   `,
   container_withBackground_true: css`
     overflow: hidden;
@@ -25,8 +25,10 @@ export const styles = createStaticStyles(({ css, cssVar }) => ({
   `,
   header: css`
     margin-block-end: -24px;
-    padding: 16px;
+    padding-block: 16px;
+    padding-inline: 24px;
     border-block-end: 1px solid ${cssVar.colorBorder};
+
     background: ${cssVar.colorBgContainer};
   `,
   role: css`

package/src/features/ShareModal/index.tsx

@@ -60,7 +60,11 @@ const ShareModal = memo<ModalProps>(({ onCancel, open }) => {
       title={t('share', { ns: 'common' })}
       width={'min(90vw, 1024px)'}
     >
-      <Flexbox gap={isMobile ? 8 : 24} style={{ overflow: 'hidden', position: 'relative' }}>
+      <Flexbox
+        gap={isMobile ? 8 : 24}
+        height={'100%'}
+        style={{ overflow: 'hidden', position: 'relative' }}
+      >
         <Segmented
           block
           onChange={(value) => setTab(value as Tab)}

package/src/features/ShareModal/style.ts

@@ -5,6 +5,7 @@ export { styles as containerStyles } from './useContainerStyles';
 
 export const styles = createStaticStyles(({ css, cssVar }) => ({
   body: css`
+    height: 100%;
     ${responsive.sm} {
       padding-block-end: 68px;
     }

package/src/features/ShareModal/useContainerStyles.ts

@@ -14,7 +14,7 @@ export const styles = createStaticStyles(({ css, cssVar }) => ({
       border: 1px solid ${cssVar.colorBorder};
       border-radius: ${cssVar.borderRadiusLG};
 
-      background: ${cssVar.colorBgLayout};
+      background: ${cssVar.colorBgContainer};
 
       /* stylelint-disable selector-class-pattern */
       .react-pdf__Document *,

package/src/features/SharePopover/index.tsx

@@ -1,7 +1,15 @@
 'use client';
 
-import { Button, Flexbox, Popover, copyToClipboard, usePopoverContext } from '@lobehub/ui';
-import { App, Divider, Select, Skeleton, Typography } from 'antd';
+import {
+  Button,
+  Flexbox,
+  Popover,
+  Skeleton,
+  Text,
+  copyToClipboard,
+  usePopoverContext,
+} from '@lobehub/ui';
+import { App, Divider, Select } from 'antd';
 import { ExternalLinkIcon, LinkIcon, LockIcon } from 'lucide-react';
 import { type ReactNode, memo, useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -12,7 +20,7 @@ import { useIsMobile } from '@/hooks/useIsMobile';
 import { topicService } from '@/services/topic';
 import { useChatStore } from '@/store/chat';
 
-import { useStyles } from './style';
+import { styles } from './style';
 
 type Visibility = 'private' | 'link';
 
@@ -23,7 +31,6 @@ interface SharePopoverContentProps {
 const SharePopoverContent = memo<SharePopoverContentProps>(({ onOpenModal }) => {
   const { t } = useTranslation('chat');
   const { message, modal } = App.useApp();
-  const { styles } = useStyles();
   const [updating, setUpdating] = useState(false);
   const { close } = usePopoverContext();
   const containerRef = useRef<HTMLDivElement>(null);
@@ -103,7 +110,7 @@ const SharePopoverContent = memo<SharePopoverContentProps>(({ onOpenModal }) =>
   if (isLoading || !shareInfo) {
     return (
       <Flexbox className={styles.container} gap={16}>
-        <Typography.Text strong>{t('share', { ns: 'common' })}</Typography.Text>
+        <Text strong>{t('share', { ns: 'common' })}</Text>
         <Skeleton active paragraph={{ rows: 2 }} />
       </Flexbox>
     );
@@ -135,10 +142,10 @@ const SharePopoverContent = memo<SharePopoverContentProps>(({ onOpenModal }) =>
 
   return (
     <Flexbox className={styles.container} gap={12} ref={containerRef}>
-      <Typography.Text strong>{t('shareModal.popover.title')}</Typography.Text>
+      <Text strong>{t('shareModal.popover.title')}</Text>
 
       <Flexbox gap={4}>
-        <Typography.Text type="secondary">{t('shareModal.popover.visibility')}</Typography.Text>
+        <Text type="secondary">{t('shareModal.popover.visibility')}</Text>
         <Select
           disabled={updating}
           getPopupContainer={() => containerRef.current || document.body}
@@ -164,9 +171,9 @@ const SharePopoverContent = memo<SharePopoverContentProps>(({ onOpenModal }) =>
         />
       </Flexbox>
 
-      <Typography.Text className={styles.hint} type="secondary">
+      <Text className={styles.hint} type="secondary">
         {getVisibilityHint()}
-      </Typography.Text>
+      </Text>
 
       <Divider style={{ margin: '4px 0' }} />
 

package/src/features/SharePopover/style.ts

@@ -1,6 +1,6 @@
-import { createStyles } from 'antd-style';
+import { createStaticStyles } from 'antd-style';
 
-export const useStyles = createStyles(({ css }) => ({
+export const styles = createStaticStyles(({ css }) => ({
   container: css`
     padding: 16px;
   `,

package/src/features/SkillStore/CommunityList/Item.tsx

@@ -17,10 +17,10 @@ import { useToolStore } from '@/store/tool';
 import { mcpStoreSelectors, pluginSelectors } from '@/store/tool/selectors';
 import { type DiscoverMcpItem } from '@/types/discover';
 
-import { useItemStyles } from '../style';
+import { itemStyles } from '../style';
 
 const Item = memo<DiscoverMcpItem>(({ name, description, icon, identifier }) => {
-  const { styles } = useItemStyles();
+  const styles = itemStyles;
   const { t } = useTranslation('plugin');
   const { modal } = App.useApp();
   const [detailOpen, setDetailOpen] = useState(false);

package/src/features/SkillStore/LobeHubList/Item.tsx

@@ -8,7 +8,7 @@ import { Loader2, MoreVerticalIcon, Plus, Unplug } from 'lucide-react';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useItemStyles } from '../style';
+import { itemStyles } from '../style';
 import { useSkillConnect } from './useSkillConnect';
 
 interface ItemProps {
@@ -25,7 +25,7 @@ interface ItemProps {
 const Item = memo<ItemProps>(
   ({ description, icon, identifier, label, onOpenDetail, serverName, type }) => {
     const { t } = useTranslation('setting');
-    const { styles } = useItemStyles();
+    const styles = itemStyles;
     const { modal } = App.useApp();
 
     const { handleConnect, handleDisconnect, isConnected, isConnecting } = useSkillConnect({

package/src/features/SkillStore/LobeHubList/index.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { KLAVIS_SERVER_TYPES, LOBEHUB_SKILL_PROVIDERS } from '@lobechat/const';
-import { createStyles } from 'antd-style';
+import { createStaticStyles } from 'antd-style';
 import isEqual from 'fast-deep-equal';
 import type { Klavis } from 'klavis';
 import { memo, useMemo, useState } from 'react';
@@ -17,7 +17,7 @@ import Empty from '../Empty';
 import Item from './Item';
 import { useSkillConnect } from './useSkillConnect';
 
-const useStyles = createStyles(({ css }) => ({
+const styles = createStaticStyles(({ css }) => ({
   grid: css`
     display: grid;
     grid-template-columns: repeat(2, 1fr);
@@ -69,7 +69,6 @@ const DetailModalWithConnect = memo<DetailModalWithConnectProps>(({ detailState,
 DetailModalWithConnect.displayName = 'DetailModalWithConnect';
 
 export const LobeHubList = memo<LobeHubListProps>(({ keywords }) => {
-  const { styles } = useStyles();
   const [detailState, setDetailState] = useState<DetailState | null>(null);
 
   const isLobehubSkillEnabled = useServerConfigStore(serverConfigSelectors.enableLobehubSkill);

package/src/features/SkillStore/style.ts

@@ -1,6 +1,6 @@
-import { createStyles } from 'antd-style';
+import { createStaticStyles } from 'antd-style';
 
-export const useItemStyles = createStyles(({ css, token }) => ({
+export const itemStyles = createStaticStyles(({ css, cssVar }) => ({
   container: css`
     position: relative;
     overflow: hidden;
@@ -11,7 +11,7 @@ export const useItemStyles = createStyles(({ css, token }) => ({
     overflow: hidden;
 
     font-size: 12px;
-    color: ${token.colorTextSecondary};
+    color: ${cssVar.colorTextSecondary};
     text-overflow: ellipsis;
     white-space: nowrap;
   `,
@@ -20,7 +20,7 @@ export const useItemStyles = createStyles(({ css, token }) => ({
 
     font-size: 14px;
     font-weight: 500;
-    color: ${token.colorText};
+    color: ${cssVar.colorText};
     text-overflow: ellipsis;
     white-space: nowrap;
   `,

package/src/layout/GlobalProvider/ServerVersionOutdatedAlert.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import { Button, Flexbox, Icon } from '@lobehub/ui';
-import { createStyles } from 'antd-style';
+import { createStaticStyles, useTheme } from 'antd-style';
 import { TriangleAlert, X } from 'lucide-react';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { MANUAL_UPGRADE_URL } from '@/const/url';
@@ -12,7 +12,7 @@ import { useElectronStore } from '@/store/electron';
 import { electronSyncSelectors } from '@/store/electron/selectors';
 import { useGlobalStore } from '@/store/global';
 
-const useStyles = createStyles(({ css, token }) => ({
+const styles = createStaticStyles(({ css, cssVar }) => ({
   closeButton: css`
     cursor: pointer;
 
@@ -26,15 +26,15 @@ const useStyles = createStyles(({ css, token }) => ({
 
     width: 28px;
     height: 28px;
-    border-radius: ${token.borderRadius}px;
+    border-radius: ${cssVar.borderRadius};
 
-    color: ${token.colorTextSecondary};
+    color: ${cssVar.colorTextSecondary};
 
     transition: all 0.2s;
 
     &:hover {
-      color: ${token.colorText};
-      background: ${token.colorFillSecondary};
+      color: ${cssVar.colorText};
+      background: ${cssVar.colorFillSecondary};
     }
   `,
   container: css`
@@ -46,7 +46,7 @@ const useStyles = createStyles(({ css, token }) => ({
     align-items: center;
     justify-content: center;
 
-    background: ${token.colorBgMask};
+    background: ${cssVar.colorBgMask};
   `,
   content: css`
     position: relative;
@@ -55,47 +55,55 @@ const useStyles = createStyles(({ css, token }) => ({
 
     max-width: 480px;
     padding: 24px;
-    border: 1px solid ${token.yellowBorder};
-    border-radius: ${token.borderRadiusLG}px;
+    border: 1px solid var(--content-yellow-border, ${cssVar.colorWarningBorder});
+    border-radius: ${cssVar.borderRadiusLG};
 
-    background: ${token.colorBgContainer};
-    box-shadow: ${token.boxShadowSecondary};
+    background: ${cssVar.colorBgContainer};
+    box-shadow: ${cssVar.boxShadowSecondary};
   `,
   desc: css`
     line-height: 1.6;
-    color: ${token.colorTextSecondary};
+    color: ${cssVar.colorTextSecondary};
   `,
   title: css`
     font-size: 16px;
     font-weight: bold;
-    color: ${token.colorWarningText};
+    color: ${cssVar.colorWarningText};
   `,
   titleIcon: css`
     flex-shrink: 0;
-    color: ${token.colorWarning};
+    color: ${cssVar.colorWarning};
   `,
   warning: css`
     padding: 12px;
-    border-radius: ${token.borderRadius}px;
-    color: ${token.colorWarningText};
-    background: ${token.yellowBg};
+    border-radius: ${cssVar.borderRadius};
+    color: ${cssVar.colorWarningText};
+    background: var(--warning-yellow-bg, ${cssVar.colorWarningBg});
   `,
 }));
 
 const ServerVersionOutdatedAlert = () => {
-  const { styles } = useStyles();
+  const theme = useTheme();
   const { t } = useTranslation('common');
   const [dismissed, setDismissed] = useState(false);
   const isServerVersionOutdated = useGlobalStore((s) => s.isServerVersionOutdated);
   const storageMode = useElectronStore(electronSyncSelectors.storageMode);
 
+  const cssVariables = useMemo<Record<string, string>>(
+    () => ({
+      '--content-yellow-border': theme.yellowBorder,
+      '--warning-yellow-bg': theme.yellowBg,
+    }),
+    [theme.yellowBorder, theme.yellowBg],
+  );
+
   // Only show alert when using self-hosted server, not cloud
   if (storageMode !== 'selfHost') return null;
   if (!isServerVersionOutdated || dismissed) return null;
 
   return (
     <div className={styles.container}>
-      <div className={styles.content}>
+      <div className={styles.content} style={cssVariables}>
         <div className={styles.closeButton} onClick={() => setDismissed(true)}>
           <Icon icon={X} />
         </div>

package/src/server/routers/lambda/userMemories.ts

@@ -21,6 +21,7 @@ import { z } from 'zod';
 import {
   type IdentityEntryBasePayload,
   type IdentityEntryPayload,
+  UserMemoryExperienceModel,
   UserMemoryIdentityModel,
   UserMemoryModel,
 } from '@/database/models/userMemory';
@@ -203,6 +204,8 @@ const memoryProcedure = authedProcedure.use(serverDatabase).use(async (opts) =>
   const { ctx } = opts;
   return opts.next({
     ctx: {
+      experienceModel: new UserMemoryExperienceModel(ctx.serverDB, ctx.userId),
+      identityModel: new UserMemoryIdentityModel(ctx.serverDB, ctx.userId),
       memoryModel: new UserMemoryModel(ctx.serverDB, ctx.userId),
     },
   });
@@ -220,13 +223,66 @@ export const userMemoriesRouter = router({
       }
     }),
 
-  queryIdentitiesForInjection: authedProcedure
-    .use(serverDatabase)
+  queryExperiences: memoryProcedure
+    .input(
+      z
+        .object({
+          order: z.enum(['asc', 'desc']).optional(),
+          page: z.coerce.number().int().min(1).optional(),
+          pageSize: z.coerce.number().int().min(1).max(100).optional(),
+          q: z.string().optional(),
+          sort: z.enum(['capturedAt', 'scoreConfidence']).optional(),
+          tags: z.array(z.string()).optional(),
+          types: z.array(z.string()).optional(),
+        })
+        .optional(),
+    )
+    .query(async ({ ctx, input }) => {
+      const params = input ?? {};
+      const fallbackPage = params.page ?? 1;
+      const fallbackPageSize = params.pageSize ?? 20;
+
+      try {
+        return await ctx.experienceModel.queryList(params);
+      } catch (error) {
+        console.error('Failed to query experiences:', error);
+        return { items: [], page: fallbackPage, pageSize: fallbackPageSize, total: 0 };
+      }
+    }),
+
+  queryIdentities: memoryProcedure
+    .input(
+      z
+        .object({
+          order: z.enum(['asc', 'desc']).optional(),
+          page: z.coerce.number().int().min(1).optional(),
+          pageSize: z.coerce.number().int().min(1).max(100).optional(),
+          q: z.string().optional(),
+          relationships: z.array(z.string()).optional(),
+          sort: z.enum(['capturedAt', 'type']).optional(),
+          tags: z.array(z.string()).optional(),
+          types: z.array(z.string()).optional(),
+        })
+        .optional(),
+    )
+    .query(async ({ ctx, input }) => {
+      const params = input ?? {};
+      const fallbackPage = params.page ?? 1;
+      const fallbackPageSize = params.pageSize ?? 20;
+
+      try {
+        return await ctx.identityModel.queryList(params);
+      } catch (error) {
+        console.error('Failed to query identities:', error);
+        return { items: [], page: fallbackPage, pageSize: fallbackPageSize, total: 0 };
+      }
+    }),
+
+  queryIdentitiesForInjection: memoryProcedure
     .input(z.object({ limit: z.coerce.number().int().min(1).max(100).optional() }).optional())
     .query(async ({ ctx, input }) => {
       try {
-        const identityModel = new UserMemoryIdentityModel(ctx.serverDB, ctx.userId);
-        return await identityModel.queryForInjection(input?.limit ?? 50);
+        return await ctx.identityModel.queryForInjection(input?.limit ?? 50);
       } catch (error) {
         console.error('Failed to query identities for injection:', error);
         return [];
@@ -262,7 +318,7 @@ export const userMemoriesRouter = router({
           pageSize: z.coerce.number().int().min(1).max(100).optional(),
           q: z.string().optional(),
           sort: z
-            .enum(['scoreConfidence', 'scoreImpact', 'scorePriority', 'scoreUrgency'])
+            .enum(['capturedAt', 'scoreConfidence', 'scoreImpact', 'scorePriority', 'scoreUrgency'])
             .optional(),
           tags: z.array(z.string()).optional(),
           types: z.array(z.string()).optional(),