@nelsonlongxiang/dsh-open-a2a-net 0.6.28 → 0.6.30

package/nexus-stage/src/planning-undo.ts

@@ -0,0 +1,68 @@
+/**
+ * 撤销 for the board layout (frontend seat, 2026-10-29): with no status-bar
+ * hint for automatic moves (owner: 载入时避让挪了卡片，不需要在状态条提示),
+ * a wrong move must be one keystroke away from undone. Covers card drags,
+ * frame drags and resizes, keyboard nudges, 整理成员, 一键重排 and the
+ * load-time settle — positions and frame rects only. Team membership
+ * (入队 / 离队, host writes) is not undone here.
+ *
+ * capture() before an edit, commit(before) after it: only an edit that
+ * actually moved something already on the board is recorded, so a click,
+ * a pan or a marquee leaves the stack alone, and a card that arrived by
+ * poll mid-gesture is not counted as a move. revert(before) is for a
+ * gesture the OS cancelled (pointercancel): layout back, nothing recorded.
+ * @module nexus-stage/planning-undo
+ */
+import type { FrameGeom, WorldModel } from './world'
+
+export interface LayoutSnap {
+  readonly nodes: ReadonlyMap<string, { readonly x: number; readonly y: number }>
+  readonly frames: ReadonlyMap<string, FrameGeom>
+}
+
+/** Undo depth (older steps fall off). */
+export const UNDO_LIMIT = 30
+
+export function createLayoutUndo(model: WorldModel) {
+  const stack: LayoutSnap[] = []
+  const capture = (): LayoutSnap => ({
+    nodes: new Map(model.allNodes().map(n => [n.id, { x: n.x, y: n.y }])),
+    frames: new Map(model.allFrames().map(([name, f]) => [name, { ...f }])),
+  })
+  /** True when something present both before and now has moved or changed size. */
+  const moved = (before: LayoutSnap): boolean =>
+    model.allNodes().some(n => { const b = before.nodes.get(n.id); return b !== undefined && (b.x !== n.x || b.y !== n.y) }) ||
+    model.allFrames().some(([name, f]) => { const b = before.frames.get(name); return b !== undefined && (b.x !== f.x || b.y !== f.y || b.w !== f.w || b.h !== f.h) })
+  const restore = (snap: LayoutSnap): void => {
+    for (const n of model.allNodes()) {
+      const b = snap.nodes.get(n.id)
+      if (b !== undefined && (b.x !== n.x || b.y !== n.y)) model.dragNodes([n.id], b.x - n.x, b.y - n.y)
+    }
+    for (const [name, f] of model.allFrames()) {
+      const b = snap.frames.get(name)
+      if (b !== undefined && (b.x !== f.x || b.y !== f.y || b.w !== f.w || b.h !== f.h)) model.setFrame(name, { ...b })
+    }
+  }
+  return {
+    capture,
+    commit(before: LayoutSnap): void {
+      if (!moved(before)) return
+      stack.push(before)
+      if (stack.length > UNDO_LIMIT) stack.shift()
+    },
+    /** Restore the last recorded layout; false when there is nothing to undo. */
+    undo(): boolean {
+      const snap = stack.pop()
+      if (snap === undefined) return false
+      restore(snap)
+      return true
+    },
+    /** Put back `before` without recording a step (an abandoned gesture); true when something moved. */
+    revert(before: LayoutSnap): boolean {
+      if (!moved(before)) return false
+      restore(before)
+      return true
+    },
+    get depth(): number { return stack.length },
+  }
+}

package/nexus-stage/src/planning-view.ts

@@ -27,7 +27,8 @@
 
 import type { LampState } from './layout-wire'
 import { buildLayoutDoc, clampDoc, type LayoutDoc, type LayoutRect } from './layout-doc'
