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

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

@@ -30,6 +30,7 @@ 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 { displayName } from './stage-name'
 import {
   activityEdges, federalEdges, flyBounds, groupRemoteTeams, peerNodeId, peerHostOf, placePeers,
@@ -39,17 +40,18 @@ import {
 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 { applyAction, settleAction, 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 { createDissolveGuard, 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 { UNREACHABLE_HINT, showFrameReachability, unreachableRefs } from './planning-reachability'
 import { viewportBucket, type PlanningDeps, type PlanningInput, type PlanningSession, type PlanningTeam, type PlanningView, type SeamKey, type SeamPointer, type ViewportBucket } from './planning-types'
 import './planning.css'
 
@@ -382,12 +384,14 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       const cntText = `${members} 成员` + (cross > 0 ? ` +${cross} 跨队` : '')
       if (cnt.textContent !== cntText) cnt.textContent = cntText
       const mirror = mirrorRoute(remoteFramesRef.get(name), pendingTeams.has(name)) // PR#96 single owner + mirror
+      const unavailable = mirror !== undefined && reachability.hosts.has(peerHostOf(remoteFramesRef.get(name)!))
       const routeText0 = mirror?.text ?? routeText(name)
       if (route.textContent !== routeText0) route.textContent = routeText0
-      route.title = mirror?.title ?? ''
+      route.title = `${mirror?.title ?? ''}${unavailable ? ` · ${UNREACHABLE_HINT}` : ''}`
+      showFrameReachability(el, unavailable)
       el.classList.toggle('is-mirror', mirror !== undefined)
       el.classList.toggle('is-syncing', mirror?.syncing === true)
-      const label = `团队框 ${name}${mirror !== undefined ? `（${mirror.text}）` : ''}（拖动整组，回车菜单）`
+      const label = `团队框 ${name}${mirror !== undefined ? `（${mirror.text}）` : ''}${unavailable ? `（${UNREACHABLE_HINT}）` : ''}（拖动整组，回车菜单）`
       const headEl = el.querySelector('.p-frame-head')!
       if (headEl.getAttribute('aria-label') !== label) headEl.setAttribute('aria-label', label) // a rewrite re-announces
     }
@@ -438,11 +442,15 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
       const host = n.id.slice('peer-'.length)
       // Title / second line / tooltip rules: planning-card-text.
       const txt = cardText(n, n.remote === true ? lastRemoteTeams.get(host) ?? [] : [], peerScoreByText.get(host))
+      const unavailable = n.remote === true && (n.id.startsWith('member-') ? reachability.members.has(n.id) : reachability.hosts.has(host))
+      el.classList.toggle('is-unreachable', unavailable)
       const nmEl = el.querySelector<HTMLElement>('.nm-text')!
       if (nmEl.textContent !== txt.title) nmEl.textContent = txt.title
       const subEl = el.querySelector<HTMLElement>('.sub')!
-      if (subEl.textContent !== txt.sub) subEl.textContent = txt.sub
-      if (el.title !== txt.tip) el.title = txt.tip
+      const subText = unavailable ? `未应答 · ${txt.sub}` : txt.sub
+      if (subEl.textContent !== subText) subEl.textContent = subText
+      const tip = unavailable ? `${txt.tip} · ${UNREACHABLE_HINT}` : txt.tip
+      if (el.title !== tip) el.title = tip
       const prioEl = el.querySelector<HTMLElement>('.prio')!
       if (n.remote === true) {
         // gh#20 W-A: the peer badge — link class colors the chip (linked
@@ -526,6 +534,8 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
   // gh#41: remote-frame registry (frame name → peer URL), refreshed by
   // reconcile and read by emitAction's serverAction to fork remote drops.
   let remoteFramesRef = new Map<string, string>()
+  let reachability = unreachableRefs({})
+  const dissolving = createDissolveGuard(deps.now)
 
   function emitAction(a: CanvasAction): void {
     // gh#20 W-B: the SERVER sees zone/id8 remote handles where the model
@@ -555,7 +565,8 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
           ? { ...act, ids, ...(fleetPeer !== undefined ? { fleetPeer } : {}) }
           : act
       }
-      return act
+      // Dissolving a mirror frame is the owner's write as well (relay op 'remove').
+      return act.type === 'remove-team' && remoteFramesRef.has(act.name) ? dissolving.fork(act, remoteFramesRef.get(act.name)!) : act
     }
 
     // Optimistic seats: a write may reference a session the teamed gate
@@ -583,10 +594,11 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     const team = actionTeam(a)
     pendingAdd(team)
     render()
-    void deps.onCanvasAction(serverAction(a)).then(
+    const sent = serverAction(a)
+    void deps.onCanvasAction(sent).then(
       ok => {
         pendingRelease(team)
-        if (!ok) undo() // host refused: roll this action's optimistic delta back
+        layoutDoc = settleAction(model, a, ok, undo, layoutDoc); markDirty(); dissolving.settled(sent, ok)
         render()
       },
       () => {
@@ -594,7 +606,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
         // team's guard (and its optimistic state) forever — and per §3.4
         // 不吞错, the rollback surfaces to the user.
         pendingRelease(team)
-        undo()
+        layoutDoc = settleAction(model, a, false, undo, layoutDoc); markDirty(); dissolving.settled(sent, false)
         notice('error', '操作通道异常，已回滚')
         render()
       },
@@ -1207,6 +1219,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     // excluded from bounds, so the column cannot feed back into itself).
     const peerSeen = new Set<string>()
     lastRemoteTeams = groupRemoteTeams(input.remoteTeams ?? [])
+    reachability = unreachableRefs(input)
     peerScoreByText.clear()
     for (const p of input.peers ?? []) {
       peerScoreByText.set(peerHostOf(p.url), p.score)
@@ -1247,6 +1260,7 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     // peer card — pulling a specific remote member into a local team is a
     // plain drag (no picker, no hand-typed handle). Host cards stay for
     // federation context; the member cards carry the actual join gesture.
+
     const memberSeen = new Set<string>()
     for (const [host, rows] of lastRemoteTeams) {
       const hostNode = model.allNodes().find(n => n.remote === true && peerHostOf(n.peerUrl ?? '') === host && !n.id.startsWith('member-'))
@@ -1306,25 +1320,14 @@ export function createPlanningView(deps: PlanningDeps): PlanningView {
     if (input.peerOrg !== undefined) {
       let slot = 0
       const localNames = new Set(input.teams.map(t => t.name))
+      dissolving.sweep(input.peerOrg)
       for (const row of input.peerOrg) {
-        // The peer's zone comes from its directory rows ('dsh/xxxx' →
-        // 'dsh'); the org's members are stored verbatim — LOCAL members as
-        // session ids, remote members as zone/id8 handles. Both must
-        // resolve onto that host's session cards: id-form members become
-        // `member-<zone>-<id8>` (id8 = strip 'session-' prefix, first 8
-        // chars — the repo's id8 derivation), handle members sanitize
-        // directly. The old sanitize-only pass misresolved every local
-        // member (owner: 数据对不上).
-        const peerZone = input.remoteTeams?.find(r => r.via === row.url)?.team.split('/')[0] ?? 'dsh'
-        const id8of = (id: string): string => id.replace(/^session-/, '').slice(0, 8)
-        // The server now canonicalizes org members to handles (gh#41 wire
-        // form); the id-form branch stays as the defensive path for peers
-        // on an older build that still publish raw session ids.
-        const memberBoardId = (m: string): string =>
-          m.includes('/') ? `member-${m.replace(/[^a-z0-9-]/gi, '-')}` : `member-${peerZone}-${id8of(m)}`
+        // Resolve joined local handles and id-form legacy members through the pure projection helper.
+        const publishedHandles = new Set((input.remoteTeams ?? []).map(session => session.team))
+        const localIdsByHandle = joinedLocalIdsByHandle(input.sessions, publishedHandles)
         for (const team of row.org) {
-          if (team.name === '' || localNames.has(team.name)) continue
-          const memberIds = team.members.map(memberBoardId).filter(id => model.getNode(id) !== undefined)
+          if (team.name === '' || localNames.has(team.name) || dissolving.hides(team.name, row.url)) continue
+          const memberIds = team.members.map(member => remoteMemberBoardId(member, localIdsByHandle, input.remoteTeams, row.url)).filter(id => model.getNode(id) !== undefined)
           const saved = layoutDoc?.frames?.[team.name]
           // gh#44 (owner: frame position/size never sticks): the LOCAL-team
           // path keeps an existing frame's live rect ("live rect wins" — a

package/nexus-stage/src/planning.css

@@ -84,6 +84,10 @@
 #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)}
+#dsh-plan .p-frame.is-unreachable{opacity:.76;border-style:dashed}
+#dsh-plan .p-frame-unreachable{position:absolute;left:8px;top:20px;max-width:calc(100% - 16px);color:var(--uupm-error);font-size:11px;pointer-events:none}
+#dsh-plan .p-node.remote.is-unreachable{opacity:.72;border-left-color:var(--uupm-error)}
+#dsh-plan .p-node.remote.is-unreachable .sub{color:var(--uupm-error)}
 
 /* ── 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;

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

@@ -130,8 +130,15 @@ export function renderDirectory(box: HTMLElement, ctx: DirectoryContext): string
     const g = group('本机会话', sessions.length, cold.length > 0 ? `${live.length} 在线 · ${cold.length} 冷` : undefined)
     for (const s of [...live, ...cold]) {
       const isLive = s.live === true
+      const missing = s.nodePromptMissing === true
       const item = row(g, isLive ? 'wb-dot-live' : 'wb-dot-cold', isLive ? '●' : '○', displayName(s), isLive ? s.team : `冷 · ${s.team}`,
         () => ctx.openChat({ kind: 'session', id: s.id, title: displayName(s), sub: s.team, team: s.team, live: s.live }), s.id)
+      if (missing) {
+        item.classList.add('is-node-prompt-missing')
+        const note = el('span', 'wb-node-warning')
+        note.textContent = '本会话的组装不含节点段'
+        item.querySelector('.wb-item-text')?.appendChild(note)
+      }
       badges(item, s.canvasTeams)
     }
   }
@@ -153,6 +160,12 @@ export function renderDirectory(box: HTMLElement, ctx: DirectoryContext): string
     for (const r of remote) {
       const item = row(g, 'wb-dot-remote', '◇', displayName(r), r.origin !== undefined && r.origin !== '' ? r.origin : r.team,
         () => ctx.openChat({ kind: 'remote', team: r.team, title: displayName(r), sub: r.team, row: r }), r.team)
+      if (r.unreachable === true) {
+        item.classList.add('is-unreachable')
+        const note = el('span', 'wb-unreachable-note')
+        note.textContent = '对端未应答（显示的是最后已知状态）'
+        item.querySelector('.wb-item-text')?.appendChild(note)
+      }
       badges(item, r.canvasTeams)
     }
   }

package/nexus-stage/src/workbench.css

@@ -321,6 +321,9 @@ body{background:var(--n-bg);color:var(--n-ink);font:13px/1.45 system-ui,"Segoe U
 .wb-item-sub{font:11px/1.35 ui-monospace,Consolas,monospace;color:var(--n-ink-muted);
   overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .wb-item.is-untitled .wb-item-label{color:var(--n-ink-muted);font-family:ui-monospace,Consolas,monospace;font-size:12px}
+.wb-directory .wb-item.is-unreachable{opacity:.78}
+.wb-unreachable-note{font-size:11px;line-height:1.35;color:var(--n-danger);white-space:normal;overflow-wrap:anywhere}
+.wb-node-warning{font-size:11px;line-height:1.35;color:var(--n-danger);white-space:normal;overflow-wrap:anywhere}
 .wb-dot-log{color:var(--n-ink-muted)}
 
 /* ── 台账 (wb-ledger) ── */

package/nexus-stage/src/workbench.ts

@@ -84,6 +84,7 @@ export interface ArchivedRow {
  *  canvasOrg) — the board renders REMOTE team frames from these rows. */
 export interface PeerOrgRow {
   readonly url: string
+  readonly unreachable?: boolean
   readonly org: ReadonlyArray<{ name: string; team: string; members: readonly string[] }>
 }
 
@@ -97,6 +98,8 @@ export interface SessionRow {
   readonly workspace?: string
   readonly joined?: boolean
   readonly live?: boolean
+  /** Final scoped assembly lacks at least one registered node section (#174). */
+  readonly nodePromptMissing?: boolean
   readonly teams?: readonly string[]
   /** Canvas teams this session is a member of (0.6.6 roster annotation). */
   readonly canvasTeams?: readonly string[]
@@ -107,6 +110,7 @@ export interface SessionRow {
 /** One remote team row from /state `remote`. */
 export interface RemoteRow {
   readonly team: string
+  readonly unreachable?: boolean
   readonly name?: string
   readonly origin?: string
   readonly via?: string
@@ -201,7 +205,7 @@ export interface WorkbenchDeps {
   ownerSettingsWrite?(changes: { 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', name: string, id?: string): Promise<{ ok: boolean; members?: string[]; error?: string }>
+  fleetCanvasOp?(peer: string, op: 'create' | 'add-member' | 'remove-member' | 'remove', name: string, id?: string): Promise<{ ok: boolean; members?: string[]; error?: string }>
   /** Abandon one dead-lettered task via the control route. True on success. */
   abandon(taskId: string, reason: string): Promise<boolean>
   /** Canvas team member change via the control route (0.6.6): `id` is a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nelsonlongxiang/dsh-open-a2a-net",
-  "version": "0.6.30",
+  "version": "0.6.32",
   "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",