@morlay/ui-conversation-manager 0.1.3 → 0.1.5

package/dist/client.d.cts

@@ -38,6 +38,7 @@ declare const zh: {
   "usage.userInputs": string;
   "usage.toolCalls": string;
   "usage.subagentOnly": string;
+  "usage.onlySubagents": string;
   "usage.unknownModel": string;
   archive: string;
   archiveNamed: string;

package/dist/client.d.mts

@@ -1,5 +1,5 @@
-import "react";
 import { Context, Service } from "@deepseek-ai/cordis";
+import "react";
 import { MainPanelId } from "@deepseek-ai/dsh-client-ui-layout/client";
 import { InjectFace, PropsLocale, PropsRuntime } from "@deepseek-ai/dsh-client-ui-slots";
 //#region src/client/locales.d.ts
@@ -38,6 +38,7 @@ declare const zh: {
   "usage.userInputs": string;
   "usage.toolCalls": string;
   "usage.subagentOnly": string;
+  "usage.onlySubagents": string;
   "usage.unknownModel": string;
   archive: string;
   archiveNamed: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/ui-conversation-manager",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "「对话管理」全局面板页（浏览器半）：会话与统计两层 Tabs——会话视图给出全量会话（含已归档）的搜索、分页、归档 / 取消归档 / 导出 / 删除、导入为新会话与孤儿数据 GC，统计视图给出全部对话的 token 用量。",
   "keywords": [
     "archived-sessions",
@@ -40,17 +40,17 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
-    "@deepseek-ai/dsh-api-session-controller": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-layout": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-session": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-client-ui-workspace": "^0.2.0-rc.1",
-    "@deepseek-ai/dsh-session": "^0.2.0-rc.1",
-    "@morlay/dsh-client-ui-primitives": "0.0.6"
+    "@deepseek-ai/dsh-api-session-controller": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-locale": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-layout": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-session": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-sidebar": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-client-ui-workspace": "^0.2.0-rc.2",
+    "@deepseek-ai/dsh-session": "^0.2.0-rc.2",
+    "@morlay/dsh-client-ui-primitives": "0.0.8"
   },
   "dsh": {
     "client": {

package/src/client/ConversationManagerPage.tsx

@@ -6,12 +6,16 @@ import {
   Button,
   Checkbox,
   IconSearchOutlineRegular,
-  Input,
   Modal,
+  Row,
+  SearchInput,
+  Spinner,
+  Stack,
+  Tabs,
   Tag,
+  Text,
   relativeTime,
-} from "@deepseek-ai/dsh-client-ui-primitives";
-import { styling } from "@morlay/dsh-client-ui-primitives/client";
+} from "@morlay/dsh-client-ui-primitives/client";
 import type { InjectFace, PropsLocale, PropsRuntime } from "@deepseek-ai/dsh-client-ui-slots";
 import type { SessionId } from "@deepseek-ai/dsh-session";
 import {
@@ -24,7 +28,6 @@ import {
   type UsageTotals,
 } from "./controller.ts";
 import { formatCount, formatPercent, formatTokens } from "./format.ts";
-import { styles } from "./ConversationManagerPage.styles.ts";
 
 // 一页的行数（会话列表）。
 const PAGE_SIZE = 20;
@@ -91,6 +94,7 @@ export function ConversationManagerPage({
   const [view, setView] = useState<PageView>("sessions");
   const [usageTab, setUsageTab] = useState<UsageTab>("overview");
   const [usageRange, setUsageRange] = useState<UsageRange>("day");
+  const [usageOnlySubagents, setUsageOnlySubagents] = useState(false);
   const [usage, setUsage] = useState<SessionUsageReport | null>(null);
   const [usageLoading, setUsageLoading] = useState(false);
   const [usageError, setUsageError] = useState<string | null>(null);
@@ -208,7 +212,7 @@ export function ConversationManagerPage({
   };
 
   if (rowsPage === null) {
-    return <p {...styling.props(styles.status)}>{rowsFailure ?? t("loading")}</p>;
+    return <Text as="p" size="md" tone="tertiary">{rowsFailure ?? t("loading")}</Text>;
   }
 
   const now = Date.now();
@@ -221,34 +225,22 @@ export function ConversationManagerPage({
   const confirmed = confirming;
 
   return (
-    <div {...styling.props(styles.page)} data-view={view}>
-      <div {...styling.props(styles.header)}>
-        <h1 {...styling.props(styles.title)}>{t("title")}</h1>
-        <div {...styling.props(styles.tabs)} role="tablist">
-          <button
-            type="button"
-            role="tab"
-            data-tab="sessions"
-            aria-selected={view === "sessions"}
-            className={styling.className(styles.tab, view === "sessions" && styles.tabActive)}
-            onClick={() => {
-              setView("sessions");
-            }}
-          >
-            {t("view.sessions")}
-          </button>
-          <button
-            type="button"
-            role="tab"
-            data-tab="usage"
-            aria-selected={view === "usage"}
-            className={styling.className(styles.tab, view === "usage" && styles.tabActive)}
-            onClick={openUsage}
-          >
-            {t("view.usage")}
-          </button>
-        </div>
-        <div {...styling.props(styles.headerActions)}>
+    <Stack data-view={view} fill pad="page" gap={12}>
+      <Row gap={12} justify="between" fixed>
+        <Text as="h1" size="lg" weight="medium">{t("title")}</Text>
+        <Tabs
+          label={t("title")}
+          items={[
+            { value: "sessions", label: t("view.sessions") },
+            { value: "usage", label: t("view.usage") },
+          ]}
+          value={view}
+          onChange={(next) => {
+            if (next === "usage") openUsage();
+            else setView("sessions");
+          }}
+        />
+        <Row gap={8} fixed>
           <Button
             variant="outline"
             size="sm"
@@ -276,7 +268,7 @@ export function ConversationManagerPage({
           >
             {t("gc.button")}
           </Button>
-        </div>
+        </Row>
         <input
           ref={fileRef}
           type="file"
@@ -303,9 +295,9 @@ export function ConversationManagerPage({
               });
           }}
         />
-      </div>
+      </Row>
       {view === "usage" ? (
-        <div {...styling.props(styles.scroll)} data-scroll="page">
+        <Stack data-scroll="page" gap={12} scroll>
           <UsageView
             report={usage}
             loading={usageLoading}
@@ -314,14 +306,16 @@ export function ConversationManagerPage({
             onTab={setUsageTab}
             range={usageRange}
             onRange={requestUsage}
+            onlySubagents={usageOnlySubagents}
+            onOnlySubagents={setUsageOnlySubagents}
             t={t}
           />
-        </div>
+        </Stack>
       ) : (
         <>
-          <div {...styling.props(styles.filters)}>
-            <Input
-              className={styling.className(styles.search)}
+          <Row gap={16} fixed>
+            <SearchInput
+              width="search"
               data-filter="search"
               type="search"
               icon={<IconSearchOutlineRegular />}
@@ -343,44 +337,49 @@ export function ConversationManagerPage({
                 }}
               />
             </span>
-          </div>
-          <div {...styling.props(styles.scroll)} data-scroll="page">
+          </Row>
+          <Stack data-scroll="page" gap={12} scroll>
             {notice === null ? null : (
-              <p {...styling.props(styles.status)} data-notice="result">
+              <Text data-notice="result" as="p" size="md" tone="tertiary">
                 {notice}
-              </p>
+              </Text>
             )}
             {failure === null ? null : (
-              <p {...styling.props(styles.failure)} data-failure="result" role="alert">
+              <Text data-failure="result" role="alert" as="p" size="md" tone="danger">
                 {failure}
-              </p>
+              </Text>
             )}
             {total === 0 ? (
-              <p {...styling.props(styles.status)} data-status="empty">
+              <Text data-status="empty" as="p" size="md" tone="tertiary">
                 {t(settledQuery === "" ? "empty" : "emptySearch")}
-              </p>
+              </Text>
             ) : null}
             {visible.length > 0 ? (
-              <ul {...styling.props(styles.list)}>
+              <Stack as="ul" gap={4} plain>
                 {visible.map((row) => (
-                  <li
+                  <Row
+                    as="li"
                     key={row.id}
-                    {...styling.props(styles.row)}
+                    gap={16}
+                    justify="between"
+                    boxed
+                    pad="row"
+                    fixed
                     data-session-id={String(row.id)}
                     data-archived={row.archived ? "true" : "false"}
                     data-subagent={row.subagent ? "true" : "false"}
                   >
-                    <span {...styling.props(styles.identity)}>
-                      <span {...styling.props(styles.titleLine)}>
-                        <span {...styling.props(styles.rowTitle)}>{row.title}</span>
+                    <Stack gap={2} grow>
+                      <Row gap={8} grow>
+                        <Text size="md" truncate>{row.title}</Text>
                         {row.archived ? <Tag tone="neutral">{t("archived")}</Tag> : null}
                         {row.subagent ? <Tag tone="quiet">{t("subagent")}</Tag> : null}
-                      </span>
-                      <span {...styling.props(styles.meta)}>
+                      </Row>
+                      <Text size="sm" tone="tertiary">
                         {[row.workspace, timeLabel(row.updatedAt, now, t)].join(" · ")}
-                      </span>
-                    </span>
-                    <span {...styling.props(styles.actions)}>
+                      </Text>
+                    </Stack>
+                    <Row gap={8} fixed>
                       {row.archived ? (
                         <Button
                           variant="outline"
@@ -431,18 +430,16 @@ export function ConversationManagerPage({
                       >
                         {t("remove")}
                       </Button>
-                    </span>
-                  </li>
+                    </Row>
+                  </Row>
                 ))}
-              </ul>
+              </Stack>
             ) : null}
             {matched.length > 0 ? (
-              <div
-                {...styling.props(styles.pagination)}
+              <Row
                 data-pagination=""
                 data-page-current={currentPage}
-                data-page-total={pageCount}
-              >
+                data-page-total={pageCount} gap={8} justify="end" fixed>
                 <Button
                   variant="ghost"
                   size="sm"
@@ -453,9 +450,9 @@ export function ConversationManagerPage({
                 >
                   {t("page.previous")}
                 </Button>
-                <span {...styling.props(styles.paginationLabel)}>
+                <Text size="sm" tone="tertiary" tabular>
                   {t("page.label", { page: currentPage, total: pageCount })}
-                </span>
+                </Text>
                 <Button
                   variant="ghost"
                   size="sm"
@@ -466,9 +463,9 @@ export function ConversationManagerPage({
                 >
                   {t("page.next")}
                 </Button>
-              </div>
+              </Row>
             ) : null}
-          </div>
+          </Stack>
         </>
       )}
       <Modal
@@ -529,12 +526,12 @@ export function ConversationManagerPage({
       />
       {/* 运行期不给关闭手段：没有关闭按钮，mask 与 Escape 都只走空 onClose。 */}
       <Modal open={gcPhase === "running"} onClose={() => {}} headless title={t("gc.title")}>
-        <div {...styling.props(styles.blocking)}>
-          <span {...styling.props(styles.spinner)} aria-hidden="true" />
-          <p {...styling.props(styles.blockingText)}>{t("gc.running")}</p>
-        </div>
+        <Stack align="center" gap={14} pad="blocking">
+          <Spinner label={t("gc.running")} />
+          <Text as="p" size="md">{t("gc.running")}</Text>
+        </Stack>
       </Modal>
-    </div>
+    </Stack>
   );
 }
 
@@ -647,6 +644,8 @@ interface UsageListRow {
   key: string;
   label: string;
   totals: UsageTotals;
+  // 子代理派生会话的行（按会话维度才有此维度；其余维度不带标记）。
+  subagent?: boolean;
 }
 
 function emptyTotals(): UsageTotals {
@@ -663,7 +662,7 @@ function emptyTotals(): UsageTotals {
   };
 }
 
-// 把桶按一个键折叠成行并按用量降序（按天 / 按模型都用它）。
+// 把桶按一个键折叠成行并按用量降序（按模型维度用它：人类的桶与子代理的桶折进同一行）。
 function foldBuckets(
   buckets: readonly UsageBucket[],
   keyOf: (bucket: UsageBucket) => string,
@@ -684,43 +683,54 @@ function foldBuckets(
   );
 }
 
-// 一行用量：label 在上，下面是横向排布的单项。
+// 一行用量：label 在上（子代理行另带标记），下面是横向排布的单项。
 function UsageRow({
   rowKey,
   label,
   totals,
   t,
+  subagent,
   withActivity = true,
 }: {
   rowKey: string;
   label: string;
   totals: UsageTotals;
   t: Translate;
+  subagent?: boolean;
   withActivity?: boolean;
 }): ReactNode {
   return (
-    <li {...styling.props(styles.usageRow)} data-usage-key={rowKey}>
-      <span {...styling.props(styles.usageRowLabel)}>{label}</span>
-      <span {...styling.props(styles.usageMetrics)}>
+    <Stack
+      as="li"
+      gap={6}
+      boxed
+      pad="row"
+      fixed
+      data-usage-key={rowKey}
+      {...(subagent === undefined ? {} : { "data-subagent": subagent ? "true" : "false" })}
+    >
+      <Row gap={8} grow>
+        <Text size="sm" tone="tertiary" truncate>{label}</Text>
+        {subagent === true ? <Tag tone="quiet">{t("subagent")}</Tag> : null}
+      </Row>
+      <Row gap="wide" wrap>
         {usageMetrics(totals, t, { withActivity }).map((metric) => (
-          <span
+          <Stack
             key={metric.key}
-            {...styling.props(styles.usageMetric)}
             data-usage-cell={metric.key}
-            data-usage-value={metric.value}
-          >
-            <span {...styling.props(styles.usageMetricLabel)}>{metric.label}</span>
-            <span {...styling.props(styles.usageMetricValue)}>
+            data-usage-value={metric.value} gap={2}>
+            <Text size="sm" tone="tertiary">{metric.label}</Text>
+            <Text size="lg" weight="medium" tabular>
               {metric.kind === "percent"
                 ? formatPercent(metric.value)
                 : metric.kind === "count"
                   ? formatCount(metric.value)
                   : formatTokens(metric.value)}
-            </span>
-          </span>
+            </Text>
+          </Stack>
         ))}
-      </span>
-    </li>
+      </Row>
+    </Stack>
   );
 }
 
@@ -735,13 +745,13 @@ function UsageList({
 }): ReactNode {
   if (rows.length === 0) {
     return (
-      <p {...styling.props(styles.status)} data-usage-status="empty">
+      <Text data-usage-status="empty" as="p" size="md" tone="tertiary">
         {t("usage.empty")}
-      </p>
+      </Text>
     );
   }
   return (
-    <ul {...styling.props(styles.usageList)}>
+    <Stack as="ul" gap={4} plain>
       {rows.map((row) => (
         <UsageRow
           key={row.key}
@@ -749,20 +759,21 @@ function UsageList({
           label={row.label}
           totals={row.totals}
           t={t}
+          {...(row.subagent === undefined ? {} : { subagent: row.subagent })}
           withActivity={withActivity}
         />
       ))}
-    </ul>
+    </Stack>
   );
 }
 
 // 总览：全部与「其中子代理」两行，与列表行同形。
 function UsageOverview({ report, t }: { report: SessionUsageReport; t: Translate }): ReactNode {
   return (
-    <ul {...styling.props(styles.usageList)}>
+    <Stack as="ul" gap={4} plain>
       <UsageRow rowKey="all" label={t("usage.all")} totals={report.totals} t={t} />
       <UsageRow rowKey="subagent" label={t("usage.subagentOnly")} totals={report.subagent} t={t} />
-    </ul>
+    </Stack>
   );
 }
 
@@ -775,6 +786,8 @@ function UsageView({
   onTab,
   range,
   onRange,
+  onlySubagents,
+  onOnlySubagents,
   t,
 }: {
   report: SessionUsageReport | null;
@@ -784,6 +797,8 @@ function UsageView({
   onTab: (tab: UsageTab) => void;
   range: UsageRange;
   onRange: (range: UsageRange) => void;
+  onlySubagents: boolean;
+  onOnlySubagents: (next: boolean) => void;
   t: Translate;
 }): ReactNode {
   const items: UsageTab[] = ["overview", "models", "sessions"];
@@ -802,64 +817,59 @@ function UsageView({
               `${bucket.provider ?? t("usage.unknownModel")} / ${bucket.model ?? t("usage.unknownModel")}`,
           )
         : report.sessions
+            // 子代理会话单个用量小，混排时会被行数上限挤掉：给一个只看它们的开关（过滤在本页，数据已全量在手）。
+            .filter((row) => !onlySubagents || row.subagent)
             .map((row) => ({
               key: row.sessionId,
               label: row.title ?? row.sessionId,
               totals: row,
+              subagent: row.subagent,
             }))
             .sort((left, right) => sortWeight(right.totals) - sortWeight(left.totals))
             .slice(0, USAGE_SESSION_ROWS);
   return (
-    <div {...styling.props(styles.usage)} data-usage-view={tab} data-usage-range={range}>
-      <div {...styling.props(styles.tabs)} role="radiogroup" aria-label={t("usage.range")}>
-        {USAGE_RANGES.map((option) => (
-          <button
-            key={option}
-            type="button"
-            role="radio"
-            aria-checked={range === option}
-            data-range={option}
-            className={styling.className(styles.tab, range === option && styles.tabActive)}
-            onClick={() => {
-              onRange(option);
-            }}
-          >
-            {rangeLabel(option, t)}
-          </button>
-        ))}
-      </div>
-      <div {...styling.props(styles.tabs)} role="tablist">
-        {items.map((item) => (
-          <button
-            key={item}
-            type="button"
-            role="tab"
-            data-usage-tab={item}
-            aria-selected={tab === item}
-            className={styling.className(styles.tab, tab === item && styles.tabActive)}
-            onClick={() => {
-              onTab(item);
-            }}
-          >
-            {labels[item]}
-          </button>
-        ))}
-      </div>
+    <Stack data-usage-view={tab} data-usage-range={range} gap={12} fixed>
+      <Tabs
+        role="radiogroup"
+        label={t("usage.range")}
+        items={USAGE_RANGES.map((option) => ({ value: option, label: rangeLabel(option, t) }))}
+        value={range}
+        onChange={(next) => {
+          onRange(next as UsageRange);
+        }}
+      />
+      <Tabs
+        label={t("usage.range")}
+        items={items.map((item) => ({ value: item, label: labels[item] }))}
+        value={tab}
+        onChange={(next) => {
+          onTab(next as UsageTab);
+        }}
+      />
+      {tab === "sessions" ? (
+        <Row data-filter="usage-subagents" gap={16} fixed>
+          <Checkbox
+            checked={onlySubagents}
+            label={t("usage.onlySubagents")}
+            onChange={onOnlySubagents}
+          />
+        </Row>
+      ) : null}
       {loading ? (
-        <p {...styling.props(styles.status)} data-usage-status="loading">
+        <Text data-usage-status="loading" as="p" size="md" tone="tertiary">
           {t("usage.loading")}
-        </p>
+        </Text>
       ) : null}
       {error === null ? null : (
-        <p {...styling.props(styles.failure)} data-usage-status="error" role="alert">
+        <Text data-usage-status="error" role="alert" as="p" size="md" tone="danger">
           {error}
-        </p>
+        </Text>
       )}
       {report === null ? null : tab === "overview" ? (
         <UsageOverview report={report} t={t} />
       ) : (
         <UsageList rows={rows} t={t} withActivity={tab === "sessions"} />
       )}
-    </div>
+    </Stack>
   );
 }

package/src/client/index.ts

@@ -9,6 +9,7 @@ import type {} from "@deepseek-ai/dsh-client-ui-sidebar/client";
 import type {} from "@deepseek-ai/dsh-client-ui-session/client";
 import type {} from "@deepseek-ai/dsh-client-ui-workspace/client";
 import type {} from "@deepseek-ai/dsh-api-session-controller/client";
+import { apply as installUiPrimitives } from "@morlay/dsh-client-ui-primitives/client";
 import { ConversationManagerController } from "./controller.ts";
 import { ConversationManagerPage } from "./ConversationManagerPage.tsx";
 import { ConversationManagerIcon } from "./ConversationManagerIcon.tsx";
@@ -39,6 +40,8 @@ export const PANEL_ORDER = 1;
 export const inject = ["slots", "locale", "uiWorkspace", "sessions"];
 
 export function apply(ctx: ClientContext): void {
+  // 基础面随本包 inline（不再是装配行）：装上它提供的字典、字段槽与按行配置页；多份副本只装一次。
+  installUiPrimitives(ctx);
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), "ui-conversation-manager: dictionaries");
   const t = ctx.locale.bind(NS);
   // ctx.sessions 的类型被别的 client 半的声明占住（SessionStore），按既有做法从服务面取。

package/src/client/locales.ts

@@ -36,6 +36,7 @@ export const zh = {
   "usage.userInputs": "用户输入",
   "usage.toolCalls": "工具调用",
   "usage.subagentOnly": "其中子代理",
+  "usage.onlySubagents": "只看子代理会话",
   "usage.unknownModel": "未知模型",
   archive: "归档",
   archiveNamed: "归档 {title}",
@@ -116,6 +117,7 @@ export const en = {
   "usage.userInputs": "User inputs",
   "usage.toolCalls": "Tool calls",
   "usage.subagentOnly": "Subagent share",
+  "usage.onlySubagents": "Subagent sessions only",
   "usage.unknownModel": "Unknown model",
   archive: "Archive",
   archiveNamed: "Archive {title}",