@yancyyu/openhermit 1.6.42 → 1.6.43

package/src/features/worker-society/main/infrastructure/mergingProfileStore.ts

@@ -0,0 +1,96 @@
+/**
+ * MergingProfileStore —— 把「真实数字员工」与「社会层 overlay」在读取时合并的 WorkerProfileStore。
+ *
+ * 为什么需要它：society 成员的花名册来源必须是 hermit 的真实团队（GET /api/workers →
+ * listDiscoverableWorkers），而不是 profiles.json 里堆出的假数据。但社会层的能力 / 声誉 /
+ * 并发 / 兴趣属于「真实员工没有、社会层叠加」的属性，仍需持久化。因此本类在 *读取* 时把两者
+ * 合并：身份 / 在线态取真实员工，社会属性取 overlay（无则给默认）。
+ *
+ * 关键：合并点放在 store 层而非 service。WorkerSocietyService 有 ~10 处读 roster
+ * （discoverWorkers / volunteerFor.get / selectAssignee.list / runAutonomyTick.list /
+ * reward.get / cancelNeed.get …），只有把合并下沉到 store，所有读路径才能一致看到真实成员——
+ * 否则真实员工会在 volunteerFor 被判 worker_not_found。service 代码零改动（DRY，单一合并点）。
+ *
+ * 写（upsert / delete）只作用于 overlay：身份字段即便被写入也会在下次读取时被真实员工覆盖，
+ * 因此注册一个非真实 workerId 是不可见的无害操作（强制「成员 = 真实员工」语义）。
+ *
+ * 依赖注入：realWorkersProvider 由组合根（server.ts）注入 listDiscoverableWorkers，本层只用
+ * @shared/types/worker 的 TYPE 导入，不引入 @main 运行时依赖——society 保持独立可演进。
+ */
+import type { DiscoverableWorker } from '@shared/types/worker';
+
+import type { WorkerProfile } from '../../core/domain/models/society';
+import { DEFAULT_REPUTATION, clampReputation } from '../../core/domain/policies/societyPolicies';
+import type { WorkerProfileStore } from '../../core/application/ports';
+
+/** 真实员工未配置 overlay 时的并发上限（保守默认；可由 overlay 覆盖）。 */
+const DEFAULT_MAX_CONCURRENT = 2;
+
+/**
+ * 把一个真实员工与（可选）overlay 合并成社会档案。纯函数、可单测。
+ *
+ * 身份 / 在线态 / 绑定目录恒取真实员工；overlay 仅决定社会属性，且都允许缺省：
+ *   - capabilities：overlay 非空则用 overlay（人工策展），否则用真实员工被推断的能力
+ *     （inferCapabilities → {skill:harness}+{skill:'general'}，保证自治匹配可用）；
+ *   - reputation：夹取到 [0,100]，默认 50；
+ *   - maxConcurrent / interests / activeTaskCount：overlay 或默认。
+ *
+ * activeTaskCount 刻意不耦合真实团队任务系统——那是 society 自身的负载计数
+ * （select→+1 / accept·cancel→−1），跨层耦合会过度嵌套。
+ */
+export function mergeRealWorker(real: DiscoverableWorker, overlay?: WorkerProfile): WorkerProfile {
+  return {
+    workerId: real.workerId,
+    name: real.name,
+    kind: real.kind,
+    harness: real.harness,
+    workDir: real.workDir,
+    // DiscoverableWorker.status 只有 online/offline；社会的 'busy' 不由真实态合成。
+    status: real.status === 'online' ? 'online' : 'offline',
+    description: real.description,
+    capabilities:
+      overlay && overlay.capabilities.length > 0 ? overlay.capabilities : (real.capabilities ?? []),
+    interests: overlay?.interests ?? [],
+    maxConcurrent: overlay?.maxConcurrent ?? DEFAULT_MAX_CONCURRENT,
+    activeTaskCount: overlay?.activeTaskCount ?? 0,
+    reputation: clampReputation(overlay?.reputation ?? DEFAULT_REPUTATION),
+  };
+}
+
+/**
+ * 装饰一个 overlay store：读取时合并真实员工，写入时只动 overlay。
+ * base 通常是 FsProfileStore（~/.hermit/society/profiles.json）；realWorkersProvider 注入真实花名册。
+ */
+export class MergingProfileStore implements WorkerProfileStore {
+  constructor(
+    private readonly base: WorkerProfileStore,
+    private readonly realWorkersProvider: () => Promise<DiscoverableWorker[]>
+  ) {}
+
+  async list(): Promise<WorkerProfile[]> {
+    // overlay 索引只读一次（FsProfileStore.list 读一次 profiles.json），N 个真实成员复用之，
+    // 而非逐个 base.get 触发 N 次整文件读取（动态规划：算一次，复用）。
+    const [real, overlays] = await Promise.all([this.realWorkersProvider(), this.base.list()]);
+    const overlayById = new Map(overlays.map((o) => [o.workerId, o]));
+    // overlay 中存在但真实员工已不存在的 workerId（旧假数据）自动丢弃——
+    // 花名册只反映真实成员，不残留 profiles.json 里的孤儿。
+    return real.map((r) => mergeRealWorker(r, overlayById.get(r.workerId)));
+  }
+
+  async get(workerId: string): Promise<WorkerProfile | undefined> {
+    const real = await this.realWorkersProvider();
+    const r = real.find((w) => w.workerId === workerId);
+    if (!r) return undefined; // 非真实员工：不可见（注册假 workerId 的写入因此被忽略）。
+    const overlay = await this.base.get(workerId);
+    return mergeRealWorker(r, overlay);
+  }
+
+  async upsert(profile: WorkerProfile): Promise<WorkerProfile> {
+    // 只写 overlay；身份字段下次读取时被真实员工覆盖。
+    return this.base.upsert(profile);
+  }
+
+  async delete(workerId: string): Promise<void> {
+    await this.base.delete?.(workerId);
+  }
+}