-import { FRAME_HEAD_LIFT, starEdges } from './edges'
+import { FRAME_HEAD_LIFT } from './edges'
+import { drawMemberEdges } from './planning-edges'
 import { createFederationOverlay } from './federation-overlay'
 import { displayName } from './stage-name'
 import {
@@ -36,11 +37,19 @@ import {
   type RemoteTeamRow,
 } from './federation'
 import { clampViewport, fitView, panBy, screenToWorld, worldTransformCss, zoomAt, type LayoutViewport } from './viewport'
+import { boardBounds, fitBelowHud, hudBottomOf } from './planning-fit'
 import { WorldModel, nodeRect, deriveInitialFrame, homeTeams, planSeatClear, planTeamClusters, NODE_W, NODE_H } from './world'
 import { applyAction, actionTeam, innermostFrameAt, reorderOps, yOrderedMembers, type CanvasAction } from './canvas-ops'
 import { FRAME_HUES } from './tokens'
 import { createPlanningMenus } from './planning-menus'
+import { createNodeFlyer, mountBoardSearch } from './planning-search'
+import { applyBoardRelayout } from './planning-relayout'
+import { mirrorRoute } from './planning-mirror'
+import { settleBoard, tidyMembers } from './planning-overlap'
+import { createLayoutUndo, type LayoutSnap } from './planning-undo'
 import { createNodeList } from './planning-nodelist'
+import { cardText } from './planning-card-text'
+import { createLegend } from './planning-legend'
 import { viewportBucket, type PlanningDeps, type PlanningInput, type PlanningSession, type PlanningTeam, type PlanningView, type SeamKey, type SeamPointer, type ViewportBucket } from './planning-types'
 import './planning.css'
 
@@ -78,6 +87,9 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
   let renderedRevision = -1
   /** Until the first reconcile with nodes (or an adopted viewport), frame the content once. */
   let firstFitPending = true
+  let settledOnce = false
+  const layoutUndo = createLayoutUndo(model) // 撤销 (planning-undo)
+  let undoBefore: LayoutSnap | undefined
   let viewportAdopted = false
   const bucket = (): ViewportBucket => viewportBucket(globalThis.innerWidth || viewW)
   const markDirty = (): void => {
@@ -151,11 +163,15 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     b.addEventListener('click', onClick, signal)
     return b
   }
+  // Review 2026-10-27: the toolbar reads as three groups — view | arrange |
+  // network — split by separators; every action stays one click (owner orders).
+  const sep = (): HTMLElement => { const s = document.createElement('span'); s.className = 'p-sep'; s.setAttribute('role', 'separator'); s.setAttribute('aria-orientation', 'vertical'); return s }
   toolbar.append(
     mkButton('适配', '适配视图（快捷键 0）', () => fitToContent()),
     mkButton('－', '缩小', () => zoomCenter(1 / 1.2)),
     zoomLabel,
     mkButton('＋', '放大', () => zoomCenter(1.2)),
+    sep(),
     mkButton('建队', '组成团队（G）：先框选至少 2 个节点', () => menus.startCreateFromSelection()),
     // gh#48 (owner order, review-seat spec): one-click tidy — inside every
     // team frame, the members that belong to EXACTLY that one team re-seat
@@ -165,6 +181,14 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     // ride the same rule; the move persists through the ordinary layout
     // save loop exactly like a hand drag.
     mkButton('整理成员', '每队框内仅属一队的成员自动排齐（多队成员不动）', () => tidyTeamMembers()),
+    // Supervisor order v2 (upgrades gh#48): one-click WHOLE-BOARD relayout —
+    // the two buttons split the job (整理成员 = cards inside one frame;
+    // 一键重排 = every local frame AND its cards). Frame size derives from
+    // content (width and height both); frames tile in a row flow
+    // (constructively disjoint); multi-team members never enter the size
+    // math and never move; remote org frames and frameless nodes stay put.
+    mkButton('一键重排', '全板队框+成员重排：框尺寸随内容自适应、框位行流式平铺（远端队框与多归属成员不动）', () => relayoutBoard()),
+    mkButton('撤销', '撤销上一次布局改动：拖动、缩放、整理、重排、载入时避让（Ctrl+Z；入队离队不撤销）', () => undoLayout()),
   )
   // Unjoined sessions ride a toolbar chip + dropdown: the panel-slim
   // migration made the planning view the join surface — without this, an
@@ -172,7 +196,8 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
   const netBtn = mkButton('未入网', '未入网会话（点击选择入网）', () => menus.toggleNetMenu())
   netBtn.className = 'p-netbtn'
   netBtn.setAttribute('aria-haspopup', 'menu')
-  toolbar.appendChild(netBtn)
+  toolbar.append(sep(), netBtn)
+  const search = mountBoardSearch(toolbar, model, displayName, id => flyToNode(id))
   // Node list (network-membership-display): the canvas shows teamed nodes
   // only; every other session — teamless joined, unjoined, and each peer's
   // published nodes — is managed from this list, switched by host.
@@ -218,20 +243,8 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); flyToFederation() }
   }, signal)
 
-  const legend = document.createElement('div')
-  legend.className = 'p-legend'
-  const legendRow = (dashed: boolean, text: string, color?: string): void => {
-    const row = document.createElement('span')
-    const bar = document.createElement('i')
-    if (dashed) bar.className = 'dashed'
-    if (color !== undefined) bar.style.borderTopColor = color
-    row.append(bar, document.createTextNode(text))
-    legend.appendChild(row)
-  }
-  legendRow(false, '成员边（星形，框→成员）')
-  legendRow(true, '跨队多属（虚线）')
-  legendRow(false, '活动边（inFlight 路由，瞬时）', 'var(--accent)')
-  legendRow(true, '联邦线（→peer）', 'var(--federal)')
+  // Edge key: a closed-by-default fold (planning-legend), not a fixed panel.
+  const legend = createLegend()
 
   const noticeStack = document.createElement('div')
   noticeStack.className = 'p-notice-stack'
