@yancyyu/openhermit 1.6.42 → 1.6.43

package/src/main/services/session-intelligence/__tests__/teamSessionListMapper.test.ts

@@ -0,0 +1,104 @@
+/**
+ * teamSessionListMapper — mergeLocalAndCcSessions invariant tests.
+ *
+ * Regression guard for #20: a cc-only session (e.g. a Feishu listening
+ * session that has no local Claude JSONL yet) is listed so the user can see
+ * it is listening, but expanding it must NOT try to read a local detail file
+ * (which 404s and surfaces the misleading "会话文件已不存在"). The merged
+ * CcSession must therefore tag whether each entry is backed by a local file
+ * via `hasLocalFile`.
+ */
+import { describe, expect, it } from 'vitest';
+
+import type { CcSessionListItem } from '@shared/types/ccConnect';
+
+import type { LocalSessionSummary } from '../LocalSessionScanner';
+import { mergeLocalAndCcSessions } from '../teamSessionListMapper';
+
+const PROJECT = 'team-x';
+
+function localSummary(id: string): LocalSessionSummary {
+  return {
+    id,
+    title: id,
+    projectId: PROJECT,
+    messageCount: 3,
+    userMessageCount: 1,
+    assistantMessageCount: 2,
+    inputTokens: 10,
+    outputTokens: 20,
+    cacheReadTokens: 0,
+    cacheCreationTokens: 0,
+    totalTokens: 30,
+    model: 'claude-sonnet',
+    active: false,
+    live: false,
+    startTime: null,
+    endTime: null,
+    createdAt: '2026-06-14T10:00:00Z',
+    updatedAt: '2026-06-14T10:00:00Z',
+  };
+}
+
+function ccItem(id: string, platform = 'feishu'): CcSessionListItem {
+  return {
+    id,
+    name: id,
+    session_key: id,
+    agent_session_id: id,
+    agent_type: 'claude-code' as CcSessionListItem['agent_type'],
+    active: true,
+    live: true,
+    history_count: 0,
+    created_at: '2026-06-14T10:00:00Z',
+    updated_at: '2026-06-14T10:00:00Z',
+    last_message: null,
+    platform,
+  };
+}
+
+describe('mergeLocalAndCcSessions — hasLocalFile flag (#20)', () => {
+  it('tags a cc-only session (no local JSONL) as hasLocalFile=false', () => {
+    // A Feishu listening session reported by cc-connect but with no local
+    // Claude JSONL yet. Expanding it must not attempt a local detail read.
+    const merged = mergeLocalAndCcSessions([], [ccItem('oc_feishu_only')], PROJECT);
+
+    const feishu = merged.find((s) => s.id === 'oc_feishu_only');
+    expect(feishu, 'cc-only session present in merged list').toBeDefined();
+    expect(feishu?.hasLocalFile).toBe(false);
+  });
+
+  it('tags a local session (JSONL-backed) as hasLocalFile=true', () => {
+    const merged = mergeLocalAndCcSessions([localSummary('local-1')], [], PROJECT);
+
+    const local = merged.find((s) => s.id === 'local-1');
+    expect(local, 'local session present in merged list').toBeDefined();
+    expect(local?.hasLocalFile).toBe(true);
+  });
+
+  it('tags a session backed by BOTH a local file and cc-connect as hasLocalFile=true', () => {
+    // Same agent_session_id appears in the local scan AND cc-connect: the
+    // local JSONL is authoritative, detail reads from it.
+    const sharedId = 'shared-1';
+    const merged = mergeLocalAndCcSessions([localSummary(sharedId)], [ccItem(sharedId)], PROJECT);
+
+    const shared = merged.find((s) => s.id === sharedId);
+    expect(shared, 'shared session appears once').toBeDefined();
+    expect(merged.filter((s) => s.id === sharedId)).toHaveLength(1);
+    expect(shared?.hasLocalFile).toBe(true);
+  });
+
+  it('flags each entry correctly in a mixed list', () => {
+    const merged = mergeLocalAndCcSessions(
+      [localSummary('local-a'), localSummary('shared-b')],
+      [ccItem('shared-b'), ccItem('feishu-c'), ccItem('feishu-d')],
+      PROJECT
+    );
+
+    const byId = new Map(merged.map((s) => [s.id, s.hasLocalFile]));
+    expect(byId.get('local-a')).toBe(true);
+    expect(byId.get('shared-b')).toBe(true);
+    expect(byId.get('feishu-c')).toBe(false);
+    expect(byId.get('feishu-d')).toBe(false);
+  });
+});

