dsh-zen-remote 2.3.8 → 2.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-zen-remote",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "description": "一个插件、两种角色：主服务端把 DeepSeek Harness 变成手机能安全访问的 PWA（移动端界面、配对码网关、Web Push），并把选定会话共享给已配对的桌面端；子客户端在另一台 DSH 桌面端的侧边栏里远程使用这些会话。One DSH plugin, two roles: the host turns DeepSeek Harness into a phone-reachable PWA (mobile UI, pairing-code gateway behind your own reverse proxy, Web Push) and shares chosen sessions to paired desktops; the client uses those sessions remotely from another DSH desktop app's sidebar.",
   "license": "MIT",
   "type": "module",

package/scripts/check-settings-form.mjs

@@ -18,8 +18,11 @@
 import assert from 'node:assert/strict'
 import {
   CLIENT_RECONNECT_ROUTE,
+  CLIENT_STATUS_ROUTE,
+  awaitClientStatusReady,
   claimDeviceNameOf,
   shouldFollowServerDeviceName,
+  shouldReloadAfterClientActivation,
   createLatestGate,
   clientStatusLineOf,
   deriveClientStatusView,
@@ -935,3 +938,63 @@ test('T59: hasDraft tracks the staged map; writeDeviceName lands one serverName
   assert.deepEqual(state.mutateCalls.at(-1).ops, [{ op: 'set', path: ['serverName'], value: '服务端的名' }])
   assert.equal(state.mutateCalls.at(-1).expectedRevision, 8, 'fenced like every direct write')
 })
+
+// ---- UX-1: the reload-after-first-client-activation decision -----------------
+
+test('shouldReloadAfterClientActivation truth table: nothing saved or not client never reloads', () => {
+  // The write did not land — nothing changed, no reload ever.
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: false, nowClientRole: true, savedOrPaired: false }), false)
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: true, nowClientRole: true, savedOrPaired: false }), false)
+  // The role is not (or not becoming) client — no reload even though it saved.
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: false, nowClientRole: false, savedOrPaired: true }), false)
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: true, nowClientRole: false, savedOrPaired: true }), false)
+})
+
+test('shouldReloadAfterClientActivation: a host→client switch always reloads', () => {
+  // The page opened while 'host': its three global streams are unwrapped, so
+  // the switch must reload no matter what the (absent) diagnostics said.
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: false, nowClientRole: true, savedOrPaired: true }), true)
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: false, nowClientRole: true, savedOrPaired: true, streamInterceptAlreadyActive: false }), true)
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: false, nowClientRole: true, savedOrPaired: true, streamInterceptAlreadyActive: true }), true, 'a stale positive flag cannot beat the switch')
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: false, nowClientRole: true, savedOrPaired: true, streamInterceptAlreadyActive: undefined }), true, 'unknown diagnostics still reloads on a role switch')
+})
+
+test('shouldReloadAfterClientActivation: already client reloads only when the intercept was NOT active', () => {
+  // First pairing completed on an already-client page whose backend
+  // interceptor had not installed yet (openWireStream never wrapped) — reload.
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: true, nowClientRole: true, savedOrPaired: true, streamInterceptAlreadyActive: false }), true)
+  // Re-pairing / renaming on an already-active client — NO reload (the
+  // restart-watcher rewraps in place, the open streams keep working).
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: true, nowClientRole: true, savedOrPaired: true, streamInterceptAlreadyActive: true }), false)
+  // Unknown diagnostics (an older server without the intercept field) never
+  // reloads by itself — the flag must be an explicit false.
+  assert.equal(shouldReloadAfterClientActivation({ wasEffectiveClient: true, nowClientRole: true, savedOrPaired: true, streamInterceptAlreadyActive: undefined }), false)
+})
+
+test('CLIENT_STATUS_ROUTE is the poll target for the post-activation wait', () => {
+  assert.equal(CLIENT_STATUS_ROUTE, '/_dsh/zen-remote/client/status')
+})
+
+test('awaitClientStatusReady resolves on the first ok answer', async () => {
+  let calls = 0
+  const fetchFn = async () => { calls += 1; return { ok: true } }
+  await awaitClientStatusReady(fetchFn, 5_000, 10)
+  assert.equal(calls, 1, 'one ok answer ends the wait immediately')
+})
+
+test('awaitClientStatusReady keeps polling until an ok answer arrives', async () => {
+  let calls = 0
+  const fetchFn = async () => { calls += 1; return calls < 3 ? { ok: false } : { ok: true } }
+  await awaitClientStatusReady(fetchFn, 5_000, 5)
+  assert.equal(calls, 3, 'polls through the not-ready answers')
+})
+
+test('awaitClientStatusReady gives up after the deadline and still resolves', async () => {
+  let calls = 0
+  const fetchFn = async () => { calls += 1; throw new Error('row reloading') }
+  const started = Date.now()
+  await assert.doesNotReject(awaitClientStatusReady(fetchFn, 60, 10))
+  const elapsed = Date.now() - started
+  assert.ok(elapsed >= 50, `waited out the deadline (elapsed ${elapsed}ms)`)
+  assert.ok(calls >= 2, `polled more than once before giving up (${calls} calls)`)
+})