@@ -269,31 +282,26 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
    * — the same persistence path a hand drag takes.
    */
   function tidyTeamMembers(): void {
-    const PAD = 28
-    const GAP_X = 16
-    const GAP_Y = 14
-    for (const [name, rect] of model.allFrames()) {
-      const members = model.teamMemberIds(name)
-      const sole = members
-        .map(id => model.getNode(id))
-        .filter((n): n is NonNullable<typeof n> => n !== undefined)
-        .filter(n => n.memberships.length === 1)
-      if (sole.length === 0) continue // empty frame / only shared members: untouched
-      const perRow = Math.max(1, Math.floor((rect.w - 2 * PAD + GAP_X) / (NODE_W + GAP_X)))
-      const rows = Math.ceil(sole.length / perRow)
-      const needed = PAD * 2 + rows * NODE_H + (rows - 1) * GAP_Y
-      if (needed > rect.h) {
-        model.setFrame(name, { ...rect, h: Math.min(needed, rect.h + 400) })
-      }
-      const startX = rect.x + PAD + NODE_W / 2
-      let y = rect.y + PAD + NODE_H / 2
-      sole.forEach((n, i) => {
-        const col = i % perRow
-        if (i > 0 && col === 0) y += NODE_H + GAP_Y
-        const x = startX + col * (NODE_W + GAP_X)
-        model.dragNodes([n.id], x - n.x, y - n.y)
-      })
-    }
+    const before = layoutUndo.capture()
+    tidyMembers(model) // gh#48 grid (planning-overlap); then nothing may overlap
+    settleBoard(model, new Set(remoteFramesRef.keys()))
+    layoutUndo.commit(before)
+    markDirty()
+    render()
+  }
+
+  /**
+   * Supervisor order v2: whole-board deterministic relayout (the planner
+   * and the model adapter live in planning-relayout.ts): LOCAL frames +
+   * sole members only — remote org frames keep gh#44 live-rect-wins,
+   * frameless nodes and multi-team members never move; the same
+   * markDirty()/render() persistence path a hand drag takes.
+   */
+  function relayoutBoard(): void {
+    const before = layoutUndo.capture()
+    if (!applyBoardRelayout(model, new Set(remoteFramesRef.keys()))) return
+    settleBoard(model, new Set(remoteFramesRef.keys())) // vs remote frames + stray cards
+    layoutUndo.commit(before)
     markDirty()
     render()
   }
@@ -304,7 +312,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       renderedRevision = model.revision
       renderFrames()
       renderNodes()
-      renderEdges()
+      drawMemberEdges(svg, model) // planning-edges
     }
     renderFederation()
   }
@@ -373,24 +381,21 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       }
       const cntText = `${members} 成员` + (cross > 0 ? ` +${cross} 跨队` : '')
       if (cnt.textContent !== cntText) cnt.textContent = cntText
-      const routeText0 = routeText(name)
+      const mirror = mirrorRoute(remoteFramesRef.get(name), pendingTeams.has(name)) // PR#96 single owner + mirror
+      const routeText0 = mirror?.text ?? routeText(name)
       if (route.textContent !== routeText0) route.textContent = routeText0
+      route.title = mirror?.title ?? ''
+      el.classList.toggle('is-mirror', mirror !== undefined)
+      el.classList.toggle('is-syncing', mirror?.syncing === true)
+      const label = `团队框 ${name}${mirror !== undefined ? `（${mirror.text}）` : ''}（拖动整组，回车菜单）`
+      const headEl = el.querySelector('.p-frame-head')!
+      if (headEl.getAttribute('aria-label') !== label) headEl.setAttribute('aria-label', label) // a rewrite re-announces
     }
     for (const [name, el] of [...frameEls]) {
       if (!seen.has(name)) { el.remove(); frameEls.delete(name) }
     }
   }
 
