dsh-zen-remote 1.1.16 → 2.0.0

package/src/client/index.tsx

@@ -1,4 +1,5 @@
-import type { ClientContext, SessionId, WorkspaceId } from './compat/types.ts'
+import type { ClientContext, JobsLike, SessionId, WorkspaceId } from './compat/types.ts'
+import { isDesktopShell } from './compat/desktop.ts'
 import { MobileNavToggle } from './MobileNavToggle.tsx'
 import { MobileNavOverlay } from './MobileNavOverlay.tsx'
 import { MobileDrawerFooter } from './MobileDrawerFooter.tsx'
@@ -18,13 +19,27 @@ import { installGestures } from './effects/gestures.ts'
 import { installTurnFold } from './effects/turn-fold.ts'
 import { installModalBack } from './effects/modal-back.ts'
 import { installModelSheetExtras } from './effects/model-sheet-extras.ts'
+import { installPermissionSheet } from './effects/permission-sheet.ts'
 import { installNativeTriggerOverlay } from './effects/native-trigger-overlay.ts'
 import { installWelcomeNoticeOptOut } from './effects/welcome-notice.ts'
 import { installKeyboardGuard } from './effects/keyboard-guard.ts'
 import { installKeyboardAvoid } from './effects/keyboard-avoid.ts'
 import { SharePreview } from './share/share-preview.tsx'
-import { NS, en, zh } from './locales.ts'
+import { NS } from './locales.ts'
 import type { MobileNavKey } from './locales.ts'
