@morlay/ui-conversation-manager 0.0.2-alpha.5 → 0.0.2-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-manager",
-  "version": "0.0.2-alpha.5",
+  "version": "0.0.2-alpha.6",
   "description": "「对话管理」全局面板页（浏览器半）：已归档会话的搜索、取消归档、删除，以及导入为新会话。",
   "keywords": [
     "archived-sessions",
@@ -37,18 +37,18 @@
     "react-dom": "^18.2.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "4.0.2",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-locale": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-layout": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-session": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-sidebar": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-client-ui-workspace": "0.1.6-alpha.2",
-    "@deepseek-ai/dsh-session": "0.1.6-alpha.2",
-    "@morlay/dsh-client-ui-primitives": "0.0.2-alpha.5"
+    "@deepseek-ai/cordis": "4.0.3",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-layout": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-session": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-client-ui-workspace": "0.1.7-alpha.1",
+    "@deepseek-ai/dsh-session": "0.1.7-alpha.1",
+    "@morlay/dsh-client-ui-primitives": "0.0.2-alpha.6"
   },
   "dsh": {
     "client": {

package/src/client/ConversationManagerIcon.tsx

@@ -1,9 +1,9 @@
-import { IconArchiveOutline20 } from "@deepseek-ai/dsh-client-ui-primitives";
+import { IconArchiveOutlineRegular } from "@deepseek-ai/dsh-client-ui-primitives";
 import type { PropsRuntime } from "@deepseek-ai/dsh-client-ui-slots";
 
 /** nav 图标只画字形：尺寸由 nav 行给，选中态由 nav 行的按钮承担。 */
 export type ConversationManagerIconProps = PropsRuntime<"sidebar.panellist">;
 
 export function ConversationManagerIcon({ size }: ConversationManagerIconProps) {
-  return <IconArchiveOutline20 size={size} />;
+  return <IconArchiveOutlineRegular size={size} />;
 }

package/src/client/ConversationManagerPage.tsx

@@ -1,10 +1,11 @@
 // 「对话管理」页面：已归档会话的搜索、取消归档、导出、删除，以及导入为新会话与孤儿数据 GC。
-// 数据面只读框架标准座位（useSessions / useWorkspaces），动作面只读注入面。
-import { useMemo, useRef, useState, type ReactNode } from "react";
+// 数据面：会话行读**我们自己的**列表路由（注入面 listRows，含归档；搜索 / 子代理过滤 / 分页都在后端），
+// 动作面只读注入面。
+import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import {
   Button,
   Checkbox,
-  IconSearchOutline16,
+  IconSearchOutlineRegular,
   Input,
   Modal,
   Tag,
@@ -16,6 +17,7 @@ import type { SessionId } from "@deepseek-ai/dsh-session";
 import {
   ConversationManagerRequestError,
   type ConversationManagerFace,
+  type SessionRowsPage,
   type SessionUsageReport,
   type UsageBucket,
   type UsageRangeKey,
@@ -58,15 +60,6 @@ function timeLabel(updatedAt: number, now: number, t: Translate): string {
   return unit === "now" ? t("time.now") : t(`time.${unit}`, { n });
 }
 
-/** 标题或工作区名命中归一化后的查询。 */
-function matches(row: ConversationRow, normalizedQuery: string): boolean {
-  return (
-    normalizedQuery.length === 0 ||
-    row.title.toLowerCase().includes(normalizedQuery) ||
-    row.workspace.toLowerCase().includes(normalizedQuery)
-  );
-}
-
 /** host 错误码 → 可读文案；没有码时保留原文。 */
 function failureText(error: unknown, t: Translate): string {
   const code = error instanceof ConversationManagerRequestError ? error.code : undefined;
@@ -78,8 +71,7 @@ function failureText(error: unknown, t: Translate): string {
 
 export function ConversationManagerPage({
   t,
-  useSessions,
-  useWorkspaces,
+  listRows,
   archive,
   unarchive,
   remove,
@@ -88,9 +80,12 @@ export function ConversationManagerPage({
   collectGarbage,
   loadUsage,
 }: ConversationManagerPageProps): ReactNode {
-  const sessions = useSessions((state) => state);
-  const workspaces = useWorkspaces((state) => state);
+  // 数据面是**我们自己的**列表路由（完整语料，含归档）：官方 `session/list` 按部署策略排除归档，
+  // 归档集的管理动作要完整集合，两条路不混。搜索、子代理过滤与分页都在后端做（前端分页等于每次拉全量）。
+  const [rowsPage, setRowsPage] = useState<SessionRowsPage | null>(null);
+  const [rowsFailure, setRowsFailure] = useState<string | null>(null);
   const [query, setQuery] = useState("");
+  const [settledQuery, setSettledQuery] = useState("");
   const [page, setPage] = useState(1);
   const [showSubagents, setShowSubagents] = useState(false);
   const [view, setView] = useState<PageView>("sessions");
@@ -105,41 +100,64 @@ export function ConversationManagerPage({
   const [notice, setNotice] = useState<string | null>(null);
   const [failure, setFailure] = useState<string | null>(null);
   const fileRef = useRef<HTMLInputElement>(null);
+  const reloadRows = useCallback(async () => {
+    try {
+      // 后端分页：每次只拉当前页（PAGE_SIZE 条），翻页与搜索都重新请求。
+      setRowsPage(
+        await listRows({
+          ...(settledQuery === "" ? {} : { query: settledQuery }),
+          ...(showSubagents ? { includeSubagents: true } : {}),
+          page,
+          pageSize: PAGE_SIZE,
+        }),
+      );
+      setRowsFailure(null);
+    } catch (error: unknown) {
+      setRowsFailure(failureText(error, t));
+    }
+  }, [listRows, t, settledQuery, showSubagents, page]);
+
+  useEffect(() => {
+    void reloadRows();
+  }, [reloadRows]);
+
+  // 搜索下推到后端：输入停一下再请求（每次按键都打 host 没必要）。
+  useEffect(() => {
+    if (query === settledQuery) return;
+    const timer = window.setTimeout(() => {
+      setSettledQuery(query);
+      setPage(1);
+    }, 250);
+    return () => {
+      window.clearTimeout(timer);
+    };
+  }, [query, settledQuery]);
+
   const ungrouped = t("ungrouped");
 
-  // 全量会话：会话目录（ids）∪ 归档集，按最近活动在前；没有加载到 summary 的成员不产生行。
-  const rows = useMemo<ConversationRow[]>(() => {
-    const owners = new Map<string, string>();
-    for (const workspace of workspaces.items) {
-      for (const id of workspace.sessionIds) owners.set(id, workspace.title);
-    }
-    const archivedIds = new Set<SessionId>(workspaces.archivedSessionIds);
-    const ids = new Set<SessionId>([...sessions.ids, ...workspaces.archivedSessionIds]);
-    return [...ids]
-      .flatMap((id) => {
-        const summary = sessions.byId[id];
-        if (summary === undefined) return [];
-        return [
-          {
-            id,
-            title: summary.displayTitle,
-            workspace: owners.get(id) ?? ungrouped,
-            archived: archivedIds.has(id),
-            subagent: summary.origin === "subagent",
-            updatedAt: summary.updatedAt,
-          },
-        ];
-      })
-      .sort((left, right) => right.updatedAt - left.updatedAt);
-  }, [workspaces, sessions.ids, sessions.byId, ungrouped]);
+  // 当前页的行：标题、工作区归属、归档标记与最后活动时间都随行给出（归属由 host 算，页面不再自己映射）。
+  const rows = useMemo<ConversationRow[]>(
+    () =>
+      (rowsPage?.items ?? []).map((record) => ({
+        id: record.sessionId as SessionId,
+        title: record.title ?? record.sessionId,
+        workspace: record.workspace ?? ungrouped,
+        archived: record.archived,
+        subagent: record.origin === "subagent",
+        updatedAt: record.updatedAt,
+      })),
+    [rowsPage, ungrouped],
+  );
 
   // 一个动作的收尾：成败都收掉弹窗，失败把原因落到页面上的提示行。
+  // 动作成功即重拉我们自己的列表（归档状态与标题都可能变）；失败只报错、不动列表。
   const run = (action: Promise<unknown>, settle?: () => void): void => {
     setFailure(null);
     setNotice(null);
     void action.then(
       () => {
         settle?.();
+        void reloadRows();
       },
       (error: unknown) => {
         settle?.();
@@ -156,6 +174,7 @@ export function ConversationManagerPage({
       (result) => {
         setGcPhase("idle");
         setNotice(t("gc.done", { sessions: result.orphanSessions, events: result.orphanEvents }));
+        void reloadRows();
       },
       (error: unknown) => {
         setGcPhase("idle");
@@ -188,17 +207,17 @@ export function ConversationManagerPage({
     if (usage === null && !usageLoading) requestUsage(usageRange);
   };
 
-  if (sessions.phase !== "ready") {
-    return <p {...styling.props(styles.status)}>{t("loading")}</p>;
+  if (rowsPage === null) {
+    return <p {...styling.props(styles.status)}>{rowsFailure ?? t("loading")}</p>;
   }
 
   const now = Date.now();
-  // 子代理派生会话默认不列：它们不可删也不可取消归档，只会淹没真实对话。
-  const listed = showSubagents ? rows : rows.filter((row) => !row.subagent);
-  const matched = listed.filter((row) => matches(row, query.trim().toLowerCase()));
-  const pageCount = Math.max(1, Math.ceil(matched.length / PAGE_SIZE));
+  // 这一页就是后端给的那一页：搜索、子代理过滤与排序都在 host 做过，页面只渲染。
+  const visible = rows;
+  const total = rowsPage.total;
+  const pageCount = Math.max(1, Math.ceil(total / PAGE_SIZE));
   const currentPage = Math.min(page, pageCount);
-  const visible = matched.slice((currentPage - 1) * PAGE_SIZE, currentPage * PAGE_SIZE);
+  const matched = rows;
   const confirmed = confirming;
 
   return (
@@ -305,7 +324,7 @@ export function ConversationManagerPage({
               className={styling.className(styles.search)}
               data-filter="search"
               type="search"
-              icon={<IconSearchOutline16 />}
+              icon={<IconSearchOutlineRegular />}
               value={query}
               placeholder={t("search")}
               aria-label={t("search")}
@@ -336,14 +355,9 @@ export function ConversationManagerPage({
                 {failure}
               </p>
             )}
-            {listed.length === 0 ? (
+            {total === 0 ? (
               <p {...styling.props(styles.status)} data-status="empty">
-                {t("empty")}
-              </p>
-            ) : null}
-            {listed.length > 0 && matched.length === 0 ? (
-              <p {...styling.props(styles.status)} data-status="empty-search">
-                {t("emptySearch")}
+                {t(settledQuery === "" ? "empty" : "emptySearch")}
               </p>
             ) : null}
             {visible.length > 0 ? (

package/src/client/controller.ts

@@ -7,6 +7,40 @@ export const SESSION_EXPORT_PATH = "/api/session.export";
 export const SESSION_GC_PATH = "/api/session.gc";
 export const SESSION_USAGE_PATH = "/api/session.usage";
 
+/**
+ * 管理面的会话行（**完整语料，含归档**）：我们自己的路由，与官方 `session/list` 分开——那条按部署策略
+ * 默认排除归档（给上游 UI 用），归档集的管理动作需要完整集合。
+ */
+export const SESSION_ROWS_PATH = "/api/session.rows";
+
+/** 一行会话：标题、origin、最后活动时间、归档标记与工作区归属都由 host 给出。 */
+export interface SessionRowRecord {
+  sessionId: string;
+  title: string | null;
+  origin: string | null;
+  cwd: string | null;
+  createdAt: number;
+  updatedAt: number;
+  archived: boolean;
+  workspace: string | null;
+}
+
+/** 列表请求：搜索、子代理过滤与分页都在后端做（前端分页等于每次拉全量）。 */
+export interface SessionRowsQuery {
+  query?: string;
+  includeSubagents?: boolean;
+  page?: number;
+  pageSize?: number;
+}
+
+export interface SessionRowsPage {
+  items: SessionRowRecord[];
+  /** 过滤后的总数（分页前），页面据此算页数。 */
+  total: number;
+  page: number;
+  pageSize: number;
+}
+
 /** 时间范围的语义键（与 session-rdb `./usage` 的 `UsageRangeKey` 镜像）。 */
 export type UsageRangeKey = "all" | "day" | "week" | "7d" | "30d" | "90d";
 
@@ -74,6 +108,8 @@ export interface ConversationManagerGcResult {
 
 /** 页面从注入面拿到的动作（属性语法：页面解构后直接调用，不绑 this）。 */
 export interface ConversationManagerFace {
+  /** 管理面自己的列表：完整语料（含归档），标题与最后活动时间随行给出；搜索与分页都在后端。 */
+  listRows: (query?: SessionRowsQuery) => Promise<SessionRowsPage>;
   archive: (sessionId: SessionId) => Promise<void>;
   unarchive: (sessionId: SessionId) => Promise<void>;
   remove: (sessionId: SessionId) => Promise<void>;
@@ -134,6 +170,7 @@ export class ConversationManagerController {
 
   constructor(private readonly ports: ConversationManagerPorts) {
     this.face = {
+      listRows: (query) => this.loadRows(query),
       archive: (sessionId) => this.ports.archiveSession(sessionId),
       unarchive: (sessionId) => this.ports.unarchiveSession(sessionId),
       remove: (sessionId) => this.remove(sessionId),
@@ -144,6 +181,20 @@ export class ConversationManagerController {
     };
   }
 
+  private async loadRows(query: SessionRowsQuery = {}): Promise<SessionRowsPage> {
+    const value = await postJson(SESSION_ROWS_PATH, query);
+    const items = value["items"];
+    if (!Array.isArray(items) || typeof value["total"] !== "number") {
+      throw new ConversationManagerRequestError("会话列表响应不可用", undefined);
+    }
+    return {
+      items: items as SessionRowRecord[],
+      total: value["total"],
+      page: typeof value["page"] === "number" ? value["page"] : (query.page ?? 1),
+      pageSize: typeof value["pageSize"] === "number" ? value["pageSize"] : (query.pageSize ?? 20),
+    };
+  }
+
   private async remove(sessionId: SessionId): Promise<void> {
     await postJson(SESSION_DELETE_PATH, { sessionId });
     await this.ports.refresh();