-  /** Remote card sub line: score + remote team count/names behind this peer. */
-  function remoteSubText(host: string): string {
-    const rows = lastRemoteTeams.get(host) ?? []
-    const names = rows.map(r => r.name !== undefined && r.name !== '' ? r.name : r.team)
-    const head = names.slice(0, 2).join('、')
-    const more = names.length > 2 ? ` +${names.length - 2}` : ''
-    const score = peerScoreByText.get(host)
-    return (score !== undefined ? `score ${score} · ` : '') + `${rows.length} 远端团队` + (head !== '' ? `：${head}${more}` : '')
-  }
-
   /** The mono route line `<host>/canvas/<name>` when the payload carries it. */
   function routeText(name: string): string {
     const t = lastTeams.find(x => x.name === name)
@@ -431,25 +436,13 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       el.classList.toggle('selected', model.isSelected(n.id))
       el.setAttribute('aria-selected', String(model.isSelected(n.id)))
       const host = n.id.slice('peer-'.length)
-      // gh#38: member cards show their display NAME as the title (the whole
-      // point is picking a person); peer HOST cards keep the host spelling.
-      const nmText = n.id.startsWith('member-')
-        ? (n.name !== undefined && n.name !== '' ? n.name : n.team)
-        : n.remote === true ? host : displayName(n)
+      // Title / second line / tooltip rules: planning-card-text.
+      const txt = cardText(n, n.remote === true ? lastRemoteTeams.get(host) ?? [] : [], peerScoreByText.get(host))
       const nmEl = el.querySelector<HTMLElement>('.nm-text')!
-      if (nmEl.textContent !== nmText) nmEl.textContent = nmText
+      if (nmEl.textContent !== txt.title) nmEl.textContent = txt.title
       const subEl = el.querySelector<HTMLElement>('.sub')!
-      const subBase = n.team + (n.name !== undefined && n.name !== '' ? ' · ' + n.name : '')
-      // When the title fell back to the team label the sub line would repeat
-      // it verbatim; collapse to the cross-team suffix alone in that case.
-      const subText = n.id.startsWith('member-')
-        ? n.team
-        : n.remote === true
-          ? remoteSubText(host)
-          : (subBase === nmText ? '' : subBase)
-            + (n.memberships.length > 1 ? ` · 跨队×${n.memberships.length}` : '')
-            + (n.teams !== undefined && n.teams.length > 0 ? ` · 网络队×${n.teams.length}` : '')
-      if (subEl.textContent !== subText) subEl.textContent = subText
+      if (subEl.textContent !== txt.sub) subEl.textContent = txt.sub
+      if (el.title !== txt.tip) el.title = txt.tip
       const prioEl = el.querySelector<HTMLElement>('.prio')!
       if (n.remote === true) {
         // gh#20 W-A: the peer badge — link class colors the chip (linked
@@ -470,30 +463,14 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     for (const [id, el] of [...nodeEls]) {
       if (!seen.has(id)) { el.remove(); nodeEls.delete(id) }
     }
-  }
-
-  // ── edges: stateless, rebuilt wholesale ──
-  // Derived from the MODEL (not lastTeams): optimistic membership changes
-  // must repaint their edges immediately, before the host confirms.
-  function renderEdges(): void {
-    while (svg.firstChild !== null) svg.firstChild.remove()
-    const teams = model.allFrames().map(([name]) => ({ name, members: model.teamMemberIds(name).map(id => ({ id })) }))
-    for (const e of starEdges(teams, new Map(model.allFrames()), model.positions())) {
-      const line = document.createElementNS('http://www.w3.org/2000/svg', 'line')
-      line.setAttribute('class', 'e-member' + (e.dashed ? ' dashed' : ''))
-      line.setAttribute('x1', String(e.x1))
-      line.setAttribute('y1', String(e.y1))
-      line.setAttribute('x2', String(e.x2))
-      line.setAttribute('y2', String(e.y2))
-      svg.appendChild(line)
-    }
+    search.refresh()
   }
 
   // ── federation overlay (PR D): peer cards' activity/federal edges ──
   // Runs on EVERY render, outside the model-revision gate: the poll's
   // inFlight ages must tick even when the model is unchanged, and the
   // badge column tracks the content bounds each reconcile. Its SVG
-  // children are tracked separately because renderEdges clears the svg
+  // children are tracked separately because drawMemberEdges clears the svg
   // wholesale - this appends after it (render() orders the two).
   // gh#49: the DOM drawing lives in federation-overlay.ts (module-size
   // ruling); this view keeps only the seams (facts + fly).
@@ -515,20 +492,19 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     markDirty()
   }
 
+  /** W1 pick: frame one node at ~100% and pulse its card. */
+  const flyToNode = createNodeFlyer({ model, viewSize: measure, setVp: next => { vp = next }, applyViewport, markDirty, cardEl: id => nodeEls.get(id) })
   // ── status counts ──
   function renderStatus(input: PlanningInput): void {
     const live = input.sessions.filter(s => s.live !== false).length
-    const cold = input.sessions.length - live
-    statusLive.textContent = ''
-    const bLive = document.createElement('b')
-    bLive.className = 'ok'
-    bLive.textContent = `● ${live} live`
-    statusLive.appendChild(bLive)
-    statusCold.textContent = ''
-    const bCold = document.createElement('b')
-    bCold.className = 'warn'
-    bCold.textContent = `● ${cold} cold`
-    statusCold.appendChild(bCold)
+    const dot = (host: HTMLElement, cls: string, text: string): void => {
+      const b = document.createElement('b')
+      b.className = cls
+      b.textContent = text
+      host.replaceChildren(b)
+    }
+    dot(statusLive, 'ok', `● ${live} live`)
+    dot(statusCold, 'warn', `● ${input.sessions.length - live} cold`)
     statusAct.textContent = `${input.inFlight?.length ?? 0} inFlight`
     statusMut.className = 'mut'
     statusMut.textContent = `${input.teams.length} 队 · ${input.peerCount} peer`
@@ -539,8 +515,10 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
   // up until BOTH settle (a Set deleted per action let a mid-queue poll wipe
   // the second action's optimistic membership).
   const pendingTeams = new Map<string, number>()
-  const pendingAdd = (team: string): void => { pendingTeams.set(team, (pendingTeams.get(team) ?? 0) + 1) }
+  // Each change re-renders frames: the mirror 「同步中…」 marker reads pendingTeams, not the model revision.
+  const pendingAdd = (team: string): void => { pendingTeams.set(team, (pendingTeams.get(team) ?? 0) + 1); renderedRevision = -1 }
   const pendingRelease = (team: string): void => {
+    renderedRevision = -1
     const n = (pendingTeams.get(team) ?? 0) - 1
     if (n <= 0) pendingTeams.delete(team)
     else pendingTeams.set(team, n)
@@ -595,7 +573,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
         const saved = layoutDoc?.nodes[id]
         const seat = saved !== undefined ? { x: saved.x, y: saved.y } : seatFor2(id)
         model.upsertNode({
-          id, x: seat.x, y: seat.y, label: s.label, team: s.team, name: s.name,
+          id, x: seat.x, y: seat.y, label: s.label, team: s.team, name: s.name, description: s.description,
           live: s.live !== false, memberships: [],
           ...(s.teams !== undefined && s.teams.length > 0 ? { teams: s.teams } : {}),
         })
@@ -725,6 +703,8 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       ev.preventDefault()
       return
     }
+    if (target !== null && target.closest('button, input, textarea, select, .p-toolbar, .p-search, .p-lamp, .p-status, .p-legend') !== null) return // HUD chrome owns its presses (no marquee / preventDefault: that stole the search box's focus — and, first, its native right-click menu)
+    undoBefore = layoutUndo.capture() // committed at pointerUp only if this press moved something
     const p = localXY(ev)
     // 右键按下：按住拖动 = 平移（Figma 惯例），原地抬起 = 上下文菜单。
     // Pan actually starts on the first move beyond RIGHT_DRAG_THRESHOLD px;
@@ -735,7 +715,6 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       try { root.setPointerCapture(ev.pointerId ?? 0) } catch { /* jsdom */ }
       return
     }
-    if (target !== null && (target.closest('button') !== null || target.closest('.p-lamp') !== null || target.closest('.p-status') !== null)) return
     const nodeEl = target !== null ? target.closest<HTMLElement>('.p-node') : null
     const headEl = target !== null ? target.closest<HTMLElement>('.p-frame-head') : null
     if ((nodeEl !== null || headEl !== null) && ev.button === 1) {
@@ -930,10 +909,9 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       for (const el of frameEls.values()) el.classList.remove('drop-target')
       gesture.el?.classList.remove('dragging')
       render()
-    } else if (gesture.kind === 'frame') {
-      if (gesture.moved) markDirty()
-    } else if (gesture.kind === 'frame-resize') {
-      if (gesture.moved) markDirty() // the resized rect persists with the layout
+    } else if (gesture.kind === 'frame' || gesture.kind === 'frame-resize') {
+      // The frame stays where it was put; neighbours and stray cards yield (planning-overlap).
+      if (gesture.moved) { settleBoard(model, new Set(remoteFramesRef.keys()), gesture.name); markDirty(); render() }
     } else if (gesture.kind === 'pan') {
       if (gesture.moved) markDirty() // the viewport persists with the layout
     } else if (gesture.kind === 'marquee') {
@@ -945,6 +923,21 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       render()
     }
     gesture = { kind: 'none' }
+    if (undoBefore !== undefined) { layoutUndo.commit(undoBefore); undoBefore = undefined }
+    try { root.releasePointerCapture(ev.pointerId ?? 0) } catch { /* not captured */ }
+  }
+
+  /** The OS took the pointer (touch scroll, system gesture): abandon the press — no drop, no menu, layout back. */
+  function pointerCancel(ev: SeamPointer): void {
+    for (const el of frameEls.values()) el.classList.remove('drop-target')
+    if (gesture.kind === 'node') gesture.el?.classList.remove('dragging')
+    const panned = (gesture.kind === 'pan' && gesture.moved) || rightPress?.moved === true // right-drag pans live in rightPress
+    marquee.style.display = 'none'
+    rightPress = null
+    gesture = { kind: 'none' }
+    if (undoBefore !== undefined && layoutUndo.revert(undoBefore)) render()
+    if (panned) markDirty() // the pan stays (it is the view, not the layout) and persists like a finished one
+    undoBefore = undefined
     try { root.releasePointerCapture(ev.pointerId ?? 0) } catch { /* not captured */ }
   }
 
@@ -975,15 +968,21 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     markDirty()
   }
 
+  function undoLayout(): void {
+    if (layoutUndo.undo()) { markDirty(); render() } else notice('info', '没有可撤销的布局改动')
+  }
+
   function fitToContent(): void {
     syncViewSize()
-    vp = fitView(model.contentBounds(), viewW, viewH)
+    vp = fitBelowHud(boardBounds(model.contentBounds(), model.allNodes()), viewW, viewH, hudBottomOf(toolbar, status))
     applyViewport()
     markDirty()
   }
 
   function key(ev: SeamKey): void {
-    if (menus.isDialogOpen()) return // modal: the dialog input handles Enter/Esc itself
+    if (menus.isDialogOpen() || (ev.target as Element | null)?.closest?.('.p-search') !== null) return // modal / search box own their keys
+    if ((ev.ctrlKey || ev.metaKey) && ev.key.toLowerCase() === 'k') { ev.preventDefault(); search.focus(); return } // W1 Ctrl+K
+    if ((ev.ctrlKey || ev.metaKey) && !ev.shiftKey && ev.key.toLowerCase() === 'z') { ev.preventDefault(); undoLayout(); return }
     if (ev.ctrlKey || ev.metaKey) return // browser/OS chords stay browser/OS
     if (menus.isMenuOpen()) {
       // The menu owns most keys (its own handler navigates); Escape still
@@ -1037,7 +1036,9 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       ev.preventDefault()
       const ids = model.selectedIds()
       if (ids.length > 0) {
+        const before = layoutUndo.capture()
         model.nudge(ids, d[0]!, d[1]!)
+        layoutUndo.commit(before)
         render()
         markDirty()
       }
@@ -1093,12 +1094,13 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
   root.addEventListener('pointerdown', (ev) => pointerDown(ev as unknown as SeamPointer), signal)
   root.addEventListener('pointermove', (ev) => pointerMove(ev as unknown as SeamPointer), signal)
   root.addEventListener('pointerup', (ev) => pointerUp(ev as unknown as SeamPointer), signal)
+  root.addEventListener('pointercancel', (ev) => pointerCancel(ev as unknown as SeamPointer), signal)
   root.addEventListener('wheel', (ev) => wheel(ev as unknown as SeamPointer), { ...signal, passive: false })
   root.addEventListener('keydown', (ev) => key(ev as unknown as SeamKey), signal)
   root.addEventListener('keyup', (ev) => keyUp(ev as unknown as SeamKey), signal)
   root.addEventListener('contextmenu', (ev) => {
     const e = ev as unknown as SeamPointer
-    e.preventDefault()
+    if ((e.target as Element | null)?.closest?.('input, textarea, .p-search') != null) return // text fields keep the native menu (paste)
     // Right-drag pans (suppressNextMenu); a clean right-click opens the
     // menu programmatically at pointerup. Either way the native menu dies.
     e.preventDefault()
@@ -1174,7 +1176,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       if (model.getNode(s.id) !== undefined) {
         model.upsertNode({
           id: s.id, x: model.getNode(s.id)!.x, y: model.getNode(s.id)!.y,
-          label: s.label, team: s.team, name: s.name, live: s.live !== false,
+          label: s.label, team: s.team, name: s.name, description: s.description, live: s.live !== false,
           memberships: effective,
           ...(s.teams !== undefined && s.teams.length > 0 ? { teams: s.teams } : {}),
         })
@@ -1188,7 +1190,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
           y = seat.y
         }
         model.upsertNode({
-          id: s.id, x, y, label: s.label, team: s.team, name: s.name, live: s.live !== false,
+          id: s.id, x, y, label: s.label, team: s.team, name: s.name, description: s.description, live: s.live !== false,
           memberships: effective,
           ...(s.teams !== undefined && s.teams.length > 0 ? { teams: s.teams } : {}),
         })
@@ -1389,21 +1391,17 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     // opened empty. Fit once, the first time there is something to frame.
     // Not marked dirty — nothing the user arranged changed; a saved layout
     // (adopted at any point) keeps its own viewport and cancels this.
+    // Once per load, a board that arrives overlapped is shown settled (not
+    // saved: no write without a user action; the next edit persists it).
+    if (!settledOnce && gesture.kind === 'none' && model.nodeIds().length > 0) { settledOnce = true; const b = layoutUndo.capture(); settleBoard(model, new Set(remoteFramesRef.keys())); layoutUndo.commit(b) }
     if (firstFitPending && gesture.kind === 'none' && model.nodeIds().length > 0) {
       syncViewSize()
       if (viewW > 0 && viewH > 0) {
         firstFitPending = false
         // Peer cards hang outside the local content bounds — frame them too,
-        // or the federation column opens clipped at the board's edge.
-        let bounds = model.contentBounds()
-        for (const n of model.allNodes()) {
-          if (n.remote !== true) continue
-          const r = nodeRect(n)
-          bounds = bounds === null
-            ? { minX: r.x, minY: r.y, maxX: r.x + r.w, maxY: r.y + r.h }
-            : { minX: Math.min(bounds.minX, r.x), minY: Math.min(bounds.minY, r.y), maxX: Math.max(bounds.maxX, r.x + r.w), maxY: Math.max(bounds.maxY, r.y + r.h) }
-        }
-        vp = fitView(bounds, viewW, viewH, 1) // frame, never magnify
+        // or the federation column opens clipped at the board's edge. Same
+        // framing as 适配 (planning-fit): ≤100%, below the HUD.
+        vp = fitBelowHud(boardBounds(model.contentBounds(), model.allNodes()), viewW, viewH, hudBottomOf(toolbar, status))
       }
     }
     render()
@@ -1491,6 +1489,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       pointerDown,
       pointerMove,
       pointerUp,
+      pointerCancel,
       wheel,
       key,
       keyUp,

package/nexus-stage/src/planning.css

@@ -82,6 +82,8 @@
 #dsh-plan .p-frame-head:hover{border-color:var(--card-line-hover)}
 #dsh-plan .p-frame-head .cnt{color:var(--ink-muted); font-weight:400}
 #dsh-plan .p-frame-head .route{font-size:10.5px; color:var(--ink-muted)}
+#dsh-plan .p-frame.is-mirror{border-style:dashed}
+#dsh-plan .p-frame.is-syncing .p-frame-head .route{color:var(--accent)}
 
 /* ── node card (fixed 56px border-box height = world.NODE_H) ── */
 #dsh-plan .p-node{position:absolute; width:172px; height:56px; padding:8px 26px 8px 14px;
@@ -97,12 +99,31 @@
 #dsh-plan .p-node .nm{font-weight:600; display:flex; align-items:center; gap:7px;
   overflow:hidden; text-overflow:ellipsis; white-space:nowrap}
 /* The name span clips with an ellipsis (min-width:0 lets it shrink inside
-   the flex row) — without it a long peer address was hard-cut mid-digit. */
-#dsh-plan .p-node .nm-text{min-width:0; overflow:hidden; text-overflow:ellipsis; white-space:nowrap}
+   the flex row) — without it a long peer address was hard-cut mid-digit.
+   属主令 W2: TWO-LINE clamp for the name (long Chinese team titles read
+   fully); the card's 172x56 geometry is untouched — the clamp absorbs the
+   overflow. The handle line (.sub) stays single-line ellipsis below. */
+#dsh-plan .p-node .nm-text{min-width:0; overflow:hidden; white-space:normal;
+  display:-webkit-box; -webkit-line-clamp:2; -webkit-box-orient:vertical; line-height:1.25}
+/* A peer address has no break point, so the two-line clamp clipped it to one
+   line under the badge; let it wrap anywhere onto the second line. */
+#dsh-plan .p-node.remote .nm-text{overflow-wrap:anywhere}
 #dsh-plan .p-node .dot{width:8px; height:8px; border-radius:50%; background:var(--edge-live); flex:none}
 #dsh-plan .p-node.cold .dot{background:transparent; border:1.5px solid var(--edge-cold)}
 #dsh-plan .p-node .sub{font-size:11px; color:var(--ink-muted); margin-top:2px;
   overflow:hidden; text-overflow:ellipsis; white-space:nowrap}
+/* W1: a picked search hit pulses its card for 1.2s (class removed on timer). */
+#dsh-plan .p-node.pulse{box-shadow:0 0 0 2px var(--accent), 0 0 14px 4px var(--uupm-wash-15); border-color:var(--accent)}
+/* W1: toolbar search box + hit list. */
+#dsh-plan .p-search{position:relative}
+#dsh-plan .p-search-input{width:170px; min-height:28px; padding:2px 8px; font-size:12px;
+  background:transparent; color:var(--ink); border:1px solid var(--card-line); border-radius:6px}
+#dsh-plan .p-search-input:focus-visible{outline:2px solid var(--accent); outline-offset:1px}
+#dsh-plan .p-search-list{position:absolute; top:100%; left:0; margin-top:4px; display:none;
+  min-width:240px; max-height:220px; overflow:auto; z-index:9;
+  background:var(--toolbar-bg); border:1px solid var(--card-line); border-radius:6px}
+#dsh-plan .p-search-hit{padding:5px 10px; font-size:12px; color:var(--ink); cursor:pointer; white-space:nowrap; overflow:hidden; text-overflow:ellipsis}
+#dsh-plan .p-search-hit:hover, #dsh-plan .p-search-hit.active{background:var(--uupm-wash-15)}
 #dsh-plan .p-node .prio{position:absolute; top:6px; right:8px; font-size:10px; color:var(--ink-muted);
   border:1px solid var(--card-line); border-radius:4px; padding:0 5px}
 
@@ -126,6 +147,8 @@
 #dsh-plan .p-toolbar button:active{background:var(--uupm-wash-15)}
 #dsh-plan .p-toolbar button:focus-visible{outline:2px solid var(--accent); outline-offset:1px}
 #dsh-plan .p-zoom{min-width:44px; text-align:center; font-size:11px; color:var(--ink-muted)}
+/* Toolbar groups (view | arrange | network): a hairline between them. */
+#dsh-plan .p-sep{align-self:stretch; width:1px; margin:2px 4px; background:var(--card-line)}
 #dsh-plan .p-lamp{display:flex; align-items:center; gap:6px; font-size:11px; color:var(--ink-muted); padding:0 6px}
 #dsh-plan .p-lamp i{width:7px; height:7px; border-radius:50%; background:var(--ink-muted); transition:background 140ms ease}
 #dsh-plan .p-lamp.saved i{background:var(--edge-live)}
@@ -140,8 +163,11 @@
 #dsh-plan .ok{color:var(--edge-live)} #dsh-plan .warn{color:var(--uupm-warn)} #dsh-plan .mut{color:var(--ink-muted)}
 
 #dsh-plan .p-legend{position:absolute; bottom:16px; left:16px; z-index:3; font-size:11px; color:var(--ink-muted);
-  background:var(--toolbar-bg); border:1px solid var(--card-line); border-radius:8px; padding:8px 12px;
-  display:grid; gap:4px}
+  background:var(--toolbar-bg); border:1px solid var(--card-line); border-radius:8px; padding:4px 10px}
+#dsh-plan .p-legend summary{cursor:pointer; padding:2px 0; user-select:none}
+#dsh-plan .p-legend summary:focus-visible{outline:2px solid var(--accent); outline-offset:2px}
+#dsh-plan .p-legend[open]{padding-bottom:8px}
+#dsh-plan .p-legend-rows{display:grid; gap:4px; margin-top:4px}
 #dsh-plan .p-legend i{display:inline-block; width:18px; border-top:2px solid var(--uupm-edge-member);
   vertical-align:middle; margin-right:6px}
 #dsh-plan .p-legend i.dashed{border-top-style:dashed}
@@ -149,12 +175,19 @@
 /* ── narrow board (<680px): the HUD stacks instead of colliding ──
    The toolbar, status chip and legend are absolutely placed for a wide
    board; on a phone they overlapped each other and the toolbar's CJK
-   labels wrapped one glyph per line. Toolbar scrolls sideways on one row,
-   the status chip drops under it, the legend (reference, not state) hides. */
+   labels wrapped one glyph per line. The one-row sideways scroll that
+   followed hid the search box and half the actions off-screen (review
+   2026-10-27), so the toolbar and status chip now flow at the top of the
+   board instead: the toolbar wraps, search first on its own row, and the
+   status chip sits under whatever height that takes. The legend (reference,
+   not state) hides. */
 @media (max-width:680px){
-  #dsh-plan .p-toolbar{left:8px; right:8px; top:8px; overflow-x:auto; scrollbar-width:none}
+  #dsh-plan .p-toolbar{position:relative; top:auto; left:auto; margin:8px 8px 0; flex-wrap:wrap; row-gap:6px}
   #dsh-plan .p-toolbar > *{flex:none}
-  #dsh-plan .p-status{left:8px; right:auto; top:58px; padding:6px 10px; gap:10px; flex-wrap:wrap}
+  #dsh-plan .p-toolbar .p-search{order:-1; flex:1 1 100%}
+  #dsh-plan .p-toolbar .p-sep{display:none}
+  #dsh-plan .p-toolbar .p-search-input{width:100%; box-sizing:border-box}
+  #dsh-plan .p-status{position:relative; top:auto; right:auto; left:auto; width:fit-content; margin:6px 8px 0; padding:6px 10px; gap:10px; flex-wrap:wrap}
   #dsh-plan .p-legend{display:none}
 }
 @media (pointer:coarse){