package/src/main/services/session-intelligence/teamSessionListMapper.ts

@@ -0,0 +1,78 @@
+import type { LocalSessionSummary } from './LocalSessionScanner';
+import type { CcSessionListItem } from '@shared/types/ccConnect';
+import type { CcSession } from '@shared/types/api';
+
+function toLastMessage(session: CcSessionListItem): CcSession['lastMessage'] {
+  return session.last_message
+    ? {
+        role: session.last_message.role,
+        content: session.last_message.content,
+        timestamp: session.last_message.timestamp,
+      }
+    : null;
+}
+
+function timestampMs(value: string): number {
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+
+function mapCcOnlySession(session: CcSessionListItem, projectId: string): CcSession {
+  return {
+    id: session.agent_session_id || session.id,
+    title: session.name || session.session_key,
+    projectId,
+    sessionKey: session.session_key,
+    platform: session.platform,
+    userName: session.user_name ?? null,
+    chatName: session.chat_name ?? null,
+    active: session.active,
+    live: session.live,
+    historyCount: session.history_count,
+    createdAt: session.created_at,
+    updatedAt: session.updated_at,
+    lastMessage: toLastMessage(session),
+    hasLocalFile: false,
+  };
+}
+
+export function mergeLocalAndCcSessions(
+  localSessions: LocalSessionSummary[],
+  ccSessions: CcSessionListItem[],
+  projectId: string
+): CcSession[] {
+  const localSessionIds = new Set(localSessions.map((session) => session.id));
+  const ccByLocalSessionId = new Map(
+    ccSessions
+      .map((session) => [session.agent_session_id || session.id, session] as const)
+      .filter(([localSessionId]) => localSessionIds.has(localSessionId))
+  );
+
+  const localResults = localSessions.map((session): CcSession => {
+    const ccMeta = ccByLocalSessionId.get(session.id);
+    return {
+      id: session.id,
+      title: session.title || session.id,
+      projectId,
+      sessionKey: ccMeta?.session_key ?? session.id,
+      platform: ccMeta?.platform ?? 'local',
+      userName: ccMeta?.user_name ?? null,
+      chatName: ccMeta?.chat_name ?? null,
+      active: session.active,
+      live: session.live,
+      historyCount: session.messageCount,
+      createdAt: session.createdAt,
+      updatedAt: session.updatedAt,
+      lastMessage: ccMeta ? toLastMessage(ccMeta) : null,
+      hasLocalFile: true,
+    };
+  });
+
+  const ccOnlyResults = ccSessions
+    .filter((session) => !localSessionIds.has(session.agent_session_id || session.id))
+    .map((session) => mapCcOnlySession(session, projectId));
+
+  return [...localResults, ...ccOnlyResults].sort(
+    (a, b) => timestampMs(b.updatedAt) - timestampMs(a.updatedAt)
+  );
+}

package/src/main/services/system-manager/AdminLoopInitializer.ts

@@ -0,0 +1,95 @@
+import type { SystemManagerConfig, SystemManagerConfigPatch } from '@shared/types/systemManager';
+
+/**
+ * Helm Loop bootstrap.
+ *
+ * On first open of the admin console, the GitHub Pages ops guide is fetched and
+ * fed to the admin lead session as its first turn, so the agent can seed its own
+ * CLAUDE.md from the manual. After a successful feed the `adminInitialized`
+ * marker is set so it never repeats.
+ *
+ * Extracted from server.ts as a pure, dependency-injected unit so the
+ * idempotency and failure semantics are unit-testable without spawning the
+ * direct-CLI runtime or hitting the network.
+ */
+
+/** Deterministic id for the bootstrap message (one-shot, never reused). */
+export const ADMIN_INIT_MESSAGE_ID = 'helm-loop-init';
+
+/** Lightweight HTML → plain text: strip script/style, drop tags, decode entities, collapse whitespace. */
+export function htmlToPlainText(html: string): string {
+  return html
+    .replace(/<script[\s\S]*?<\/script>/gi, ' ')
+    .replace(/<style[\s\S]*?<\/style>/gi, ' ')
+    .replace(/<!--[\s\S]*?-->/g, ' ')
+    .replace(/<\/(p|div|li|h[1-6]|tr|br)>/gi, '\n')
+    .replace(/<[^>]+>/g, ' ')
+    .replace(/&nbsp;/gi, ' ')
+    .replace(/&amp;/gi, '&')
+    .replace(/&lt;/gi, '<')
+    .replace(/&gt;/gi, '>')
+    .replace(/&quot;/gi, '"')
+    .replace(/&#39;/gi, "'")
+    .replace(/[ \t\f\v]+/g, ' ')
+    .replace(/\s*\n\s*/g, '\n')
+    .replace(/\n{3,}/g, '\n\n')
+    .trim();
+}
+
+/** Build the bootstrap prompt wrapping the guide text. Pure — tested directly. */
+export function buildAdminInitMessage(guideText: string): string {
+  return [
+    '【Helm Loop 初始化】以下是 Hermit 运维手册全文。请通读并据此在你的工作目录初始化 CLAUDE.md，',
+    '建立对团队治理、消息路由、Loop 工作流的整体认知。',
+    '随后可用 `/workers` 查看所有数字员工及其工作路径，用 `@workerId` 直接调度对应员工。',
+    '',
+    '--- 运维手册 ---',
+    guideText,
+  ].join('\n');
+}
+
+export interface AdminLoopInitDeps {
+  getConfig: () => Promise<SystemManagerConfig>;
+  updateConfig: (patch: SystemManagerConfigPatch) => Promise<SystemManagerConfig>;
+  /** Fetch the ops guide. Resolves with statusCode + raw body; rejects on network error. */
+  fetchGuide: () => Promise<{ statusCode: number; body: string }>;
+  /** Deliver the bootstrap message to the admin lead session. */
+  dispatch: (message: { text: string; messageId: string }) => Promise<void>;
+  /** Optional diagnostic sink (warnings only). */
+  log?: (message: string) => void;
+}
+
+/**
+ * Run the one-shot bootstrap if it hasn't run yet.
+ *
+ * - Idempotent: returns immediately when `adminInitialized` is already set —
+ *   does NOT fetch or dispatch.
+ * - Failure-tolerant: a network error, non-2xx status, or empty body returns
+ *   WITHOUT setting the marker, so the next console open retries. Only a
+ *   successful fetch + dispatch sets the flag.
+ */
+export async function ensureAdminLoopInitialized(deps: AdminLoopInitDeps): Promise<void> {
+  const config = await deps.getConfig();
+  if (config.adminInitialized) return;
+
+  let body = '';
+  try {
+    const res = await deps.fetchGuide();
+    if (res.statusCode >= 200 && res.statusCode < 300) {
+      body = htmlToPlainText(res.body);
+    }
+  } catch (err) {
+    deps.log?.(
+      `helm loop init: fetch failed (${err instanceof Error ? err.message : String(err)})`
+    );
+    return;
+  }
+
+  if (!body.trim()) {
+    deps.log?.('helm loop init: empty guide body, will retry next open');
+    return;
+  }
+
+  await deps.dispatch({ text: buildAdminInitMessage(body), messageId: ADMIN_INIT_MESSAGE_ID });
+  await deps.updateConfig({ adminInitialized: true });
+}