package/src/adapters/dsh-better-sidebar/index.ts

@@ -1,6 +1,6 @@
 /**
  * The dsh-better-sidebar adapter (PB-12), written against EXACTLY
- * versions 0.25.0, 0.26.0, 0.26.1, 0.28.0-alpha.0, 0.28.0, 0.28.1 and 0.28.2 (PB-15 widened the list; 0.26.1 is a
+ * versions 0.25.0, 0.26.0, 0.26.1, 0.28.0-alpha.0, 0.28.0, 0.28.1, 0.28.2 and 0.30.0 (PB-15 widened the list; 0.26.1 is a
  * perf-only patch with the same wire surface as 0.26.0; 0.26.0 is a JSON-api
  * superset of 0.25.0 — it grows fs.readPage and the sidechat dequeue/model/
  * models methods, and moves fs.write's content onto the new raw-text
@@ -42,6 +42,15 @@ import { SIDEBAR_METHODS, sidebarMethodNameOf } from './methods.js'
  * backend would accept anyway. */
 const SIDEBAR_MAX_BODY_BYTES = 1024 * 1024
 
+/** 0.30.0: a `sidechat.prompt` carrying images reads its body under
+ * `sidechatPromptBodyLimit` (lib/index.js:7004) — 1 MiB of metadata plus the
+ * base64 of at most SIDECHAT_MAX_MESSAGE_IMAGE_BYTES = 20 MiB of images and
+ * 4 bytes per image (≤ 8). Every other method keeps the plugin's own 1 MiB
+ * (`readJsonBody`'s default), so the route cap only has to admit this one
+ * ceiling; the backend still enforces the per-method limit itself. */
+const SIDEBAR_IMAGE_PROMPT_MAX_BODY_BYTES =
+  SIDEBAR_MAX_BODY_BYTES + 4 * Math.ceil((20 * 1024 * 1024) / 3) + 4 * 8
+
 /** The method name out of a `/sidebar/api/*` pathname, or `''`. */
 const apiMethodOf = (pathname: string): string => sidebarMethodNameOf(pathname) ?? ''
 