+import { SettingsSection } from './settings/SettingsSection.tsx'
+import { registerSettingsPage } from './settings/register-settings.ts'
+import { RemoteHeaderIcon } from './RemoteHeaderIcon.tsx'
+import { RemoteShareMenuItem } from './RemoteShareMenu.tsx'
+import { getSharesStore } from '../client-data/shares.ts'
+import { registerRemoteShareUi } from './remote-share-register.ts'
+import { RemoteStatusIcon } from './RemoteStatusIcon.tsx'
+import { RemoteComposerBanner } from './RemoteComposerBanner.tsx'
+import { registerRemoteStatusUi } from './remote-status-register.ts'
+import { mountCurrentSessionReporter } from './current-session-report.ts'
+import { mountRemoteGroupExpansionKeeper } from './remote-group-expansion.ts'
+import { installRemoteApiFetch } from './remote-fetch.ts'
+import { installRemoteSessionGuard } from './effects/remote-session.ts'
 
 declare module '@deepseek-ai/dsh-client-ui-slots' {
   interface LocaleNamespaceMap {
@@ -37,20 +52,50 @@ declare module '@deepseek-ai/dsh-client-ui-slots' {
 export const inject = ['slots', 'layout', 'locale', 'sessionLogDownload', 'sessions', 'workspaces']
 
 /**
- * 0.1.2 把新建会话和归档会话的界面级操作挪到了 uiWorkspace 服务；
- * 0.1.1 没有这个服务，那两个操作还在 ctx.workspaces 上。这里按存在探测，
- * 不把 uiWorkspace 写进 inject（写了 0.1.1 就永远不激活）。
- * 类型用本地最小接口，不 import 那个 dsh-client-ui-workspace 包
- * ——0.1.1 装不到。
+ * 0.1.2 把新建会话、归档会话与打开会话的界面级操作挪到了 uiWorkspace
+ * 服务（0.1.7 删掉了 ctx.sessions.open，这是它唯一的替代入口）。类型用
+ * 本地最小接口，不 import 那个 dsh-client-ui-workspace 包——本插件的
+ * peerDependencies 不含它，运行时实例由宿主提供，类型自己声明就够。
  */
 interface UiWorkspaceLike {
+  openSession(target: SessionId): void
   startSession(workspaceId?: WorkspaceId): void
   archiveSession(sessionId: SessionId): Promise<void>
 }
 
-/** 0.1.1 的 ctx.workspaces 上还有 startSession；0.1.2 的类型里没有了。 */
-interface LegacyWorkspacesLike {
-  startSession(workspaceId?: WorkspaceId): void
+/**
+ * Activity data both session-header entries read (0.1.7 sources — 0.1.5's
+ * per-parent subagent snapshot and per-session job snapshot are gone):
+ * - the subagent catalog is read straight off the sessions snapshot's
+ *   explicit-read store (`projectionsBySession[id].values.subagentCatalog`),
+ *   exactly like the official SubagentHeaderLineage — no refresh is issued
+ *   from here: every projection refresh call registers another session in
+ *   the controller's load table, and all of them are re-read on every
+ *   reconnect (manager handleConnected), so per-open refreshes would grow
+ *   into a batch of re-reads forever;
+ * - job rows come from the `jobs` client service; the inject face mirrors
+ *   the official JobListAction registration (`hooks.jobs` observable → the
+ *   renderer hands the component a `useJobs` hook prop). When the service is
+ *   absent (a build without the job controller) a fixed empty source keeps
+ *   the prop present, so the component's hook count never varies — the
+ *   counts simply read zero instead of the pill silently disappearing.
+ */
+const NO_JOBS_SNAPSHOT = Object.freeze({ rows: Object.freeze({}) }) as {
+  readonly rows: Readonly<Record<string, readonly never[]>>
+}
+/** Module-level singleton: one stable observable identity across renders. */
+const NO_JOBS_SOURCE = {
+  getSnapshot: () => NO_JOBS_SNAPSHOT,
+  subscribe: (): (() => void) => () => {},
+}
+const NO_WATCH_ROWS = (): (() => void) => () => {}
+
+function activityInject(ctx: ClientContext) {
+  const jobs = ctx.get('jobs') as JobsLike | undefined
+  return {
+    hooks: { jobs: jobs === undefined ? NO_JOBS_SOURCE : jobs.state },
+    watchRows: jobs === undefined ? NO_WATCH_ROWS : (id: SessionId) => jobs.watchRows(id),
+  }
 }
 
 /**
@@ -60,7 +105,58 @@ interface LegacyWorkspacesLike {
  * @param ctx - client root context.
  */
 export function apply(ctx: ClientContext): void {
-  ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'dsh-mobile-nav: dictionaries')
+  // 2.0.0 设置页：必须在桌面门之前注册——桌面端 App 里手机外壳整体不生效，
+  // 但设置页必须生效（主服务端就是桌面端）。字典、设置页样式与设置表单服务
+  // 的按需注入都在 registerSettingsPage 里（那个服务名绝不进顶层的 inject
+  // 数组，否则没有该服务的环境整个界面半边都加载不了）。
+  registerSettingsPage(ctx, SettingsSection)
+
+  // T33b 会话共享的三个入口里前两个（标题行远程图标、会话右键菜单项）：
+  // 同样必须在桌面门之前注册——桌面端 App 就是主服务端，图标和菜单恰好
+  // 住在它的标题行与会话菜单里。部件自身按数据降级：shares 路由 404
+  // （子客户端部署没有这条路由）时渲染为空；手机外壳下样式表把
+  // header.actions 全量隐藏（styles/header.css.ts），图标也就不订阅
+  // （subscribeIfNotPhoneShell）——订阅是轮询的燃料，不订阅就不发
+  // admin/shares 请求。设置页的共享列表在 SettingsSection 内部，随设置
+  // 页已在门之前。
+  registerRemoteShareUi(ctx, RemoteHeaderIcon, RemoteShareMenuItem)
+
+  // T34 子客户端的远程状态两件套（标题行连接图标、composer 横幅）：同样在
+  // 桌面门之前注册——桌面端 App 也能以 client 角色接入服务端。部件自身按
+  // 数据降级：只在虚拟 id 会话渲染、首次 GET 应答前不渲染，所以主服务端
+  // 的页面上两者都是空，桌面保持逐像素 no-op；订阅本身也按虚拟 id 门控
+  // （remote-status.ts 的 subscribeIfVirtual）——本地会话不建立订阅，
+  // store 只在有订阅者时才轮询，主服务端的页面不白发 remote-status 请求。
+  registerRemoteStatusUi(ctx, RemoteStatusIcon, RemoteComposerBanner)
+  // T62 当前会话信号的上报：拦截层跑在后台 Node 进程里，读不到浏览器的
+  // localStorage——由这里（唯一读得到宿主选择存储的地方）把「当前打开的
+  // 会话」在值变化时 POST 给后台路由。同样在桌面门之前挂载：client 角色
+  // 的桌面端 App 正是远程会话所在；只在探测出的子客户端角色下运行，主
+  // 服务端的页面探测一次后就静默。
+  mountCurrentSessionReporter(ctx)
+  // T64 服务端分组展开状态的记忆与恢复：宿主在工作区列表 ready 时会把不在
+  // 列表里的分组展开记录清掉（retainAccountKeys），而本地工作区先 ready、
+  // 服务端分组后并入，zr~ 键每次加载都被清掉、分组回到折叠。与上报器共用
+  // 挂载点与角色判断（同一个 client-config 探测）、同样的 1 秒节拍（自己的
+  // 定时器），逻辑在 remote-group-expansion.ts 自己的文件里。
+  mountRemoteGroupExpansionKeeper(ctx)
+  // T41b 的两个远程会话部件：fetch 改写（改动 / diff 面板的两条 /api GET）与
+  // 远程会话标记（data-zr-remote-session + 隐藏「在服务端机器上打开」类入口
+  // 的样式）。同样必须在桌面门之前注册——桌面窗口也可以是配对好的子客户端，
+  // 改写与隐藏在它里面一样必要。改写只碰「同源 + 精确两条路径 + zr~ 虚拟
+  // 会话 id」的 GET（remote-fetch.ts），宿主角色的桌面端（会话 id 永非虚拟）
+  // 逐字节原样放行；标记属性只在虚拟会话打开时出现，卸载时还原。
+  ctx.effect(() => installRemoteApiFetch(window), 'dsh-zen-remote: remote api fetch')
+  installRemoteSessionGuard(ctx)
+
+  // Desktop gate (DSH 0.1.7): the official Electron shell can be dragged
+  // down to ~520px wide, where every width-based gate would flip the phone
+  // shell on inside the desktop app. Inside that shell this plugin is a
+  // complete no-op — no stylesheet, no effects, no slot entries, which is
+  // bit-for-bit "not installed" and also retires the desktop-fold knobs
+  // there (they exist for narrow desktop *browsers*, which never carry the
+  // dshDesktop bridge). See compat/desktop.ts for the marker's provenance.
+  if (isDesktopShell()) return
 
   ctx.effect(() => {
     const tag = document.createElement('style')
@@ -111,6 +207,9 @@ export function apply(ctx: ClientContext): void {
   // Third-party composer entries (speed chip, vision toggle) move into the
   // model sheet — the row has no width to spare and both are model settings.
   installModelSheetExtras(ctx)
+  // T70: the permission menu portals to body on DSH 0.2.0 — mark it so
+  // composer.css section 4 can still make it the bottom sheet.
+  installPermissionSheet(ctx)
 
   // "内测声明" first-run notice: keep it visible (CSS-hiding it leaked the
   // dialog's #root inert lock — see effects/welcome-notice.ts) and offer a
@@ -156,6 +255,8 @@ export function apply(ctx: ClientContext): void {
     id: 'mobile-header-actions',
     order: 0,
     locale: NS,
+    // Activity-pill data (subagent catalog + job roster), see activityInject.
+    inject: () => activityInject(ctx),
   }, MobileHeaderActions))
 
   // Session-info entry (placeholder — S4 owns the sheet) + workbench entry
@@ -180,14 +281,29 @@ export function apply(ctx: ClientContext): void {
     locale: NS,
     // The factory's own sessionId param is unused: every function below
     // takes its own session id explicitly (they're generic action bindings
-    // reused verbatim, not closures over one particular session).
+    // reused verbatim, not closures over one particular session). The
+    // spread adds the activity-pill data (subagent catalog + job roster for
+    // the info-sheet badges), see activityInject.
     inject: (_sessionId: SessionId) => ({
+      ...activityInject(ctx),
+      // T67: the SAME page-wide shares store the header icon and the menu
+      // item read — the row subscribes only while the sheet is open, so no
+      // second poll loop and no phone-shell polling either.
+      shares: getSharesStore(),
       forkSession: (id: SessionId) => ctx.sessions.fork({ sessionId: id }),
-      openSession: (id: SessionId) => ctx.sessions.open(id),
+      // 0.1.7: ctx.sessions.open is gone; uiWorkspace.openSession is the one
+      // navigation entry (also what the official subagent catalog uses).
+      // Lazy lookup like every other uiWorkspace binding here: the callback
+      // runs on a user tap, by which time the service is registered.
+      openSession: (id: SessionId) => {
+        const ui = ctx.get('uiWorkspace') as UiWorkspaceLike | undefined
+        if (ui === undefined) console.warn('[dsh-zen-remote] uiWorkspace service unavailable; cannot open session', id)
+        else ui.openSession(id)
+      },
       renameSession: (id: SessionId, title: string) => ctx.sessions.binding(id)?.session.rename(title),
       // 0.1.2 的界面级归档在 uiWorkspace（顺带清当前选中）；懒查——回调是用户
-      // 点击才跑，那时服务必已注册。本插件的 inject 不包含 uiWorkspace（0.1.1
-      // 没有它），所以启动时不能查一次就用：可能早于它注册。
+      // 点击才跑，那时服务必已注册。本插件的 inject 不包含 uiWorkspace，
+      // 所以启动时不能查一次就用：可能早于它注册。
       archiveSession: (id: SessionId) => {
         const ui = ctx.get('uiWorkspace') as UiWorkspaceLike | undefined
         return ui === undefined ? ctx.workspaces.archiveSession(id) : ui.archiveSession(id)
@@ -242,16 +358,18 @@ export function apply(ctx: ClientContext): void {
     locale: NS,
     store: nav,
     inject: () => ({
-      openSession: (id: SessionId) => ctx.sessions.open(id),
+      // Same uiWorkspace.openSession binding as the session-info sheet above.
+      openSession: (id: SessionId) => {
+        const ui = ctx.get('uiWorkspace') as UiWorkspaceLike | undefined
+        if (ui === undefined) console.warn('[dsh-zen-remote] uiWorkspace service unavailable; cannot open session', id)
+        else ui.openSession(id)
+      },
       // uiWorkspace 懒查：回调是用户点击才跑，服务那时必已注册（inject 不含
-      // uiWorkspace，启动时可能先于它注册，不能启动查一次就用）。0.1.1 上恒
-      // undefined，退回 ctx.workspaces.startSession——0.1.1 专用分支，0.1.2 的
-      // 类型里该方法已不存在，故对类型做 LegacyWorkspacesLike cast，运行时走不到。
+      // uiWorkspace，启动时可能先于它注册，不能启动查一次就用）。
       startSession: (workspaceId?: WorkspaceId) => {
         const ui = ctx.get('uiWorkspace') as UiWorkspaceLike | undefined
-        return ui === undefined
-          ? (ctx.workspaces as unknown as LegacyWorkspacesLike).startSession(workspaceId)
-          : ui.startSession(workspaceId)
+        if (ui === undefined) console.warn('[dsh-zen-remote] uiWorkspace service unavailable; cannot start a session')
+        else ui.startSession(workspaceId)
       },
       // S5 session-log chip — the same service call MobileDrawerFooter uses.
       downloadSessionLog: (id: SessionId) => ctx.sessionLogDownload.download(id),
@@ -315,22 +433,19 @@ import type {} from '@deepseek-ai/dsh-client-ui-conversation/client'
 import type {} from '@deepseek-ai/dsh-client-ui-sidebar/client'
 import type {} from '@deepseek-ai/dsh-client-locale/client'
 import type {} from '@deepseek-ai/dsh-session-log-export/client'
-// 0.1.2-only package: augments GlobalStandardProps with
-// useSessions/useSessionPendingInteraction and SessionStandardProps with
-// sessionId/useSession/useProjection, and declares the `ctx.uiSession`
-// service. 0.1.1 has no such package — but this is `import type`, so the
-// build output carries no trace of it and the runtime is unaffected.
+// ui-session: augments GlobalStandardProps with useSessions /
+// useSessionPendingInteraction / useSessionStatus and SessionStandardProps
+// with sessionId/useSession/useProjection, and declares the `ctx.uiSession`
+// service.
 import type {} from '@deepseek-ai/dsh-client-ui-session/client'
-// 0.1.2-only controller packages: their `/client` type entries merge
-// `ctx.sessions` / `ctx.workspaces` onto the cordis Context (0.1.1 declared
-// both from dsh-client-runtime). Type-only again — nothing to load at
-// runtime, so a 0.1.1 installation is unaffected.
+// Controller packages: their `/client` type entries merge `ctx.sessions` /
+// `ctx.workspaces` onto the cordis Context. Type-only — nothing to load at
+// runtime.
 import type {} from '@deepseek-ai/dsh-api-session-controller/client'
 import type {} from '@deepseek-ai/dsh-api-workspace-controller/client'
-// 0.1.2-only, type-only: the renderer declares `ctx.slots` on the cordis
-// Context (the service this plugin registers every slot through) and
-// `dsh-subagent/client` types the subagent catalog rows the session header
-// reads (SessionListState.subagentsByParent). 0.1.1 had both declared in the
-// dsh-client-runtime bundle that no longer exists.
+// Type-only: the renderer declares `ctx.slots` on the cordis Context (the
+// service this plugin registers every slot through) and `dsh-subagent/client`
+// types the subagent catalog projection entries the session header reads
+// (projectionsBySession[].values.subagentCatalog on 0.1.7).
 import type {} from '@deepseek-ai/dsh-client-ui-renderer/client'
 import type {} from '@deepseek-ai/dsh-subagent/client'