@morlay/ui-conversation-manager 0.1.10 → 0.1.11-alpha.2

package/src/client/ConversationManagerPage.tsx

@@ -1,4 +1,4 @@
-// 「对话管理」页面：已归档会话的搜索、取消归档、导出、删除，以及导入为新会话与孤儿数据 GC。
+// 「对话管理」页面：已归档会话的搜索、取消归档、导出、删除，以及导入为新会话与整理数据（孤儿回收 + 统计重算）。
 // 数据面：会话行读**我们自己的**列表路由（注入面 listRows，含归档；搜索 / 子代理过滤 / 分页都在后端），
 // 动作面只读注入面。
 // 形态：页面框架与上游一级页面同款（960px 居中列 + 标题行 + 过滤 chip 行 + 搜索行，见
@@ -45,8 +45,8 @@ export type ConversationManagerPageProps = PropsRuntime<"main"> &
 
 type Translate = ConversationManagerPageProps["t"];
 
-// GC 的三段状态：确认 → 运行（阻塞界面）→ 收尾。
-type GcPhase = "idle" | "confirm" | "running";
+// 整理数据的三段状态：确认 → 运行（阻塞界面）→ 收尾。
+type OrganizePhase = "idle" | "confirm" | "running";
 
 interface ConversationRow {
   id: SessionId;
@@ -146,7 +146,7 @@ export function ConversationManagerPage({
   remove,
   exportZip,
   importZip,
-  collectGarbage,
+  organizeData,
   loadUsage,
 }: ConversationManagerPageProps): ReactNode {
   // 数据面是**我们自己的**列表路由（完整语料，含归档）：官方 `session/list` 按部署策略排除归档，
@@ -165,7 +165,7 @@ export function ConversationManagerPage({
   const [usageLoading, setUsageLoading] = useState(false);
   const [usageError, setUsageError] = useState<string | null>(null);
   const [confirming, setConfirming] = useState<ConversationRow | null>(null);
-  const [gcPhase, setGcPhase] = useState<GcPhase>("idle");
+  const [organizePhase, setOrganizePhase] = useState<OrganizePhase>("idle");
   const [importing, setImporting] = useState(false);
   const [notice, setNotice] = useState<string | null>(null);
   const [failure, setFailure] = useState<string | null>(null);
@@ -236,18 +236,24 @@ export function ConversationManagerPage({
     );
   };
 
-  const startGc = (): void => {
-    setGcPhase("running");
+  const startOrganize = (): void => {
+    setOrganizePhase("running");
     setFailure(null);
     setNotice(null);
-    void collectGarbage().then(
+    void organizeData().then(
       (result) => {
-        setGcPhase("idle");
-        setNotice(t("gc.done", { sessions: result.orphanSessions, events: result.orphanEvents }));
+        setOrganizePhase("idle");
+        setNotice(
+          t("organize.done", {
+            sessions: result.orphanSessions,
+            events: result.orphanEvents,
+            rebuilt: result.rebuiltSessions,
+          }),
+        );
         void reloadRows();
       },
       (error: unknown) => {
-        setGcPhase("idle");
+        setOrganizePhase("idle");
         setFailure(failureText(error, t));
       },
     );
@@ -324,15 +330,15 @@ export function ConversationManagerPage({
                   variant="outline"
                   size="sm"
                   data-action="gc"
-                  disabled={gcPhase !== "idle"}
-                  aria-label={t("gc.button")}
+                  disabled={organizePhase !== "idle"}
+                  aria-label={t("organize.button")}
                   onClick={() => {
                     setFailure(null);
                     setNotice(null);
-                    setGcPhase("confirm");
+                    setOrganizePhase("confirm");
                   }}
                 >
-                  {t("gc.button")}
+                  {t("organize.button")}
                 </Button>
               </div>
             </div>
@@ -619,35 +625,35 @@ export function ConversationManagerPage({
         }
       />
       <Modal
-        open={gcPhase === "confirm"}
+        open={organizePhase === "confirm"}
         onClose={() => {
-          setGcPhase("idle");
+          setOrganizePhase("idle");
         }}
-        title={t("gc.title")}
+        title={t("organize.title")}
         closeLabel={t("close")}
-        description={t("gc.description")}
+        description={t("organize.description")}
         footer={
           <>
             <Button
               variant="ghost"
               onClick={() => {
-                setGcPhase("idle");
+                setOrganizePhase("idle");
               }}
             >
-              {t("gc.cancel")}
+              {t("organize.cancel")}
             </Button>
-            <Button variant="primary" onClick={startGc}>
-              {t("gc.confirm")}
+            <Button variant="primary" onClick={startOrganize}>
+              {t("organize.confirm")}
             </Button>
           </>
         }
       />
       {/* 运行期不给关闭手段：没有关闭按钮，mask 与 Escape 都只走空 onClose。 */}
-      <Modal open={gcPhase === "running"} onClose={() => {}} headless title={t("gc.title")}>
+      <Modal open={organizePhase === "running"} onClose={() => {}} headless title={t("organize.title")}>
         <Stack align="center" gap={14} pad="blocking">
-          <Spinner label={t("gc.running")} />
+          <Spinner label={t("organize.running")} />
           <Text as="p" size="md">
-            {t("gc.running")}
+            {t("organize.running")}
           </Text>
         </Stack>
       </Modal>

package/src/client/controller.ts

@@ -4,7 +4,7 @@ import type { SessionId } from "@deepseek-ai/dsh-session";
 export const SESSION_DELETE_PATH = "/api/morlay/v1/session/delete";
 export const SESSION_IMPORT_PATH = "/api/morlay/v1/session/import";
 export const SESSION_EXPORT_PATH = "/api/morlay/v1/session/export";
-export const SESSION_GC_PATH = "/api/morlay/v1/session/gc";
+export const SESSION_ORGANIZE_PATH = "/api/morlay/v1/session/organize";
 export const SESSION_USAGE_PATH = "/api/morlay/v1/session/usage";
 
 // 管理面的会话行（**完整语料，含归档**）：我们自己的路由，与官方 `session/list` 分开——那条按部署策略
@@ -98,10 +98,12 @@ export interface ConversationManagerPorts {
   refresh(): Promise<void>;
 }
 
-// GC 一次执行的回报。
-export interface ConversationManagerGcResult {
+// 一次「整理数据」的回报。
+export interface ConversationManagerOrganizeResult {
   orphanSessions: number;
   orphanEvents: number;
+  // 统计表全量重算涉及的会话数。
+  rebuiltSessions: number;
   stoppedAgents: number;
 }
 
@@ -114,7 +116,7 @@ export interface ConversationManagerFace {
   remove: (sessionId: SessionId) => Promise<void>;
   exportZip: (sessionId: SessionId) => Promise<void>;
   importZip: (file: File) => Promise<SessionId>;
-  collectGarbage: () => Promise<ConversationManagerGcResult>;
+  organizeData: () => Promise<ConversationManagerOrganizeResult>;
   loadUsage: (range: UsageRangeKey) => Promise<SessionUsageReport>;
 }
 
@@ -175,7 +177,7 @@ export class ConversationManagerController {
       remove: (sessionId) => this.remove(sessionId),
       exportZip: (sessionId) => this.exportZip(sessionId),
       importZip: (file) => this.importZip(file),
-      collectGarbage: () => this.collectGarbage(),
+      organizeData: () => this.organizeData(),
       loadUsage: (range) => this.loadUsage(range),
     };
   }
@@ -228,12 +230,13 @@ export class ConversationManagerController {
     return value["sessionId"] as SessionId;
   }
 
-  private async collectGarbage(): Promise<ConversationManagerGcResult> {
-    const value = await postJson(SESSION_GC_PATH, {});
+  private async organizeData(): Promise<ConversationManagerOrganizeResult> {
+    const value = await postJson(SESSION_ORGANIZE_PATH, {});
     await this.ports.refresh();
     return {
       orphanSessions: typeof value["orphanSessions"] === "number" ? value["orphanSessions"] : 0,
       orphanEvents: typeof value["orphanEvents"] === "number" ? value["orphanEvents"] : 0,
+      rebuiltSessions: typeof value["rebuiltSessions"] === "number" ? value["rebuiltSessions"] : 0,
       stoppedAgents: typeof value["stoppedAgents"] === "number" ? value["stoppedAgents"] : 0,
     };
   }

package/src/client/locales.ts

@@ -54,14 +54,15 @@ export const zh = {
   "page.previous": "上一页",
   "page.next": "下一页",
   "page.label": "第 {page} / {total} 页",
-  "gc.button": "清理孤儿数据",
-  "gc.title": "清理孤儿数据",
-  "gc.description":
-    "会先停止所有运行中的 Agent，期间界面不可操作；随后回收孤儿 subagent 会话与孤儿数据，并执行 VACUUM。",
-  "gc.confirm": "开始清理",
-  "gc.cancel": "取消",
-  "gc.running": "正在清理，请稍候…",
-  "gc.done": "已回收 {sessions} 条孤儿会话、{events} 行孤儿数据。",
+  "organize.button": "整理数据",
+  "organize.title": "整理数据",
+  "organize.description":
+    "会先停止所有运行中的 Agent，期间界面不可操作；随后回收孤儿 subagent 会话与孤儿数据，重算全部会话的统计数据（token 用量与活动计数），最后执行 VACUUM。",
+  "organize.confirm": "开始整理",
+  "organize.cancel": "取消",
+  "organize.running": "正在整理，请稍候…",
+  "organize.done":
+    "已回收 {sessions} 条孤儿会话、{events} 行孤儿数据，并重算 {rebuilt} 个会话的统计数据。",
   import: "导入对话",
   importing: "导入中…",
   imported: "已导入为新会话。",
@@ -139,14 +140,15 @@ export const en = {
   "page.previous": "Previous",
   "page.next": "Next",
   "page.label": "Page {page} / {total}",
-  "gc.button": "Clean orphan data",
-  "gc.title": "Clean orphan data",
-  "gc.description":
-    "Stops every running Agent first — the UI is blocked meanwhile — then reclaims orphan subagent sessions and orphan rows, and runs VACUUM.",
-  "gc.confirm": "Start",
-  "gc.cancel": "Cancel",
-  "gc.running": "Cleaning, please wait…",
-  "gc.done": "Reclaimed {sessions} orphan sessions and {events} orphan rows.",
+  "organize.button": "Organize data",
+  "organize.title": "Organize data",
+  "organize.description":
+    "Stops every running Agent first — the UI is blocked meanwhile — then reclaims orphan subagent sessions and orphan rows, recomputes usage and activity statistics for all sessions, and runs VACUUM.",
+  "organize.confirm": "Start",
+  "organize.cancel": "Cancel",
+  "organize.running": "Organizing, please wait…",
+  "organize.done":
+    "Reclaimed {sessions} orphan sessions and {events} orphan rows; recomputed statistics for {rebuilt} sessions.",
   import: "Import conversation",
   importing: "Importing…",
   imported: "Imported as a new session.",