@@ -70,7 +79,13 @@ export const dshBetterSidebarAdapter: BridgeAdapter = {
   // full-log `sessionQuery.observeSession`, then the host defaultDirectory,
   // and only then a client `cwd` hint — so the server hook's cwd stripping
   // below stays correct (if anything, the client hint matters less).
-  versions: ['0.25.0', '0.26.0', '0.26.1', '0.28.0-alpha.0', '0.28.0', '0.28.1', '0.28.2'],
+  // 0.30.0 (DSH 0.2.2-rc.1+): same JSON-api method set and WebSockets; one
+  // new EXACT GET route, `/sidebar/sidechat-image?childId&messageId&blockIndex`
+  // (lib/index.js:9869-9896), which streams a saved side-chat image — bridged
+  // below on its `childId`. `sidechat.prompt` grows an `images` array (base64,
+  // up to ~27.7 MiB body) — the api route cap widens to that. GenUI, quote
+  // chips and editor draft backup are client-only (no new host routes).
+  versions: ['0.25.0', '0.26.0', '0.26.1', '0.28.0-alpha.0', '0.28.0', '0.28.1', '0.28.2', '0.30.0'],
   // PB-19 (ADR-0003): the wire-surface whitelist. Keys are digest16 over the
   // PB-18 extractor's reduction (`surface.ts` beside this file) of the npm
   // builds' lib/index.js, computed off /tmp/bs-versions/{version}/lib/index.js:
@@ -78,6 +93,7 @@ export const dshBetterSidebarAdapter: BridgeAdapter = {
   //   96465143373a31a7 — the 0.26.0 generation (0.26.1 hashes identically)
   //   6ed29a896101e681 — the 0.28.0 generation (0.28.0-alpha.0 identically)
   //   65a0acaeb56f87d9 — the 0.28.1 generation (0.28.2 identically)
+  //   394de9f588d37092 — the 0.30.0 generation (+ /sidebar/sidechat-image)
   // An installed version outside `versions` still registers when its build
   // hashes into one of these (a wire-identical patch release bridges without
   // a zen-remote release); anything else fails closed to the unlisted-version
@@ -88,6 +104,7 @@ export const dshBetterSidebarAdapter: BridgeAdapter = {
     '96465143373a31a7': 'the 0.26.0 generation (0.26.1 identical)',
     '6ed29a896101e681': 'the 0.28.0 generation (0.28.0-alpha.0 identical)',
     '65a0acaeb56f87d9': 'the 0.28.1 generation (0.28.2 identical)',
+    '394de9f588d37092': 'the 0.30.0 generation',
   },
   routes: [
     {
@@ -97,7 +114,7 @@ export const dshBetterSidebarAdapter: BridgeAdapter = {
       path: '/sidebar/api',
       match: 'prefix',
       methods: ['POST'],
-      maxBody: SIDEBAR_MAX_BODY_BYTES,
+      maxBody: SIDEBAR_IMAGE_PROMPT_MAX_BODY_BYTES,
       locator: { in: 'json-body', fields: ['sessionId', 'rootSessionId', 'childId'] },
       deny: ({ pathname, currentSessionId }) => {
         const name = apiMethodOf(pathname)
@@ -121,6 +138,9 @@ export const dshBetterSidebarAdapter: BridgeAdapter = {
     // claims the EXACT documented path — a sub-path (if a future version
     // grows one) stays local rather than being guessed at.
     { path: '/sidebar/file', match: 'exact', methods: ['GET'], locator: { in: 'query', name: 'sessionId' } },
+    // 0.30.0: a saved side-chat image (lib/index.js:9869-9896) — the child
+    // session id rides the query; the answer is raw image bytes with no ids.
+    { path: '/sidebar/sidechat-image', match: 'exact', methods: ['GET'], locator: { in: 'query', name: 'childId' } },
     // The archive download (lib/index.js:6949-6985).
     { path: '/sidebar/archive', match: 'exact', methods: ['GET'], locator: { in: 'query', name: 'sessionId' } },
     // The raw upload (lib/index.js:6905-6948): binary bytes, capped by the

package/src/client/MobileHome.tsx

@@ -21,6 +21,7 @@ import type { createNavStore } from './nav-store.ts'
 import type { WorkspaceFilter } from './nav-store.ts'
 import type { MobileNavKey } from './locales.ts'
 import { dotState } from './session-dot.ts'
+import { decideNewSessionAction } from '../client-data/new-session.ts'
 import { MobileHomeChips, MobileHomeChipsSheetBody } from './MobileHomeChips.tsx'
 
 /** Full props for the phone home screen (shell.overlay entry). */
@@ -280,7 +281,7 @@ export function MobileHome({
   // list re-renders on any session change anyway (the running dots live here).
   const sessions = useSessions((s) => s)
   const workspaces = useWorkspaces((s) => s)
-  const [sheet, setSheet] = useState<'filter' | 'chips' | null>(null)
+  const [sheet, setSheet] = useState<'filter' | 'chips' | 'new-session' | null>(null)
   /** The one row whose archive action is swiped open (null = none). */
   const [swipeOpen, setSwipeOpen] = useState<SessionId | null>(null)
   // 0.1.2 的待处理交互来源；0.1.1 没有这个标准 prop，读到 undefined 时用一个
@@ -382,7 +383,25 @@ export function MobileHome({
       return
     }
     frame.setAttribute('data-mobile-view', view)
-    return () => frame.removeAttribute('data-mobile-view')
+    // DSH 0.2.2-rc.1+ puts `inert=""` on `[class$="_sidebarCol"]` while
+    // `drawer && sidebarCollapsed` (< 768px). Because home.css.ts already
+    // hides sidebarCol with `display: none !important`, `inert` is redundant
+    // for accessibility/tab order, but per HTML spec an `inert` ancestor
+    // suppresses synthetic `.click()` (breaking openSettings and harvested
+    // sidebar-footer chips) and blocks pointer events inside non-portal
+    // sidebar dialogs. Strip it and keep it stripped while the phone shell
+    // owns the viewport.
+    const sidebarCol = frame.querySelector<HTMLElement>(':scope > [class$="_sidebarCol"]')
+    const clearInert = (): void => {
+      if (sidebarCol?.hasAttribute('inert')) sidebarCol.removeAttribute('inert')
+    }
+    clearInert()
+    const observer = sidebarCol ? new MutationObserver(clearInert) : null
+    observer?.observe(sidebarCol!, { attributes: true, attributeFilter: ['inert'] })
+    return () => {
+      observer?.disconnect()
+      frame.removeAttribute('data-mobile-view')
+    }
   }, [phone, view])
 
   const enter = (start: () => void): void => {
@@ -560,7 +579,19 @@ export function MobileHome({
         data-mobile-nav="home-fab"
         aria-label={t('newSession')}
         title={t('newSession')}
-        onClick={() => enter(() => startSession(selectedWorkspace?.workspaceId))}
+        onClick={() => {
+          // UX-3: never enter a dangling no-workspace session. With "all"
+          // selected (the common case — the host's own sessions belong to no
+          // workspace) the decision either auto-starts the only workspace or
+          // opens the workspace drawer first; the session then starts with a
+          // workspace attached from the first frame.
+          const action = decideNewSessionAction(
+            selectedWorkspace?.workspaceId,
+            workspaces.items.map((item) => item.workspaceId),
+          )
+          if (action.kind === 'start') enter(() => startSession(action.workspaceId))
+          else setSheet('new-session')
+        }}
       >
         <IconPlusOutlineRegular size={18} />
         <span>{t('newSession')}</span>
@@ -575,13 +606,15 @@ export function MobileHome({
             aria-label={t('close')}
             onClick={() => setSheet(null)}
           />
-          {/* Two sheets share this one container (chrome + S6 drag-to-close
+          {/* Three sheets share this one container (chrome + S6 drag-to-close
             * + mask-click-close, all keyed off data-mobile-nav="home-sheet"
             * generically — effects/gestures.ts): the workspace switcher
-            * (role="menu", unchanged) and the S5 chip-customize toggle list
-            * (MobileHomeChipsSheetBody, no menu semantics — its rows are
-            * switches, not menu items that close the sheet on click). */}
-          <div data-mobile-nav="home-sheet" role={sheet === 'filter' ? 'menu' : undefined}>
+            * (role="menu", unchanged), the UX-3 new-session workspace pick
+            * (role="menu" — its rows navigate and close), and the S5
+            * chip-customize toggle list (MobileHomeChipsSheetBody, no menu
+            * semantics — its rows are switches, not menu items that close
+            * the sheet on click). */}
+          <div data-mobile-nav="home-sheet" role={sheet === 'chips' ? undefined : 'menu'}>
             {sheet === 'filter' && (
               <>
                 <div data-mobile-nav="home-sheet-title">{t('switchWorkspace')}</div>
@@ -614,6 +647,28 @@ export function MobileHome({
                 ))}
               </>
             )}
+            {sheet === 'new-session' && (
+              <>
+                <div data-mobile-nav="home-sheet-title">{t('pickWorkspaceNew')}</div>
+                {workspaces.items.map((item) => (
+                  <button
+                    key={item.workspaceId}
+                    type="button"
+                    role="menuitem"
+                    data-mobile-nav="home-sheet-item"
+                    onClick={() => {
+                      // Pin the list to the picked workspace (so backing out
+                      // of the blank session lands on ITS list) and start the
+                      // session with that workspace from the first frame.
+                      actions.filter(item.workspaceId)
+                      enter(() => startSession(item.workspaceId))
+                    }}
+                  >
+                    {item.title}
+                  </button>
+                ))}
+              </>
+            )}
             {sheet === 'chips' && <MobileHomeChipsSheetBody t={t} />}
           </div>
         </div>

package/src/client/MobileNavOverlay.tsx

@@ -128,7 +128,9 @@ export function MobileNavOverlay({ toggleSidebar, t }: MobileNavOverlayProps) {
       if (document.querySelector('[aria-modal="true"]') !== null) return
       const target = event.target as HTMLElement | null
       if (target === null) return
-      const drawer = document.querySelector<HTMLElement>('[data-mobile-nav="frame"] > :first-child')
+      const drawer = document.querySelector<HTMLElement>(
+        '[data-mobile-nav="frame"] > [class$="_sidebarCol"], [data-mobile-nav="frame"] > :first-child:not([data-sidebar-mask])',
+      )
       if (drawer === null || !drawer.contains(target)) return
       // A session row's own action buttons — the "Session actions" kebab
       // (delete / rename), revealed on hover / long-press — open an edit

package/src/client/MobileSessionHeader.tsx

@@ -74,7 +74,13 @@ type ActivityState = 'running' | 'done' | 'warning'
  * the root through `:has()` instead of naming it.
  */
 const HEADER = '[data-phase] header'
-const SUBAGENT_TRIGGER = `${HEADER} button[aria-haspopup="tree"]`
+/* UX-2 (2026-11-04): narrowed by the action-button class tail. The bare
+   `button[aria-haspopup="tree"]` matched the breadcrumb's parent-session
+   switcher first (`…_switcherTrigger` — also a tree popup), so both the
+   overlay and this fallback check resolved to the wrong button. The suffix
+   matcher is case-sensitive and `_switcherTrigger` does not end in
+   `_trigger`. Must stay in lockstep with effects/native-trigger-overlay.ts. */
+const SUBAGENT_TRIGGER = `${HEADER} button[class$="_trigger"][aria-haspopup="tree"]`
 const JOBS_TRIGGER = `${HEADER} button[class$="_trigger"]:not([aria-haspopup])`
 
 /** One glanceable group: icon + count + state dot; opens the official popover. */

package/src/client/effects/native-trigger-overlay.ts

@@ -26,38 +26,77 @@ import type { ClientContext } from '../compat/types.ts'
 const PHONE = '(max-width: 767px)'
 const HEADER = '[data-phase] header'
 
-/** Pill → the official trigger it fronts. Same ARIA split the pills use. */
+/**
+ * Pill → the official trigger it fronts. Same ARIA split the pills use,
+ * narrowed by the action-button class tail (UX-2, 2026-11-04): the bare
+ * `button[aria-haspopup="tree"]` matched the breadcrumb's parent-session
+ * switcher first (`…_switcherTrigger` — also a tree popup, earlier in
+ * document order), so the pill got the wrong button laid over it. The
+ * suffix matcher is case-sensitive and `_switcherTrigger` does not end in
+ * `_trigger`, so the catalog trigger is the only match left.
+ */
 const PAIRS: ReadonlyArray<{ pill: string, trigger: string }> = [
-  { pill: '[data-activity-kind="subagent"]', trigger: `${HEADER} button[aria-haspopup="tree"]` },
+  { pill: '[data-activity-kind="subagent"]', trigger: `${HEADER} button[class$="_trigger"][aria-haspopup="tree"]` },
   { pill: '[data-activity-kind="job"]', trigger: `${HEADER} button[class$="_trigger"]:not([aria-haspopup])` },
 ]
 
-/** Marks a trigger we have taken over, so cleanup can find it again. */
+/** Marks a trigger (and its anchor container) we have taken over, so cleanup can find them again. */
 const TAKEN = 'data-zen-overlay'
 
+/** The shared fixed-viewport box: exactly what the portalled popover measures against. */
+function pin(el: HTMLElement, r: { left: number, top: number, width: number, height: number }, display?: string): void {
+  el.style.setProperty('position', 'fixed', 'important')
+  el.style.setProperty('left', `${r.left}px`, 'important')
+  el.style.setProperty('top', `${r.top}px`, 'important')
+  el.style.setProperty('width', `${r.width}px`, 'important')
+  el.style.setProperty('height', `${r.height}px`, 'important')
+  el.style.setProperty('margin', '0', 'important')
+  el.style.setProperty('padding', '0', 'important')
+  el.style.setProperty('border', '0', 'important')
+  if (display !== undefined) el.style.setProperty('display', display, 'important')
+}
+
 function place(trigger: HTMLElement, pill: Element): void {
   const r = pill.getBoundingClientRect()
   if (r.width === 0 || r.height === 0) return
   trigger.setAttribute(TAKEN, '')
+  pin(trigger, r)
   // Fixed, not absolute: the header's containing block is not the pill's, and
   // fixed rects are exactly what the portalled popover measures against.
-  trigger.style.setProperty('position', 'fixed', 'important')
-  trigger.style.setProperty('left', `${r.left}px`, 'important')
-  trigger.style.setProperty('top', `${r.top}px`, 'important')
-  trigger.style.setProperty('width', `${r.width}px`, 'important')
-  trigger.style.setProperty('height', `${r.height}px`, 'important')
-  trigger.style.setProperty('margin', '0', 'important')
-  trigger.style.setProperty('padding', '0', 'important')
-  trigger.style.setProperty('border', '0', 'important')
   trigger.style.setProperty('opacity', '0', 'important')
   trigger.style.setProperty('overflow', 'hidden', 'important')
   trigger.style.setProperty('pointer-events', 'auto', 'important')
   trigger.style.setProperty('z-index', '3', 'important')
+  // The official popover (useAnchoredPosition) sizes itself from the OUTER
+  // anchor container — the trigger's parent div, the official rootRef — not
+  // the button. header.css.ts dissolves that container with
+  // display:contents, so its rect was all zeros and the panel landed at
+  // 12,12 inside the status bar (UX-2). Give the anchor the pill's exact
+  // box: the inline display beats the stylesheet's display:contents
+  // !important (the style attribute outranks selectors at author-important),
+  // so rootRef.getBoundingClientRect() finally sees the pill. pointer-events
+  // none keeps the invisible box from ever stealing a tap — the trigger
+  // child above it is the tappable one. z-index 3 is required on the anchor
+  // too: position:fixed unconditionally creates a stacking context (even at
+  // z-index:auto, stack level 0), which otherwise traps the trigger's own
+  // z-index:3 underneath [data-mobile-nav="header-activity"] (z-index:1).
+  const anchor = trigger.parentElement
+  if (anchor !== null && anchor.closest(HEADER) !== null) {
+    anchor.setAttribute(TAKEN, '')
+    pin(anchor, r, 'block')
+    anchor.style.setProperty('pointer-events', 'none', 'important')
+    anchor.style.setProperty('z-index', '3', 'important')
+  }
 }
 
 function release(trigger: HTMLElement): void {
   trigger.removeAttribute(TAKEN)
   trigger.style.cssText = ''
+  const anchor = trigger.parentElement
+  if (anchor !== null && anchor.hasAttribute(TAKEN)) {
+    anchor.removeAttribute(TAKEN)
+    anchor.style.cssText = ''
+  }
 }
 
 export function installNativeTriggerOverlay(ctx: ClientContext): void {