fix(member-log-stream): simplify member logs view
This commit is contained in:
777genius
parent
42a3fd6834
commit
877a81439b
3 changed files with 32 additions and 167 deletions
|
|
@ -1,15 +1,13 @@
|
|||
import { useCallback, useEffect, useMemo, useState } from 'react';
|
||||
import { useEffect, useMemo } from 'react';
|
||||
|
||||
import { useAppTranslation } from '@features/localization/renderer';
|
||||
import { api } from '@renderer/api';
|
||||
import { useStore } from '@renderer/store';
|
||||
import { selectResolvedMembersForTeamName } from '@renderer/store/slices/teamSlice';
|
||||
|
||||
import { useMemberLogStream } from '../hooks/useMemberLogStream';
|
||||
import { ExecutionLogStreamView } from '../ui/ExecutionLogStreamView';
|
||||
import { MemberRuntimeProcessLogsPanel } from '../ui/MemberRuntimeProcessLogsPanel';
|
||||
|
||||
import type { MemberLogStreamSegment, MemberRuntimeLogKind } from '../../contracts';
|
||||
import type { MemberLogStreamSegment } from '../../contracts';
|
||||
import type { ResolvedTeamMember } from '@shared/types';
|
||||
|
||||
interface MemberLogStreamSectionProps {
|
||||
|
|
@ -19,10 +17,6 @@ interface MemberLogStreamSectionProps {
|
|||
onInitialLoadErrorChange?: (hasError: boolean) => void;
|
||||
}
|
||||
|
||||
function describeMemberStream(): string {
|
||||
return 'Member-scoped transcript and runtime logs rendered with the same execution-log components used in Task Log Stream.';
|
||||
}
|
||||
|
||||
function getSegmentMetaLabel(segment: MemberLogStreamSegment): string {
|
||||
const details = [segment.source.label];
|
||||
if (segment.source.laneId) {
|
||||
|
|
@ -45,17 +39,8 @@ export const MemberLogStreamSection = ({
|
|||
onInitialLoadErrorChange,
|
||||
}: Readonly<MemberLogStreamSectionProps>): React.JSX.Element => {
|
||||
const { t } = useAppTranslation('team');
|
||||
const [selectedLogView, setSelectedLogView] = useState<'execution' | 'process'>('execution');
|
||||
const teamMembers = useStore((s) => selectResolvedMembersForTeamName(s, teamName));
|
||||
const { stream, loading, error } = useMemberLogStream({ teamName, member, enabled });
|
||||
const loadRuntimeLogTail = useCallback(
|
||||
(input: {
|
||||
readonly kind: MemberRuntimeLogKind;
|
||||
readonly maxBytes: number;
|
||||
readonly forceRefresh?: boolean;
|
||||
}) => api.memberLogStream.getMemberRuntimeLogTail(teamName, member.name, input),
|
||||
[member.name, teamName]
|
||||
);
|
||||
const hasInitialLoadError = Boolean(error && !stream && !loading);
|
||||
const boundedHistoryNote = useMemo(() => {
|
||||
if (!stream) return null;
|
||||
|
|
@ -71,56 +56,24 @@ export const MemberLogStreamSection = ({
|
|||
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
<div className="inline-flex rounded-md bg-[var(--color-surface-subtle)] p-0.5">
|
||||
<button
|
||||
type="button"
|
||||
className={`rounded px-2.5 py-1 text-xs font-medium transition-colors ${
|
||||
selectedLogView === 'execution'
|
||||
? 'bg-[var(--color-surface)] text-[var(--color-text)] shadow-sm'
|
||||
: 'text-[var(--color-text-muted)] hover:text-[var(--color-text)]'
|
||||
}`}
|
||||
onClick={() => setSelectedLogView('execution')}
|
||||
>
|
||||
{t('memberLogStream.tabs.execution')}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className={`rounded px-2.5 py-1 text-xs font-medium transition-colors ${
|
||||
selectedLogView === 'process'
|
||||
? 'bg-[var(--color-surface)] text-[var(--color-text)] shadow-sm'
|
||||
: 'text-[var(--color-text-muted)] hover:text-[var(--color-text)]'
|
||||
}`}
|
||||
onClick={() => setSelectedLogView('process')}
|
||||
>
|
||||
{t('memberLogStream.tabs.process')}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{selectedLogView === 'execution' ? (
|
||||
<ExecutionLogStreamView
|
||||
title={t('memberLogStream.logs.title')}
|
||||
description={describeMemberStream()}
|
||||
stream={stream}
|
||||
loading={loading}
|
||||
error={error}
|
||||
teamName={teamName}
|
||||
teamMembers={teamMembers}
|
||||
loadingText={t('memberLogStream.logs.loading')}
|
||||
emptyTitle={t('memberLogStream.logs.emptyTitle')}
|
||||
emptyDescription={t('memberLogStream.logs.emptyDescription')}
|
||||
selectionResetKey={`${teamName}:${member.name}`}
|
||||
boundedHistoryNote={boundedHistoryNote}
|
||||
forceSegmentHeaders
|
||||
showSegmentParticipantBadge={false}
|
||||
buildSegmentRenderKey={buildMemberSegmentRenderKey}
|
||||
getSegmentMetaLabel={getSegmentMetaLabel}
|
||||
/>
|
||||
) : (
|
||||
<MemberRuntimeProcessLogsPanel
|
||||
enabled={enabled && selectedLogView === 'process'}
|
||||
loadRuntimeLogTail={loadRuntimeLogTail}
|
||||
/>
|
||||
)}
|
||||
<ExecutionLogStreamView
|
||||
title={t('memberLogStream.logs.title')}
|
||||
stream={stream}
|
||||
loading={loading}
|
||||
error={error}
|
||||
teamName={teamName}
|
||||
teamMembers={teamMembers}
|
||||
loadingText={t('memberLogStream.logs.loading')}
|
||||
emptyTitle={t('memberLogStream.logs.emptyTitle')}
|
||||
emptyDescription={t('memberLogStream.logs.emptyDescription')}
|
||||
selectionResetKey={`${teamName}:${member.name}`}
|
||||
boundedHistoryNote={boundedHistoryNote}
|
||||
forceSegmentHeaders
|
||||
showIntro={false}
|
||||
showSegmentParticipantBadge={false}
|
||||
buildSegmentRenderKey={buildMemberSegmentRenderKey}
|
||||
getSegmentMetaLabel={getSegmentMetaLabel}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ interface ParticipantVisual {
|
|||
|
||||
export interface ExecutionLogStreamViewProps<TStream extends ExecutionLogStreamLike> {
|
||||
title: string;
|
||||
description: string;
|
||||
description?: string;
|
||||
stream: TStream | null;
|
||||
loading: boolean;
|
||||
error: string | null;
|
||||
|
|
@ -312,7 +312,9 @@ export const ExecutionLogStreamView = <TStream extends ExecutionLogStreamLike>({
|
|||
<h4 className="text-xs font-semibold uppercase text-[var(--color-text-muted)]">
|
||||
{title}
|
||||
</h4>
|
||||
<p className="text-xs text-[var(--color-text-muted)]">{description}</p>
|
||||
{description ? (
|
||||
<p className="text-xs text-[var(--color-text-muted)]">{description}</p>
|
||||
) : null}
|
||||
</>
|
||||
) : null}
|
||||
{boundedHistoryNote ? (
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
/* eslint-disable security/detect-non-literal-fs-filename -- Fixture E2E reads a repo fixture and writes temp JSONL. */
|
||||
import { readFile, rm, stat, writeFile, mkdtemp } from 'fs/promises';
|
||||
import os from 'os';
|
||||
import path from 'path';
|
||||
import React, { act } from 'react';
|
||||
import { createRoot } from 'react-dom/client';
|
||||
|
||||
import { mkdtemp, readFile, rm, stat, writeFile } from 'fs/promises';
|
||||
import os from 'os';
|
||||
import path from 'path';
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest';
|
||||
|
||||
import { GetMemberLogStreamUseCase } from '../../../../../src/features/member-log-stream/core/application/use-cases/GetMemberLogStreamUseCase';
|
||||
import {
|
||||
type MemberLogStreamRequestOptions,
|
||||
type MemberLogStreamResponse,
|
||||
type MemberRuntimeLogTailOptions,
|
||||
type MemberRuntimeLogTailResponse,
|
||||
} from '../../../../../src/features/member-log-stream/contracts';
|
||||
import { GetMemberLogStreamUseCase } from '../../../../../src/features/member-log-stream/core/application/use-cases/GetMemberLogStreamUseCase';
|
||||
import { ClaudeMemberTranscriptStreamSource } from '../../../../../src/features/member-log-stream/main/adapters/output/sources/ClaudeMemberTranscriptStreamSource';
|
||||
import { OpenCodeMemberRuntimeStreamSource } from '../../../../../src/features/member-log-stream/main/adapters/output/sources/OpenCodeMemberRuntimeStreamSource';
|
||||
import { BoardTaskExactLogChunkBuilder } from '../../../../../src/main/services/team/taskLogs/exact/BoardTaskExactLogChunkBuilder';
|
||||
|
|
@ -44,14 +43,6 @@ const apiState = {
|
|||
) => Promise<MemberLogStreamResponse>
|
||||
>(),
|
||||
setMemberLogStreamTracking: vi.fn<(teamName: string, enabled: boolean) => Promise<void>>(),
|
||||
getMemberRuntimeLogTail:
|
||||
vi.fn<
|
||||
(
|
||||
teamName: string,
|
||||
memberName: string,
|
||||
options: MemberRuntimeLogTailOptions
|
||||
) => Promise<MemberRuntimeLogTailResponse>
|
||||
>(),
|
||||
onTeamChange: vi.fn<(callback: (event: unknown, data: unknown) => void) => () => void>(),
|
||||
};
|
||||
|
||||
|
|
@ -63,9 +54,6 @@ vi.mock('@renderer/api', () => ({
|
|||
setMemberLogStreamTracking: (
|
||||
...args: Parameters<typeof apiState.setMemberLogStreamTracking>
|
||||
) => apiState.setMemberLogStreamTracking(...args),
|
||||
getMemberRuntimeLogTail: (
|
||||
...args: Parameters<typeof apiState.getMemberRuntimeLogTail>
|
||||
) => apiState.getMemberRuntimeLogTail(...args),
|
||||
},
|
||||
teams: {
|
||||
onTeamChange: (...args: Parameters<typeof apiState.onTeamChange>) =>
|
||||
|
|
@ -279,7 +267,6 @@ describe('MemberLogStreamSection real fixture e2e', () => {
|
|||
document.body.innerHTML = '';
|
||||
apiState.getMemberLogStream.mockReset();
|
||||
apiState.setMemberLogStreamTracking.mockReset();
|
||||
apiState.getMemberRuntimeLogTail.mockReset();
|
||||
apiState.onTeamChange.mockReset();
|
||||
vi.unstubAllGlobals();
|
||||
await Promise.all(
|
||||
|
|
@ -294,13 +281,6 @@ describe('MemberLogStreamSection real fixture e2e', () => {
|
|||
stubMatchMedia();
|
||||
apiState.onTeamChange.mockImplementation(() => () => undefined);
|
||||
apiState.setMemberLogStreamTracking.mockResolvedValue(undefined);
|
||||
apiState.getMemberRuntimeLogTail.mockResolvedValue({
|
||||
kind: 'stdout',
|
||||
content: 'process stdout line',
|
||||
truncated: false,
|
||||
bytesRead: 19,
|
||||
missing: false,
|
||||
});
|
||||
|
||||
const { useCase, getOpenCodeTranscript, findRecentMemberLogFileRefsByMember } =
|
||||
await createFixtureUseCase();
|
||||
|
|
@ -339,8 +319,9 @@ describe('MemberLogStreamSection real fixture e2e', () => {
|
|||
content.includes('Member-wide Claude transcript final note for Jack.')
|
||||
);
|
||||
|
||||
expect(text).toContain('Logs');
|
||||
expect(text).toContain('Member-scoped transcript and runtime logs');
|
||||
expect(text).not.toContain('Member-scoped transcript and runtime logs');
|
||||
expect(text).not.toContain('Execution');
|
||||
expect(text).not.toContain('Process');
|
||||
expect(text).toContain('Claude transcript');
|
||||
expect(text).toContain('OpenCode runtime');
|
||||
expect(text).toContain('Calculator behavior');
|
||||
|
|
@ -396,75 +377,4 @@ describe('MemberLogStreamSection real fixture e2e', () => {
|
|||
expect(apiState.setMemberLogStreamTracking).toHaveBeenCalledWith(TEAM_NAME, true);
|
||||
expect(apiState.setMemberLogStreamTracking).toHaveBeenCalledWith(TEAM_NAME, false);
|
||||
});
|
||||
|
||||
it('loads bounded process runtime logs after switching the Logs UI to Process', async () => {
|
||||
vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
|
||||
stubMatchMedia();
|
||||
apiState.onTeamChange.mockImplementation(() => () => undefined);
|
||||
apiState.setMemberLogStreamTracking.mockResolvedValue(undefined);
|
||||
apiState.getMemberLogStream.mockResolvedValue({
|
||||
participants: [],
|
||||
defaultFilter: 'all',
|
||||
segments: [],
|
||||
source: 'member_empty',
|
||||
coverage: [],
|
||||
warnings: [],
|
||||
truncated: false,
|
||||
generatedAt: GENERATED_AT,
|
||||
metadata: {
|
||||
scannedTranscriptFileCount: 0,
|
||||
includedTranscriptFileCount: 0,
|
||||
droppedSegmentCount: 0,
|
||||
droppedChunkCount: 0,
|
||||
droppedMessageCount: 0,
|
||||
},
|
||||
});
|
||||
apiState.getMemberRuntimeLogTail.mockResolvedValue({
|
||||
kind: 'stdout',
|
||||
content: 'process stdout line',
|
||||
truncated: false,
|
||||
bytesRead: 19,
|
||||
missing: false,
|
||||
});
|
||||
|
||||
const host = document.createElement('div');
|
||||
document.body.appendChild(host);
|
||||
const root = createRoot(host);
|
||||
|
||||
await act(async () => {
|
||||
root.render(
|
||||
React.createElement(
|
||||
TooltipProvider,
|
||||
null,
|
||||
React.createElement(MemberLogStreamSection, {
|
||||
teamName: TEAM_NAME,
|
||||
member: createMember(),
|
||||
})
|
||||
)
|
||||
);
|
||||
await flushMicrotasks();
|
||||
});
|
||||
|
||||
const processButton = Array.from(host.querySelectorAll('button')).find(
|
||||
(button) => button.textContent?.trim() === 'Process'
|
||||
) as HTMLButtonElement | undefined;
|
||||
expect(processButton).toBeTruthy();
|
||||
|
||||
await act(async () => {
|
||||
processButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
|
||||
await flushAsyncWork();
|
||||
});
|
||||
|
||||
await waitForText(host, (content) => content.includes('process stdout line'));
|
||||
expect(apiState.getMemberRuntimeLogTail).toHaveBeenCalledWith(TEAM_NAME, MEMBER_NAME, {
|
||||
kind: 'stdout',
|
||||
maxBytes: 128 * 1024,
|
||||
forceRefresh: true,
|
||||
});
|
||||
|
||||
await act(async () => {
|
||||
root.unmount();
|
||||
await flushMicrotasks();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue