@nelsonlongxiang/dsh-open-a2a-net 0.6.36 → 0.6.37

package/lib/types/types.d.ts

@@ -72,8 +72,9 @@ export interface A2aPeerCard {
 export interface A2aSessionTeamInfo {
     /** Session team name (`<team>/<agentId8>`); the route target. */
     readonly team: string;
-    /** The session's title at read time. */
+    /** Human seatName when configured, otherwise the session title at read time. */
     readonly name: string;
+    readonly seatName?: string;
     /** One-line excerpt of the session's newest user or assistant text. */
     readonly description: string;
     /** CLI deposit status, explicitly online/offline on full host cards; absent on ordinary sessions. */

package/nexus-stage/src/planning-member-handles.ts

@@ -1,4 +1,4 @@
-/** Pure joined-local-handle projection for remote organization members. */
+/** Pure membership projections: joined-local handles for remote organization members, canvas team indexes, mirror-frame members. */
 import type { RemoteTeamRow } from './federation'
 import type { SessionLite } from './world'
 
@@ -32,3 +32,30 @@ export function remoteMemberBoardId(member: string, localIdsByHandle: ReadonlyMa
   const peerZone = remoteTeams?.find(row => row.via === peerUrl)?.team.split('/')[0] ?? 'dsh'
   return `member-${peerZone}-${member.replace(/^session-/, '').slice(0, 8)}`
 }
+
+/** Each member id → the canvas teams it sits in, with its position in that team's member order. */
+export function membershipIndex(teams: ReadonlyArray<{ name: string; members: ReadonlyArray<{ id: string }> }>): Map<string, Array<{ team: string; index: number }>> {
+  const memberships = new Map<string, Array<{ team: string; index: number }>>()
+  for (const team of teams) {
+    for (let i = 0; i < team.members.length; i++) {
+      const id = team.members[i]!.id
+      const list = memberships.get(id) ?? []
+      list.push({ team: team.name, index: i })
+      memberships.set(id, list)
+    }
+  }
+  return memberships
+}
+
+/** Local joined sessions that sit in a peer's org team (a mirror frame): they are teamed even with no local team. */
+export function mirrorMemberIds(peerOrg: ReadonlyArray<{ org: ReadonlyArray<{ members: readonly string[] }> }>, sessions: ReadonlyArray<HandleSession>, remoteTeams: ReadonlyArray<RemoteTeamRow> | undefined): Set<string> {
+  const byHandle = joinedLocalIdsByHandle(sessions, new Set((remoteTeams ?? []).map(session => session.team)))
+  const ids = new Set<string>()
+  for (const row of peerOrg) {
+    for (const team of row.org) for (const member of team.members) {
+      const id = byHandle.get(member)
+      if (id !== undefined) ids.add(id)
+    }
+  }
+  return ids
+}

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

@@ -306,14 +306,13 @@ export function createPlanningMenus(d: MenusDeps): PlanningMenus {
         const create = menuItem('组成团队…', model.selectedIds().length >= 2, () => openNameDialog(selectedByY()))
         create.title = '先框选或 Shift 加选至少 2 个节点'
         items.push(create)
+        const teamsOf = model.getNode(id)?.memberships.map(m => m.team) ?? []
         if (d.teams().length > 0) {
           items.push(menuItem('加入团队 ▸', true, () => openMenu(x, y, target, 'join')))
-          const teamsOf = model.getNode(id)?.memberships.map(m => m.team) ?? []
-          if (teamsOf.length > 0) {
-            items.push(menuItem('置顶路由 ▸', true, () => openMenu(x, y, target, 'promote')))
-            items.push(menuItem('离队 ▸', true, () => openMenu(x, y, target, 'leave')))
-          }
+          if (teamsOf.length > 0) items.push(menuItem('置顶路由 ▸', true, () => openMenu(x, y, target, 'promote')))
         }
+        // A card that is only in mirror frames (a peer's team) still has a team to leave.
+        if (teamsOf.length > 0) items.push(menuItem('离队 ▸', true, () => openMenu(x, y, target, 'leave')))
         // Network-level leave (distinct from canvas-team membership): the
         // panel-slim migration moved the join/leave toggle here. Remote
         // nodes are read-only entries — never a leave target.
@@ -342,6 +341,14 @@ export function createPlanningMenus(d: MenusDeps): PlanningMenus {
             }))
           }
         }
+        // d.teams() is this host's own teams; a mirror frame's membership leaves through
+        // the owner's relay (the view adds fleetPeer), so list those memberships too.
+        if (level === 'leave') {
+          const local = new Set(d.teams().map(t => t.name))
+          for (const m of model.getNode(id)?.memberships ?? []) {
+            if (!local.has(m.team)) items.push(menuItem(titleOf(m.team), true, () => d.emit({ type: 'remove-member', team: m.team, ids: [id] })))
+          }
+        }
       }
     }
     el.append(...items)

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

@@ -30,7 +30,8 @@ import { buildLayoutDoc, clampDoc, type LayoutDoc, type LayoutRect } from './lay
 import { FRAME_HEAD_LIFT } from './edges'
 import { drawMemberEdges } from './planning-edges'
 import { createFederationOverlay } from './federation-overlay'
-import { joinedLocalIdsByHandle, remoteMemberBoardId } from './planning-member-handles'
+import { joinedLocalIdsByHandle, membershipIndex, mirrorMemberIds, remoteMemberBoardId } from './planning-member-handles'
+import { attachSessionDrop } from './session-drag'
 import { displayName } from './stage-name'
 import {
   activityEdges, federalEdges, flyBounds, groupRemoteTeams, peerNodeId, peerHostOf, placePeers,
@@ -625,6 +626,12 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     openNameDialog: menus.openNameDialog,
     locate: locateNode,
   })
+  // A rail 本机会话 row dropped on a frame joins that team, like a card drop (session-drag).
+  attachSessionDrop(root, {
+    signal, frames: () => frameEls,
+    frameAt: (clientX, clientY) => { const p = localXY({ clientX, clientY }); return innermostFrameAt(new Map(model.allFrames()), screenToWorld(vp, p.x, p.y)) },
+    drop: (team, id) => model.getNode(id)?.memberships.some(m => m.team === team) === true ? notice('info', '该会话已在这个队里') : emitAction({ type: 'add-member', team, ids: [id] }),
+  })
 
   /** Center the viewport on one canvas node (the 已组队 row's 定位). */
   function locateNode(id: string): void {
@@ -1119,15 +1126,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     // toolbar chip instead of vanishing entirely.
     lastSessions = input.sessions
     menus.setUnjoined(input.sessions.filter(s => s.joined !== true && !s.id.startsWith('peer-')))
-    const memberships = new Map<string, Array<{ team: string; index: number }>>()
-    for (const team of input.teams) {
-      for (let i = 0; i < team.members.length; i++) {
-        const id = team.members[i]!.id
-        const list = memberships.get(id) ?? []
-        list.push({ team: team.name, index: i })
-        memberships.set(id, list)
-      }
-    }
+    const memberships = membershipIndex(input.teams)
     lastCanvasMemberIds = new Set(memberships.keys())
     const seen = new Set<string>()
     // In-flight write guard: membership entries of teams with unsettled
@@ -1161,15 +1160,20 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       syncViewSize()
       clusterSeats = planTeamClusters(input.teams, seatIds, viewW > 0 ? viewW : undefined)
     }
+    // A joined session whose only team is a peer's (a mirror frame) is teamed too: without its
+    // card the mirror frame cannot show it, and 离队 has nothing to reach (owner report 2026-11-04).
+    const mirrorMembers = input.peerOrg !== undefined ? mirrorMemberIds(input.peerOrg, input.sessions, input.remoteTeams) : new Set<string>()
+    // The node list reads the same fact: such a session is teamed, not 未组队.
+    if (input.peerOrg !== undefined) lastCanvasMemberIds = new Set([...lastCanvasMemberIds, ...mirrorMembers])
     for (const s of input.sessions) {
       if (s.joined !== true) continue
       // Teamed-only canvas (network-membership-display ruling): a joined
       // session earns a canvas node only with a team — canvas membership
-      // (optimistic-aware) or a declared roster team. Teamless joined
-      // sessions ride the node list's 未组队 group instead; sessions absent
-      // from `seen` are swept from the model below.
+      // (optimistic-aware), a declared roster team, or a mirror frame's
+      // membership. Teamless joined sessions ride the node list's 未组队
+      // group instead; sessions absent from `seen` are swept from the model below.
       const effective = resolveMemberships(s.id)
-      if (effective.length === 0 && (s.teams === undefined || s.teams.length === 0)) continue
+      if (effective.length === 0 && (s.teams === undefined || s.teams.length === 0) && !mirrorMembers.has(s.id)) continue
       seen.add(s.id)
       if (model.getNode(s.id) !== undefined) {
         model.upsertNode({

package/nexus-stage/src/seat-name-editor.ts

@@ -0,0 +1,31 @@
+/** Human owner form only: labels never grant membership or become routing ids. */
+export function createSeatNameEditor(sessions: readonly { id: string; name?: string; label?: string }[], names: Record<string, string>, save: (names: Record<string, string>) => Promise<{ ok: boolean; error?: string }>): HTMLElement {
+  const box = document.createElement('section')
+  const heading = document.createElement('h4'); heading.textContent = '会话席位名（仅人工设定）'; box.appendChild(heading)
+  const note = document.createElement('p'); note.className = 'wb-hint'; note.textContent = '稳定展示名，不改变会话标题、路由句柄或准入。留空并保存可清除。'; box.appendChild(note)
+  const select = document.createElement('select'); select.setAttribute('aria-label', '选择命名的本机会话')
+  for (const id of new Set([...sessions.map(row => row.id), ...Object.keys(names)])) {
+    const row = sessions.find(row => row.id === id), option = document.createElement('option')
+    option.value = id; option.textContent = (names[id] ?? row?.name ?? row?.label ?? id) + ' · ' + id; select.appendChild(option)
+  }
+  const input = document.createElement('input'); input.type = 'text'; input.maxLength = 64; input.setAttribute('aria-label', '人工席位名'); input.placeholder = '例如：开发席'
+  const button = document.createElement('button'); button.type = 'submit'; button.textContent = '保存席位名'; button.className = 'wb-member-submit'
+  const form = document.createElement('form'); form.className = 'wb-member-add'; form.append(select, input, button)
+  const status = document.createElement('p'); status.className = 'wb-hint'; status.setAttribute('role', 'status'); status.setAttribute('aria-live', 'polite')
+  let pending = false
+  const load = () => { input.value = names[select.value] ?? ''; button.disabled = pending || select.value === '' }
+  select.addEventListener('change', load); load()
+  form.addEventListener('submit', async event => {
+    event.preventDefault(); if (pending || select.value === '') return
+    const id = select.value, value = input.value.trim(), next = { ...names }
+    if (value === '') delete next[id]; else next[id] = value
+    pending = true; button.disabled = true; select.disabled = true; input.disabled = true
+    try {
+      const result = await save(next)
+      if (result.ok) { delete names[id]; if (value !== '') names[id] = value; status.textContent = '席位名已保存；目录将随状态刷新。' }
+      else status.textContent = result.error ?? '保存失败'
+    } catch (error) { status.textContent = '保存失败：' + String(error) }
+    finally { pending = false; select.disabled = false; input.disabled = false; load() }
+  })
+  box.append(form, status); return box
+}

package/nexus-stage/src/session-drag.ts

@@ -0,0 +1,64 @@
+/**
+ * Drag a local session from the workbench rail (目录 · 本机会话) straight into
+ * a canvas team frame on the board (owner request 2026-11-04). The rail row
+ * carries the session id in a private drag type; the board accepts it only
+ * over a frame and turns the drop into the same add-member action a card drop
+ * makes, so roster frames, mirror frames (fleet relay) and the host's own
+ * refusals all behave exactly as for an on-board drag.
+ * @module nexus-stage/session-drag
+ */
+
+/** Private drag type: an arbitrary page or file dropped on the board is ignored. */
+export const SESSION_DRAG_TYPE = 'application/x-dsh-session'
+
+/** Make one rail row draggable as a local session. */
+export function makeSessionDraggable(item: HTMLElement, sessionId: string): void {
+  item.draggable = true
+  item.classList.add('is-draggable')
+  item.title = `${item.title === '' ? sessionId : item.title} · 可拖入画布队`
+  item.addEventListener('dragstart', ev => {
+    if (ev.dataTransfer === null) return
+    ev.dataTransfer.setData(SESSION_DRAG_TYPE, sessionId)
+    ev.dataTransfer.effectAllowed = 'copy'
+  })
+}
+
+export interface SessionDropDeps {
+  /** The innermost team frame under a client point, if any. */
+  frameAt(clientX: number, clientY: number): string | undefined
+  /** Frame elements by team name, for the drop-target highlight. */
+  frames(): ReadonlyMap<string, HTMLElement>
+  /** A session dropped on a frame. */
+  drop(team: string, sessionId: string): void
+  readonly signal: AddEventListenerOptions
+}
+
+/** Accept rail session drags on the board root. */
+export function attachSessionDrop(root: HTMLElement, d: SessionDropDeps): void {
+  const carries = (ev: DragEvent): boolean => ev.dataTransfer !== null && [...ev.dataTransfer.types].includes(SESSION_DRAG_TYPE)
+  const highlight = (team: string | undefined): void => {
+    for (const [name, el] of d.frames()) el.classList.toggle('drop-target', name === team)
+  }
+  root.addEventListener('dragover', ev => {
+    if (!carries(ev)) return
+    const team = d.frameAt(ev.clientX, ev.clientY)
+    highlight(team)
+    if (team === undefined) return
+    ev.preventDefault() // only a frame is a drop target
+    ev.dataTransfer!.dropEffect = 'copy'
+  }, d.signal)
+  root.addEventListener('dragleave', ev => {
+    if (carries(ev) && (ev.relatedTarget === null || !root.contains(ev.relatedTarget as Node))) highlight(undefined)
+  }, d.signal)
+  // A drag cancelled with Esc over a frame fires no dragleave on the board: the source's dragend clears it.
+  root.ownerDocument.addEventListener('dragend', () => highlight(undefined), d.signal)
+  root.addEventListener('drop', ev => {
+    if (!carries(ev)) return
+    highlight(undefined)
+    const team = d.frameAt(ev.clientX, ev.clientY)
+    const id = ev.dataTransfer!.getData(SESSION_DRAG_TYPE)
+    if (team === undefined || id === '') return
+    ev.preventDefault()
+    d.drop(team, id)
+  }, d.signal)
+}

package/nexus-stage/src/wb-directory.ts

@@ -15,6 +15,7 @@
 import type { CanvasTeamRow, StateBody } from './workbench'
 import type { ChatTarget } from './wb-chat'
 import { displayName } from './stage-name'
+import { makeSessionDraggable } from './session-drag'
 
 export type DirFilter = 'all' | 'local' | 'canvas' | 'remote' | 'logs'
 
@@ -140,6 +141,7 @@ export function renderDirectory(box: HTMLElement, ctx: DirectoryContext): string
         item.querySelector('.wb-item-text')?.appendChild(note)
       }
       badges(item, s.canvasTeams)
+      makeSessionDraggable(item, s.id)
     }
   }
 

package/nexus-stage/src/workbench.css

@@ -49,6 +49,7 @@ body{background:var(--n-bg);color:var(--n-ink);font:13px/1.45 system-ui,"Segoe U
   width:30px;height:30px;display:none;align-items:center;justify-content:center;font:inherit;font-size:14px;
   cursor:pointer;flex:none}
 .wb-icon-btn:hover{border-color:var(--n-accent)}
+.wb-owner-btn{display:inline-flex}
 .wb-menu{margin-left:0}
 .wb-rail-toggle{margin-left:auto}
 .wb.is-rail-collapsed .wb-rail{display:none}
@@ -320,6 +321,7 @@ body{background:var(--n-bg);color:var(--n-ink);font:13px/1.45 system-ui,"Segoe U
 .wb-dir-day{padding:6px 6px 2px;font-size:10.5px;color:var(--n-ink-muted)}
 .wb-dir-empty{padding:24px 8px;text-align:center;font-size:12px;color:var(--n-ink-muted)}
 .wb-directory .wb-item{gap:9px;padding:5px 6px;border-radius:8px}
+.wb-directory .wb-item.is-draggable{cursor:grab}
 .wb-directory .wb-item:focus-visible{outline:2px solid var(--n-accent);outline-offset:-2px}
 .wb-item-text{display:flex;flex-direction:column;flex:1 1 auto;min-width:0;line-height:1.35}
 .wb-item-sub{font:11px/1.35 ui-monospace,Consolas,monospace;color:var(--n-ink-muted);

package/nexus-stage/src/workbench.ts

@@ -19,6 +19,7 @@
  * @module nexus-stage/workbench
  */
 import { createChatDrawer, type ChatTarget } from './wb-chat'
+import { createSeatNameEditor } from './seat-name-editor'
 import { createCliHomePicker, type CliHomeOptions } from './cli-home-picker'
 import { createRailTabs } from './wb-rail'
 import { DIRECTORY_FILTERS, learnLogTitle, loadLogTitles, renderDirectory, type DirFilter } from './wb-directory'
@@ -95,6 +96,7 @@ export interface SessionRow {
   readonly label: string
   readonly team: string
   readonly name?: string
+  readonly seatName?: string
   readonly description?: string
   readonly workspace?: string
   readonly joined?: boolean
@@ -207,9 +209,9 @@ export interface WorkbenchDeps {
   /** gh#41 fleet planning: each tracked peer's published canvas org. */
   peerOrg?: readonly PeerOrgRow[]
   /** gh#34: read the owner three-key panel state (GET /__dsh_a2a/owner-settings). */
-  ownerSettingsRead?(): Promise<{ ok: boolean; teamJoinAllowlist?: string[]; teamScopeInfo?: boolean; announce?: boolean; announceRestartPending?: boolean; error?: string }>
+  ownerSettingsRead?(): Promise<{ ok: boolean; seatNames?: Record<string, string>; teamJoinAllowlist?: string[]; teamScopeInfo?: boolean; announce?: boolean; announceRestartPending?: boolean; error?: string }>
   /** gh#34: write owner panel changes; true on success (POST the same face). */
-  ownerSettingsWrite?(changes: { teamJoinAllowlist?: string[]; teamScopeInfo?: boolean; announce?: boolean }): Promise<{ ok: boolean; restartNeeded?: boolean; error?: string }>
+  ownerSettingsWrite?(changes: { seatNames?: Record<string, string>; teamJoinAllowlist?: string[]; teamScopeInfo?: boolean; announce?: boolean }): Promise<{ ok: boolean; restartNeeded?: boolean; error?: string }>
   /** gh#41 fleet planning: regulate a REMOTE peer's canvas team (this host
    *  signs the envelope and forwards; the peer's link gate authorizes). */
   fleetCanvasOp?(peer: string, op: 'create' | 'add-member' | 'remove-member' | 'remove', name: string, id?: string): Promise<{ ok: boolean; members?: string[]; error?: string }>
@@ -375,8 +377,8 @@ export function createWorkbench(deps: WorkbenchDeps): Workbench {
   const ownerBtn = el('button', 'wb-icon-btn wb-owner-btn')
   ownerBtn.type = 'button'
   ownerBtn.dataset.testid = 'wb-owner-btn'
-  ownerBtn.setAttribute('aria-label', '主人设置（三键面板）')
-  ownerBtn.title = '主人设置：入网白名单 / 可见性 / 发布'
+  ownerBtn.setAttribute('aria-label', '主人设置')
+  ownerBtn.title = '主人设置：席位名 / 入网白名单 / 可见性 / 发布'
   ownerBtn.textContent = '⚙'
   ownerBtn.addEventListener('click', () => { ownerPanelOpen = !ownerPanelOpen; renderOwnerPanel() })
   header.appendChild(ownerBtn)
@@ -827,15 +829,18 @@ export function createWorkbench(deps: WorkbenchDeps): Workbench {
 
   // ── Inspector (overlay card over the stage; bottom sheet on narrow) ──
   // gh#34 owner panel state + render (the gear toggles; the inspector hosts).
+  let seatEditor: HTMLElement | undefined
   let ownerPanelOpen = false
-  let ownerState: { teamJoinAllowlist: string[]; teamScopeInfo: boolean; announce: boolean; announceRestartPending: boolean } | null = null
+  let ownerState: { seatNames: Record<string, string>; teamJoinAllowlist: string[]; teamScopeInfo: boolean; announce: boolean; announceRestartPending: boolean } | null = null
   function renderOwnerPanel(): void {
     renderInspector()
     if (!ownerPanelOpen) return
     void deps.ownerSettingsRead?.().then(result => {
       if (!ownerPanelOpen) return
       if (result.ok !== true) { ownerState = null; renderInspector(); return }
+      seatEditor = undefined
       ownerState = {
+        seatNames: result.seatNames ?? {},
         teamJoinAllowlist: result.teamJoinAllowlist ?? [],
         teamScopeInfo: result.teamScopeInfo !== false,
         announce: result.announce === true,
@@ -870,6 +875,12 @@ export function createWorkbench(deps: WorkbenchDeps): Workbench {
       return
     }
     const st = ownerState
+    seatEditor ??= createSeatNameEditor(last?.sessions ?? [], st.seatNames, async seatNames => {
+      const result = await deps.ownerSettingsWrite?.({ seatNames })
+      if (result?.ok) { st.seatNames = seatNames; return { ok: true } }
+      return { ok: false, error: result?.error ?? '保存失败' }
+    })
+    card.appendChild(seatEditor)
     // ① 入网白名单（精确团队名增删）
     const alHead = el('div', 'wb-side-head')
     alHead.textContent = '入网白名单（精确团队名）'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nelsonlongxiang/dsh-open-a2a-net",
-  "version": "0.6.36",
+  "version": "0.6.37",
   "description": "Open A2A network plugin for DeepSeek Harness: signed agent cards, decentralized peer/zone discovery, direct routing model tools, and joinable session nodes with a sidebar control",
   "type": "module",
   "main": "lib/index.js",