package/src/features/worker-society/renderer/SocietyGraph.tsx

@@ -0,0 +1,166 @@
+/**
+ * SocietyGraph — mounts the reusable @claude-teams/agent-graph engine for the
+ * worker society, replacing the old hand-rolled SVG canvas.
+ *
+ * Same input contract as the former AgentCanvas (workers / active needs /
+ * relationships), but projected through projectSocietyGraph into the engine's
+ * GraphDataPort and rendered with its 1:1 cyan/space holographic theme
+ * (hexagon nodes, tapered glowing edges, flowing particles, bloom, hex grid +
+ * star field, zoom/pan). Worker nodes carry hermit's own participant-avatars
+ * (stable per workerId) so the society stays visually on-brand.
+ *
+ * A Fullscreen button (wired via onRequestFullscreen) pops the graph into a
+ * full-viewport overlay, so the graph is never cramped.
+ *
+ * Pure projection (projectSocietyGraph) is unit-tested separately; this file
+ * is a thin React mount with no logic of its own.
+ */
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { createPortal } from 'react-dom';
+
+import { GraphView } from '@claude-teams/agent-graph';
+import type { GraphViewProps } from '@claude-teams/agent-graph';
+import { PARTICIPANT_AVATAR_URLS } from '@renderer/utils/memberAvatarCatalog';
+
+import { projectSocietyGraph } from './societyGraphAdapter';
+import { SocietyNodeLabels, type SocietyLabelNode } from './SocietyNodeLabels';
+import { pickAvatarUrl } from './societyViewUtils';
+import type { PublishedNeed, Relationship, WorkerProfile } from '../core/domain/models/society';
+
+export interface SocietyGraphProps {
+  workers: WorkerProfile[];
+  /** Active needs (open/assigned/in_progress/delivered). */
+  needs: PublishedNeed[];
+  relationships: Relationship[];
+  /** Called when the user wants to bootstrap the empty society (add the first worker). */
+  onAddFirstWorker?: () => void;
+  /**
+   * 自定义节点弹卡渲染器（透传给引擎 GraphView.renderOverlay）。点开 worker/need 节点时
+   * 引擎以 {node, screenPos, onClose} 调用之；返回的卡片即「纯图谱」的唯一交互入口。
+   * 省略则用引擎内置 GraphOverlay。类型直接取自 GraphViewProps 以保证契约一致。
+   */
+  renderOverlay?: GraphViewProps['renderOverlay'];
+}
+
+const GRAPH_CONFIG = {
+  showHexGrid: true,
+  showStarField: true,
+  bloomIntensity: 0.6,
+  animationEnabled: true,
+} as const;
+
+export function SocietyGraph({
+  workers,
+  needs,
+  relationships,
+  onAddFirstWorker,
+  renderOverlay,
+}: SocietyGraphProps): React.JSX.Element {
+  const [fullscreen, setFullscreen] = useState(false);
+
+  const graphData = useMemo(
+    () =>
+      projectSocietyGraph(
+        { workers, needs, relationships },
+        { resolveAvatarUrl: (id) => pickAvatarUrl(id, PARTICIPANT_AVATAR_URLS) }
+      ),
+    [workers, needs, relationships]
+  );
+
+  // 引擎 canvas 标签字号固定、在 fit 缩放下对人类不可读 → 改用 HTML 标签层渲染。
+  // 给引擎喂 label='' 抑制 canvas 文本；HTML 层（SocietyNodeLabels）用同一份 graphData
+  // 的标签复用引擎 getNodeWorldPosition/worldToScreen 定位（不重算坐标）。两份视图同源。
+  const engineData = useMemo(
+    () => ({ ...graphData, nodes: graphData.nodes.map((n) => ({ ...n, label: '' })) }),
+    [graphData]
+  );
+  const labelNodes = useMemo<SocietyLabelNode[]>(
+    () => graphData.nodes.map((n) => ({ id: n.id, label: n.label, kind: n.kind, state: n.state })),
+    [graphData]
+  );
+  const renderHud = useCallback<NonNullable<GraphViewProps['renderHud']>>(
+    (hud) => (
+      <SocietyNodeLabels
+        nodes={labelNodes}
+        getNodeWorldPosition={hud.getNodeWorldPosition}
+        worldToScreen={hud.worldToScreen}
+        getViewportSize={hud.getViewportSize}
+        focusNodeIds={hud.focusNodeIds}
+      />
+    ),
+    [labelNodes]
+  );
+
+  // An empty society (no agora hub, nothing to render) shows a guiding overlay
+  // instead of a bare starfield void, so a first-run user is never stranded.
+  const isEmpty = graphData.nodes.length === 0;
+
+  // Lock background scroll while the fullscreen overlay is open.
+  useEffect(() => {
+    if (!fullscreen) return;
+    const prev = document.body.style.overflow;
+    document.body.style.overflow = 'hidden';
+    return () => {
+      document.body.style.overflow = prev;
+    };
+  }, [fullscreen]);
+
+  return (
+    <>
+      <div
+        className="relative min-h-0 min-w-0 flex-1 overflow-hidden rounded-lg border border-[var(--color-border)]"
+        style={{ background: '#050510' }}
+      >
+        {fullscreen ? null : (
+          <GraphView
+            data={engineData}
+            className="society-graph-view size-full"
+            isSurfaceActive
+            onRequestFullscreen={() => setFullscreen(true)}
+            config={GRAPH_CONFIG}
+            renderOverlay={renderOverlay}
+            renderHud={renderHud}
+          />
+        )}
+
+        {isEmpty && !fullscreen && (
+          <div className="pointer-events-none absolute inset-0 flex items-center justify-center">
+            <div className="bg-[var(--color-surface-raised)]/95 pointer-events-auto mx-4 max-w-xs rounded-lg border border-[var(--color-border)] p-4 text-center">
+              <p className="text-sm font-semibold opacity-80">社会尚未启动</p>
+              <p className="mt-1 text-xs leading-relaxed opacity-60">
+                还没有成员与需求。添加第一个 worker，或触发自治让真实团队流入广场。
+              </p>
+              <div className="mt-3 flex items-center justify-center gap-2">
+                {onAddFirstWorker ? (
+                  <button
+                    onClick={onAddFirstWorker}
+                    className="rounded-md bg-[var(--color-text)] px-3 py-1 text-xs text-[var(--color-surface)] hover:opacity-90"
+                  >
+                    去添加成员 →
+                  </button>
+                ) : null}
+              </div>
+            </div>
+          </div>
+        )}
+      </div>
+
+      {fullscreen
+        ? createPortal(
+            <div className="fixed inset-0 z-[1000]" style={{ background: '#050510' }}>
+              <GraphView
+                data={engineData}
+                className="society-graph-view size-full"
+                isSurfaceActive
+                onRequestClose={() => setFullscreen(false)}
+                config={GRAPH_CONFIG}
+                renderOverlay={renderOverlay}
+                renderHud={renderHud}
+              />
+            </div>,
+            document.body
+          )
+        : null}
+    </>
+  );
+}

