{segment.timestamp && (
diff --git a/app/renderer/src/lib/transcriptSegments.test.ts b/app/renderer/src/lib/transcriptSegments.test.ts
index 23887ae0..60f9afee 100644
--- a/app/renderer/src/lib/transcriptSegments.test.ts
+++ b/app/renderer/src/lib/transcriptSegments.test.ts
@@ -40,6 +40,18 @@ describe('parseTranscript — diarised', () => {
expect(segs[0].text).toContain('line two');
expect(segs[1].timestamp).toBe('00:05');
});
+
+ test('parses acoustically-diarized "Speaker N" labels alongside You/Others', () => {
+ const segs = parseTranscript(
+ '[00:00] [You] Hello\n\n[00:05] [Speaker 2] Hi there\n\n[00:10] [Others] Welcome',
+ true,
+ );
+ expect(segs).toEqual([
+ { speaker: 'You', text: 'Hello', timestamp: '00:00' },
+ { speaker: 'Speaker 2', text: 'Hi there', timestamp: '00:05' },
+ { speaker: 'Others', text: 'Welcome', timestamp: '00:10' },
+ ]);
+ });
});
describe('parseTranscript — non-diarised', () => {
diff --git a/app/renderer/src/lib/transcriptSegments.ts b/app/renderer/src/lib/transcriptSegments.ts
index 6dfb182f..aaf1a54a 100644
--- a/app/renderer/src/lib/transcriptSegments.ts
+++ b/app/renderer/src/lib/transcriptSegments.ts
@@ -3,7 +3,10 @@
// unit-tested in isolation, and so the live dock could share it later.
export interface Segment {
- speaker: 'You' | 'Others' | null;
+ /** 'You' / 'Others' for the channel-only fallback, or 'Speaker N' for an
+ * acoustically-diarized secondary speaker on a channel (see
+ * transcriber.py's _resolve_speaker_placeholders). */
+ speaker: string | null;
text: string;
/** `MM:SS` / `H:MM:SS` offset parsed from a diarised line's leading
* `[MM:SS]` marker (transcriber.py writes it). Absent on older transcripts
@@ -11,12 +14,13 @@ export interface Segment {
timestamp?: string;
}
-// A diarised line: an optional `[MM:SS]` / `[H:MM:SS]` timestamp, then the
-// `[You]`/`[Others]` speaker marker, then the text up to the next marker (or
-// end). Matched globally rather than split so the optional timestamp stays
-// attached to its own segment instead of trailing the previous one.
+// A diarised line: an optional `[MM:SS]` / `[H:MM:SS]` timestamp, then a
+// `[You]` / `[Others]` / `[Speaker N]` speaker marker, then the text up to
+// the next marker (or end). Matched globally rather than split so the
+// optional timestamp stays attached to its own segment instead of trailing
+// the previous one.
const DIARISED_SEGMENT_RE =
- /(?:\[(\d{1,3}:\d{2}(?::\d{2})?)\]\s*)?\[(You|Others)\]\s*([\s\S]*?)(?=(?:\[\d{1,3}:\d{2}(?::\d{2})?\]\s*)?\[(?:You|Others)\]|$)/g;
+ /(?:\[(\d{1,3}:\d{2}(?::\d{2})?)\]\s*)?\[([^\]]+)\]\s*([\s\S]*?)(?=(?:\[\d{1,3}:\d{2}(?::\d{2})?\]\s*)?\[[^\]]+\]|$)/g;
export function parseTranscript(text: string, isDiarised: boolean): Segment[] {
if (isDiarised) {
@@ -24,7 +28,7 @@ export function parseTranscript(text: string, isDiarised: boolean): Segment[] {
for (const m of text.matchAll(DIARISED_SEGMENT_RE)) {
const body = m[3].trim();
if (!body) continue;
- segments.push({ speaker: m[2] as 'You' | 'Others', text: body, timestamp: m[1] });
+ segments.push({ speaker: m[2], text: body, timestamp: m[1] });
}
return segments;
}
diff --git a/app/renderer/src/routes/Processing.tsx b/app/renderer/src/routes/Processing.tsx
index 91c82d6d..668ad635 100644
--- a/app/renderer/src/routes/Processing.tsx
+++ b/app/renderer/src/routes/Processing.tsx
@@ -16,7 +16,7 @@ import { getLiveDraft, useLiveDraftStore } from '@/hooks/liveDraftStore';
import { ipc } from '@/lib/ipc';
import { stripReasoning } from '@/lib/markdown';
-type ProcessingStage = 'transcribing' | 'summarizing' | 'finalizing' | 'error';
+type ProcessingStage = 'transcribing' | 'diarizing' | 'summarizing' | 'finalizing' | 'error';
// Shared flag so the sibling ProcessingDock (the bottom "Processing" chip,
// rendered by App while on this route) can hide once the watchdog concludes
@@ -33,6 +33,7 @@ const useProcessingWatchdogStore = create<{
const STAGE_LABEL: Record
= {
transcribing: 'Analyzing transcript',
+ diarizing: 'Identifying speakers',
summarizing: 'Generating notes',
finalizing: 'Almost done…',
error: 'Couldn’t process this recording.',
@@ -59,6 +60,13 @@ const STAGE_LABEL: Record = {
const WATCHDOG_TICK_MS = 1500;
const WATCHDOG_IDLE_TICKS = 8;
+function formatElapsedSeconds(totalSeconds: number): string {
+ if (totalSeconds < 60) return `${totalSeconds}s`;
+ const m = Math.floor(totalSeconds / 60);
+ const s = totalSeconds % 60;
+ return `${m}m ${s}s`;
+}
+
export function Processing() {
const navigate = useNavigate();
const recording = useRecording();
@@ -143,6 +151,21 @@ export function Processing() {
setRetryError(null);
}
+ // Diarization's segmentation pass has no per-chunk checkpoint to report
+ // progress from -- unlike embedding extraction (not part of this branch's
+ // sidecar), so there is nothing to turn into a percentage here. A
+ // client-side elapsed-time ticker is the only way to show visible motion
+ // during that stretch without a backend change.
+ const diarizeTimerRef = React.useRef | null>(null);
+ const diarizeStartedAtRef = React.useRef(null);
+ const clearDiarizeTimer = React.useCallback(() => {
+ if (diarizeTimerRef.current) {
+ clearInterval(diarizeTimerRef.current);
+ diarizeTimerRef.current = null;
+ }
+ }, []);
+ React.useEffect(() => () => clearDiarizeTimer(), [clearDiarizeTimer]);
+
// Buffer streamed chunks and flush at most every 50ms (~20fps). At a
// typical token rate of 30-60 tokens/sec, this batches ~3 tokens per
// commit which keeps the UI smooth without re-parsing the entire markdown
@@ -172,8 +195,9 @@ export function Processing() {
// "saw activity" flag (which would hide a real no-job dead-end).
if (e.summaryFile) return;
if (activeSession && e.sessionName !== activeSession) return;
+ clearDiarizeTimer();
pendingChunkRef.current += e.chunk;
- setStage((s) => (s === 'transcribing' ? 'summarizing' : s));
+ setStage((s) => (s === 'transcribing' || s === 'diarizing' ? 'summarizing' : s));
if (!flushTimerRef.current) {
flushTimerRef.current = setTimeout(flushPending, 50);
}
@@ -188,12 +212,16 @@ export function Processing() {
// fresh-recording job.
if (e.summaryFile) return;
if (activeSession && e.sessionName !== activeSession) return;
+ clearDiarizeTimer();
+ setChunkProgress(null);
setStage((s) => (s === 'error' ? s : 'finalizing'));
}),
ipc().on.processingComplete((e) => {
if (activeSession && e.sessionName !== activeSession) return;
if (!e.success) {
setRetryAudioFile(e.audioFile ?? null);
+ clearDiarizeTimer();
+ setChunkProgress(null);
setStage('error');
return;
}
@@ -214,20 +242,41 @@ export function Processing() {
// DIFFERENT meeting emits summaryFile-scoped progress — ignore those so
// another meeting's "Summarizing part N" can't hijack this screen's stage.
if (e.summaryFile) return;
- const raw = e.line.replace(/^PROGRESS:summarize:/, '');
- if (raw === 'reducing') {
- setChunkProgress('Merging summaries…');
- } else {
- const [step, total] = raw.split('/').map(Number);
- if (!Number.isNaN(step) && !Number.isNaN(total)) {
- setChunkProgress(`Summarizing part ${step} of ${total}…`);
+ if (e.line.startsWith('PROGRESS:summarize:')) {
+ const raw = e.line.slice('PROGRESS:summarize:'.length);
+ if (raw === 'reducing') {
+ setChunkProgress('Merging summaries…');
+ } else {
+ const [step, total] = raw.split('/').map(Number);
+ if (!Number.isNaN(step) && !Number.isNaN(total)) {
+ setChunkProgress(`Summarizing part ${step} of ${total}…`);
+ }
+ }
+ setStage((s) => (s === 'transcribing' || s === 'diarizing' ? 'summarizing' : s));
+ } else if (e.line.startsWith('PROGRESS:diarize:')) {
+ const rest = e.line.slice('PROGRESS:diarize:'.length);
+ const [label, kind] = rest.split(':');
+ if (kind === 'start') {
+ setStage((s) => (s === 'transcribing' ? 'diarizing' : s));
+ clearDiarizeTimer();
+ diarizeStartedAtRef.current = Date.now();
+ setChunkProgress(`Diarizing ${label} channel…`);
+ diarizeTimerRef.current = setInterval(() => {
+ if (diarizeStartedAtRef.current === null) return;
+ const elapsedS = Math.floor((Date.now() - diarizeStartedAtRef.current) / 1000);
+ setChunkProgress(`Diarizing ${label} channel… (${formatElapsedSeconds(elapsedS)})`);
+ }, 1000);
+ } else if (kind === 'done') {
+ // Stop the elapsed ticker; no other UI action needed -- the
+ // next channel's :start, or the first summarize: chunk,
+ // supersedes this sub-label shortly after.
+ clearDiarizeTimer();
}
}
- setStage((s) => (s === 'transcribing' ? 'summarizing' : s));
}),
];
return () => offs.forEach((fn) => fn());
- }, [activeSession, updateMeeting]);
+ }, [activeSession, updateMeeting, clearDiarizeTimer]);
// Watchdog. Any real processing activity — a streamed chunk, chunk progress,
// a stage move past 'transcribing' (summaryComplete/processingComplete) —
@@ -523,10 +572,12 @@ function StageCard({
style={{ color: 'var(--fg-2)' }}
/>
- {chunkProgress && stage === 'summarizing' ? chunkProgress : STAGE_LABEL[stage]}
+ {chunkProgress && stage !== 'finalizing' && stage !== 'error' ? chunkProgress : STAGE_LABEL[stage]}