dsh-zen-remote 2.3.8 → 2.3.9

package/src/client/styles/header.css.ts

@@ -128,6 +128,14 @@ export const HEADER_CSS = `/* ---------- session header five-piece reflow (< 768
      instead of centered. Pinning the row makes it one 48px band again. */
   [data-phase] header [class$="_titleRow"] {
     position: relative;
+    /* UX-2 (2026-11-04): the host gives this row container-type: inline-size,
+       which implies layout containment — making the row the containing block
+       for every descendant position:fixed. That shifted every viewport
+       coordinate effects/native-trigger-overlay.ts writes by the safe-area
+       top and the row's horizontal padding. normal hands fixed descendants
+       back to the viewport; the phone block owns this layout, so nothing
+       scoped container queries against the row here. */
+    container-type: normal !important;
     display: grid;
     grid-template-columns: 92px 1fr 92px;
     grid-template-rows: minmax(48px, auto);
@@ -195,55 +203,30 @@ export const HEADER_CSS = `/* ---------- session header five-piece reflow (< 768
     min-width: 0;
     overflow: hidden;
   }
-  /* Subagent sessions keep ONE ancestor crumb (2026-08-18): the PC header
-     lets you tap the parent session's title to switch back — that affordance
-     was lost on phone when the whole parent chain was hidden as "多余项".
-     Show only the immediate parent (for agent-teams member sessions that IS
-     the captain/main session; deeper ancestors stay hidden — a 3-level chain
-     cannot fit the ~206px center column at 390px). The parent crumb is the
-     official breadcrumb <button> (dsh-client-ui-conversation renders
-     open(parentId) as its onClick), so tapping needs no JS from this plugin,
-     and main sessions (chain length 1) have no :nth-last-child(2) seg at
-     all — the centered single title is pixel-identical to before. */
-  [data-phase] header [class$="_crumbSeg"]:not(:nth-last-child(-n+2)) {
+  /* Subagent sessions hide every ancestor crumb (UX-2, 2026-11-04 —
+     supersedes the 2026-08-18 "keep ONE ancestor" rule). DSH 0.2.1 turned
+     the parent crumb into a session-TREE popup trigger
+     (…_switcherTrigger[aria-haspopup="tree"]) instead of a direct
+     switch-back tap, and that popup is desktop geometry on the phone; the
+     back button and the home stack stay the way back. Main sessions render
+     a single span with no segs at all, so :not(:last-child) never matches
+     there. */
+  [data-phase] header [class$="_crumbSeg"]:not(:last-child) {
     display: none !important;
   }
-  [data-phase] header [class$="_crumbSeg"]:nth-last-child(2) {
-    display: inline-flex;
-    align-items: center;
-    flex: none;
-    min-width: 0;
-    max-width: 38%;
-  }
-  /* Ancestors BEFORE the parent seg are hidden, which would leave the
-     parent seg's own leading "/" dangling at the start of the title. */
-  [data-phase] header [class$="_crumbSeg"]:nth-last-child(2) [class$="_crumbSep"] {
+  /* With the parent seg gone, the current seg's own leading "/" would
+     dangle before the title; the dissolved trigger container's stray
+     separator is covered by this same rule (its slot rules below hide it
+     too). One blanket rule instead of per-segment cases. */
+  [data-phase] header [class$="_crumbSep"] {
     display: none !important;
   }
-  /* Parent crumb: small tertiary text so the 19px current title stays the
-     visual anchor; min-height keeps a finger-sized target inside the 48px
-     row. Specificity (0,4,1) outranks the shared 19px _crumb rule below. */
-  [data-phase] header [class$="_crumbSeg"]:nth-last-child(2) [class$="_crumb"] {
-    font-size: 13px;
-    font-weight: 400;
-    color: var(--dsw-alias-label-tertiary, rgba(0, 0, 0, .45));
-    min-height: 44px;
-    display: inline-flex;
-    align-items: center;
-    padding: 0 2px 0 6px;
-    touch-action: manipulation;
-    -webkit-tap-highlight-color: transparent;
-  }
   [data-phase] header [class$="_crumbSeg"]:last-child {
     display: flex;
     align-items: center;
     min-width: 0;
     max-width: 100%;
   }
-  /* The last seg's own "/" is the divider between parent and current title —
-     it only exists when there IS an ancestor (index > 0), so it can simply
-     stay visible now that the parent seg shows. (It used to be hidden here:
-     with the parent hidden it dangled before the title.) */
   /* BOTH selectors are required: [class$=] matches the whole class
      ATTRIBUTE's suffix, and the current-session title button's attribute is
      "wSkVaW_crumb wSkVaW_crumbCurrent" — it ends in _crumbCurrent, so the _crumb
@@ -353,12 +336,17 @@ export const HEADER_CSS = `/* ---------- session header five-piece reflow (< 768
      pointer-events on the trigger: that is exactly what would take the tap
      target away again.
 
-     CSS keeps only two chores. Dissolve the root so its box (and its
-     stray separator, hidden below) stops occupying the breadcrumb, and let
-     the trigger participate from wherever the overlay pins it. And no menu
-     re-anchoring anymore: the 0.1.1 popover portals to <body> as
-     position:fixed and positions itself from the trigger's viewport rect
-     (measured 336px wide, fully on screen at 411px). */
+     CSS keeps only the resting dissolve: the root's box (and its stray
+     separator, hidden below) stops occupying the breadcrumb until the
+     overlay pins it. The measurement chore moved to the overlay (UX-2,
+     2026-11-04): the 0.1.1+ popover portals to <body> as position:fixed
+     and sizes itself from the OUTER anchor container (the official
+     rootRef, the trigger's parent div) — a display:contents root has no
+     box, so rootRef.getBoundingClientRect() was all zeros and the panel
+     landed at 12,12 inside the status bar. effects/
+     native-trigger-overlay.ts now pins container + trigger to the pill's
+     rect together (its inline display beats this rule's !important, style
+     attribute outranks selectors at author-important). */
   [data-phase] header [data-slot="conversation.session.header.actions"] > *:has(> button[class$="_trigger"]),
   [data-phase] header [data-slot="conversation.session.header.lineage"] > *:has(> button[class$="_trigger"]) {
     display: contents !important;
@@ -367,6 +355,18 @@ export const HEADER_CSS = `/* ---------- session header five-piece reflow (< 768
   [data-phase] header [data-slot="conversation.session.header.lineage"] [class$="_separator"] {
     display: none !important;
   }
+  /* The popovers themselves portal to <body> as position:fixed layers
+     (class suffix _menu, z-index 100) and place themselves from the pill's
+     viewport rect with margin 12 — the overlay above is what makes that
+     rect correct. This is only a floor: the panels' 336px width overflows
+     320px-class phones, and a tall list must not run under the notch or
+     the home indicator. [id$="-menu"] keeps the composer's model menu out
+     of it — composer.css.ts owns that surface, and this file sits before
+     it in styles/index.ts so its own rules still win the tie. */
+  body > [class$="_menu"]:not([id$="-menu"]) {
+    max-width: calc(100vw - 24px) !important;
+    max-height: calc(100dvh - env(safe-area-inset-top, 0px) - env(safe-area-inset-bottom, 0px) - 24px) !important;
+  }
   /* The agent-preset mode badge specifically survives the blanket hide
      above: layout.css.ts's shared <=1023px block targets it directly
      (header [class$="_label"]:has(> svg) { display: block !important }),
@@ -395,8 +395,12 @@ export const HEADER_CSS = `/* ---------- session header five-piece reflow (< 768
     display: inline-flex !important;
   }
 
-  /* Back button: 44pt touch target, leftmost column. */
+  /* Back button: 44pt touch target, leftmost column.
+     order: -1 keeps it to the left of @deepseek-ai/dsh-experimental-client-ui-agent-team's
+     TeamAction ([data-team-action], registered into header.actions at order -20 with
+     default flex order 0). */
   [data-mobile-nav="header-back"] {
+    order: -1;
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -413,6 +417,13 @@ export const HEADER_CSS = `/* ---------- session header five-piece reflow (< 768
   [data-mobile-nav="header-back"]:active {
     opacity: .6;
   }
+  /* TeamAction's own stylesheet hides .XdyUwa_triggerLabel via
+     @container (width<=480px) against _titleRow's container-type: inline-size.
+     Shedding container-type on _titleRow above (UX-2) disabled that container
+     query, so hide the label explicitly on phone and keep only the icon. */
+  [data-phase] header [data-team-action] [class$="_triggerLabel"] {
+    display: none !important;
+  }
 
   /* Info + workbench utility buttons, rightmost column. */
   [data-mobile-nav="header-info"],
@@ -503,6 +514,7 @@ export const HEADER_CSS = `/* ---------- session header five-piece reflow (< 768
      top:100% lands both on the same 28px line. z-index puts it above the
      row it overlaps. */
   [data-mobile-nav="header-activity"] {
+    pointer-events: none;
     position: absolute;
     right: 0;
     top: 100%;

package/src/client/styles/layout.css.ts

@@ -92,6 +92,31 @@ export const LAYOUT_CSS = `/* ---------- mobile-only layout ---------- */
     padding-top: var(--mnav-sat) !important;
     padding-bottom: var(--mnav-sab) !important;
   }
+  /* Right sidebar start/guide page (dsh-client-ui-sidebar-right GuideBody):
+     the host sets .Dv5QdW_tabBody { height: 100%; overflow: hidden } and
+     .F6Huca_guide { min-height: 100%; justify-content: center } with no
+     overflow-y. When many tab entries are registered (e.g. better-sidebar +
+     plugins), the centered flex column overflows equally out the top and
+     bottom of the locked 100%-height box — clipping the leading entries
+     ("文件", "Git") above y=0 with no way to scroll. Make the guide itself
+     the scroll container and replace justify-content:center with auto
+     margins on the first item and ::after so short lists stay centered
+     while long lists start cleanly at the top and scroll end-to-end. */
+  [data-sidebar-right-guide] {
+    flex: 1 1 0 !important;
+    min-height: 0 !important;
+    justify-content: flex-start !important;
+    overflow-y: auto !important;
+    -webkit-overflow-scrolling: touch;
+    padding-top: 24px !important;
+    padding-bottom: 24px !important;
+  }
+  [data-sidebar-right-guide] > :first-child {
+    margin-top: auto !important;
+  }
+  [data-sidebar-right-guide]::after {
+    margin-bottom: auto !important;
+  }
 
   /* Expanded state (frame without data-sidebar-collapsed) slides the drawer in.
      The open state must be transform:none — NOT translateX(0): an identity

package/src/client/wizard/GatewayWizard.tsx

@@ -33,11 +33,13 @@ import {
   CLIENT_CONFIG_ROUTE,
   CLIENT_RECONNECT_ROUTE,
   CLIENT_STATUS_ROUTE,
+  awaitClientStatusReady,
   claimDeviceNameOf,
   clientStatusLineOf,
   deriveClientStatusView,
   deriveSettingsView,
   normalizePairingCode,
+  shouldReloadAfterClientActivation,
 } from '../../client-data/settings-form.ts'
 import { qrMatrix } from '../../client-data/qr.ts'
 import {
@@ -761,6 +763,12 @@ export function GatewayWizard(props: GatewayWizardProps): ReactNode {
   const runClientClaim = async (): Promise<void> => {
     setFormError(null)
     setClientClaimFail(null)
+    // UX-1: the facts that decide the post-pairing reload — whether the page
+    // opened as an already-effective client, and whether the backend's
+    // stream interceptor was already active (from the last client/status
+    // diagnostics). Captured BEFORE the role switch and the claim below.
+    const wasEffectiveClient = effectiveClient
+    const streamInterceptAlreadyActive = clientView?.intercept?.installed === true
     const trimmedUrl = clientServerUrl.trim()
     const normalizedCode = normalizePairingCode(clientPairCode)
     if (trimmedUrl === '' || !/^https?:\/\//i.test(trimmedUrl)) {
@@ -801,7 +809,21 @@ export function GatewayWizard(props: GatewayWizardProps): ReactNode {
       if (body?.ok === true && typeof body.token === 'string' && body.token !== '') {
         const urlToWrite = typeof body.serverUrl === 'string' && body.serverUrl !== '' ? body.serverUrl : trimmedUrl
         const echoed = typeof body.deviceName === 'string' && body.deviceName.trim() !== '' ? body.deviceName.trim() : deviceName
-        await config.writeClientPairing(urlToWrite, body.token, echoed)
+        const landed = await config.writeClientPairing(urlToWrite, body.token, echoed)
+        if (landed && shouldReloadAfterClientActivation({
+          wasEffectiveClient,
+          nowClientRole: true,
+          savedOrPaired: true,
+          streamInterceptAlreadyActive,
+        })) {
+          // UX-1: this was the FIRST client activation while the page's three
+          // resident global streams were opened unwrapped — wait out the
+          // backend's row-reload window, then reload so the streams reopen
+          // wrapped and the server's shared sessions enter the sidebar.
+          await awaitClientStatusReady()
+          window.location.reload()
+          return
+        }
         setClientPairCode('')
         await loadClientStatus()
         setStep('verify')

package/src/client-data/new-session.ts

@@ -0,0 +1,30 @@
+/**
+ * UX-3 — what tapping the phone home screen's "+ 新建会话" FAB should do.
+ *
+ * Entering a blank session with NO workspace leaves the phone dangling in
+ * the hero's inert "choose a workspace" state (the host's `marshal-main`
+ * belongs to no workspace, so the "all" filter often resolves to
+ * `undefined`). Decide BEFORE entering:
+ *
+ * - a workspace is already selected → start there;
+ * - exactly one workspace exists (or none at all) → start with it
+ *   (`undefined` keeps a no-workspace host usable);
+ * - several workspaces and none selected → the FAB opens the same
+ *   bottom-sheet workspace drawer the title bar uses, and the session only
+ *   starts once one is picked.
+ *
+ * Pure: no DOM, no imports — MobileHome calls it inside the FAB's onClick
+ * and test/permission-sheet.test.cjs drives it directly.
+ */
+export type NewSessionAction<W extends string> =
+  | { kind: 'start'; workspaceId: W | undefined }
+  | { kind: 'pick-workspace' }
+
+export function decideNewSessionAction<W extends string>(
+  selectedWorkspaceId: W | undefined,
+  workspaceIds: readonly W[],
+): NewSessionAction<W> {
+  if (selectedWorkspaceId !== undefined) return { kind: 'start', workspaceId: selectedWorkspaceId }
+  if (workspaceIds.length <= 1) return { kind: 'start', workspaceId: workspaceIds[0] }
+  return { kind: 'pick-workspace' }
+}

package/src/client-data/settings-form.ts

@@ -433,6 +433,63 @@ export function shouldFollowServerDeviceName(deviceName: string, rowName: string
   return deviceName !== '' && deviceName !== rowName && !hasDraft
 }
 
+// --- UX-1: reload after the FIRST client activation ---------------------------
+
+/**
+ * Whether one successful client-side activation (a staged-save role switch, a
+ * first pairing) needs a page reload: the backend's restart-watcher only
+ * installs the stream interceptor when the row reloads into client mode, and
+ * the page's three resident global streams were opened under whatever gateway
+ * object was current AT LOAD TIME. Without a reload they stay unwrapped and
+ * the server's remote sessions never enter the merged sidebar lists.
+ *
+ * - A write that did not land, or a save that is not heading to `client`,
+ *   never reloads.
+ * - A host→client switch always reloads: the streams predate the interceptor.
+ * - An already-client page reloads only when the diagnostics say the
+ *   interceptor was NOT yet active (`streamInterceptAlreadyActive === false`).
+ *   `undefined` — an older server that answers no diagnostics — is UNKNOWN and
+ *   stays on the safe no-reload side (a re-pairing must not needlessly reload).
+ */
+export interface ClientActivationReloadInput {
+  /** Whether the page was ALREADY an effective client before this operation. */
+  wasEffectiveClient: boolean
+  /** Whether the role after the operation is (or is switching to) client. */
+  nowClientRole: boolean
+  /** Whether this operation actually landed (the save / pairing write). */
+  savedOrPaired: boolean
+  /** The client/status diagnostics' interceptor flag before the operation
+   * (derived by the caller); `undefined` when unknown. */
+  streamInterceptAlreadyActive?: boolean
+}
+
+export function shouldReloadAfterClientActivation(input: ClientActivationReloadInput): boolean {
+  if (!input.savedOrPaired || !input.nowClientRole) return false
+  if (!input.wasEffectiveClient) return true
+  if (input.streamInterceptAlreadyActive === false) return true
+  return false
+}
+
+/**
+ * Poll {@link CLIENT_STATUS_ROUTE} until the backend answers ok — the bounded
+ * wait before the post-activation reload, covering the restart-watcher's row
+ * reload window (the route 404s / fails while the row restarts). Resolves
+ * after `maxMs` regardless, so the reload always fires. Injectable fetch and
+ * timings keep the check script fast; defaults are the page's 3 s / 250 ms.
+ */
+export async function awaitClientStatusReady(fetchFn: typeof fetch = fetch, maxMs = 3000, intervalMs = 250): Promise<void> {
+  const deadline = Date.now() + maxMs
+  while (true) {
+    try {
+      if ((await fetchFn(CLIENT_STATUS_ROUTE)).ok) return
+    } catch {
+      // the row is mid-reload; keep polling
+    }
+    if (Date.now() >= deadline) return
+    await new Promise((resolve) => setTimeout(resolve, intervalMs))
+  }
+}
+
 /**
  * Latest-wins sequencing for the status loads: every request takes a ticket,
  * and only the newest ticket may still apply its result. An earlier request