package/src/features/worker-society/renderer/SocietyNodeLabels.tsx

@@ -0,0 +1,139 @@
+/**
+ * SocietyNodeLabels — 常驻可读的 HTML 节点标签层，叠在 society 图谱 canvas 之上。
+ *
+ * 为什么需要它：引擎（packages/agent-graph）把节点标签画在 <canvas> 上，字号固定且在
+ * fit 缩放下对人类不可读（「纯图谱」若读不出谁是谁即失能）。SocietyGraph 因此抑制掉
+ * canvas 标签、改由本层用可读 HTML 渲染。定位完全复用引擎自己的 getNodeWorldPosition
+ * + worldToScreen（不重复算节点坐标 = 动态规划、复用而非重写）。
+ *
+ * 单个 requestAnimationFrame 循环每帧重定位 chip，使标签跟随相机平移/缩放与 d3-force
+ * 模拟。pointer-events-none 让点击穿透回 canvas 节点（选中弹卡链路不变）。超出视口的
+ * chip 隐藏（性能 + 不遮挡）。
+ */
+import { useEffect, useRef } from 'react';
+
+import type { GraphNode, GraphNodeState } from '@claude-teams/agent-graph';
+
+export interface SocietyLabelNode {
+  id: string;
+  label: string;
+  kind: GraphNode['kind'];
+  state: GraphNodeState;
+}
+
+export interface SocietyNodeLabelsProps {
+  nodes: SocietyLabelNode[];
+  getNodeWorldPosition: (nodeId: string) => { x: number; y: number } | null;
+  worldToScreen: (x: number, y: number) => { x: number; y: number };
+  getViewportSize: () => { width: number; height: number };
+  /**
+   * 引擎焦点集合（选中某节点时 = 该节点 + 其邻接任务/关系成员）。提供时，焦点内标签全亮、
+   * 其余压低，让被选簇独占注意力；为 null（未选中）时走分层 ambient（见 OPACITY）。复用引擎
+   * 算好的焦点，不在此处重算邻接（动态规划、复用而非重写）。
+   */
+  focusNodeIds?: ReadonlySet<string> | null;
+}
+
+/** chip 落在节点图标正下方（对齐引擎 canvas 标签槽位）。 */
+const LABEL_OFFSET_Y = 24;
+
+/**
+ * 按 kind/state 给标签上色（worker 青、task 按生命周期）。只给文本上色，不再加描边——
+ * 去掉每个节点上的硬边框盒，缓解「满图突兀标签」的拥挤感（底色 + 投影保证可读，见下方 className/style）。
+ */
+function chipClass(kind: GraphNode['kind'], state: GraphNodeState): string {
+  if (kind === 'lead') return 'text-[#9fd8ff]';
+  if (kind === 'task') {
+    if (state === 'active') return 'text-[#9eeaad]'; // in_progress
+    if (state === 'complete') return 'text-[#c4a7fa]'; // delivered
+    return 'text-[#f5d68a]'; // waiting（open/assigned）
+  }
+  return 'text-[#c9d8ff]'; // member（worker）
+}
+
+/**
+ * 标签不透明度分层 —— 解决「满图字符串、没有重点」：把视觉重量交给节点本身（发光六边形 /
+ * 头像 / 边），文字标签按重要性退到背景，选中时整簇高亮。
+ *   - lead（广场）：恒亮，作为唯一视觉锚点。
+ *   - 进行中（state==='active'）：第二焦点，半亮。
+ *   - 其余（idle / waiting / complete）：ambient，在场但不抢戏。
+ * focusNodeIds 非空（选中某节点）时，焦点内全亮、其余压到 dimmed，让被选簇独占注意力。
+ */
+const OPACITY = {
+  lead: 1,
+  active: 0.82,
+  ambient: 0.34,
+  dimmed: 0.2,
+} as const;
+
+function labelOpacity(node: SocietyLabelNode, focus: ReadonlySet<string> | null): number {
+  if (focus) return focus.has(node.id) ? 1 : OPACITY.dimmed;
+  if (node.kind === 'lead') return OPACITY.lead;
+  if (node.state === 'active') return OPACITY.active;
+  return OPACITY.ambient;
+}
+
+export function SocietyNodeLabels({
+  nodes,
+  getNodeWorldPosition,
+  worldToScreen,
+  getViewportSize,
+  focusNodeIds,
+}: SocietyNodeLabelsProps): React.JSX.Element {
+  // nodeId → chip DOM，单 RAF 批量更新 transform，避免每帧 React 重渲染。
+  const chipRefs = useRef<Map<string, HTMLSpanElement>>(new Map());
+  // 焦点集合随渲染更新到 ref，RAF 直接读最新值——选中切换不必重启循环。
+  const focusRef = useRef<ReadonlySet<string> | null>(null);
+  focusRef.current = focusNodeIds ?? null;
+
+  useEffect(() => {
+    let raf = 0;
+    const tick = (): void => {
+      const vp = getViewportSize();
+      const map = chipRefs.current;
+      for (const node of nodes) {
+        const el = map.get(node.id);
+        if (!el) continue;
+        const world = getNodeWorldPosition(node.id);
+        if (!world) {
+          el.style.visibility = 'hidden';
+          continue;
+        }
+        const s = worldToScreen(world.x, world.y);
+        const offX = s.x < -100 || s.x > vp.width + 100;
+        const offY = s.y < -20 || s.y > vp.height + 60;
+        if (offX || offY) {
+          el.style.visibility = 'hidden';
+        } else {
+          el.style.visibility = 'visible';
+          el.style.opacity = String(labelOpacity(node, focusRef.current));
+          el.style.transform = `translate(-50%, 0) translate(${s.x}px, ${s.y + LABEL_OFFSET_Y}px)`;
+        }
+      }
+      raf = requestAnimationFrame(tick);
+    };
+    raf = requestAnimationFrame(tick);
+    return () => cancelAnimationFrame(raf);
+  }, [nodes, getNodeWorldPosition, worldToScreen, getViewportSize]);
+
+  return (
+    <>
+      {nodes.map((node) => (
+        <span
+          key={node.id}
+          ref={(el) => {
+            if (el) chipRefs.current.set(node.id, el);
+            else chipRefs.current.delete(node.id);
+          }}
+          className={`pointer-events-none absolute left-0 top-0 max-w-[150px] truncate rounded bg-[rgba(5,5,16,0.5)] px-1.5 py-0.5 text-[11px] font-medium leading-tight ${chipClass(
+            node.kind,
+            node.state
+          )}`}
+          style={{ visibility: 'hidden', textShadow: '0 1px 3px rgba(0,0,0,0.9)' }}
+        >
+          {node.label}
+        </span>
+      ))}
+    </>
+  );
+}